Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
8e43f21f
Commit
8e43f21f
authored
Jul 13, 2017
by
Wei-Ting Lin
Committed by
Wei-ting Lin
Jul 14, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a bug of default_motion_mode_prob array size mismatch
Change-Id: Ib245b059f1c1aa450b0755b437eab15c362d3aee
parent
284653e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
av1/common/entropymode.c
av1/common/entropymode.c
+12
-7
No files found.
av1/common/entropymode.c
View file @
8e43f21f
...
...
@@ -747,8 +747,8 @@ const aom_tree_index av1_motion_mode_tree[TREE_SIZE(MOTION_MODES)] = {
-
SIMPLE_TRANSLATION
,
-
OBMC_CAUSAL
};
static
const
aom_prob
default_motion_mode_prob
[
BLOCK_SIZES
][
MOTION_MODES
-
1
]
=
{
static
const
aom_prob
default_motion_mode_prob
[
BLOCK_SIZES_ALL
][
MOTION_MODES
-
1
]
=
{
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{
255
},
{
255
},
{
255
},
#endif
...
...
@@ -761,7 +761,7 @@ static const aom_prob default_motion_mode_prob[BLOCK_SIZES][MOTION_MODES - 1] =
};
static
const
aom_cdf_prob
default_motion_mode_cdf
[
BLOCK_SIZES
][
CDF_SIZE
(
MOTION_MODES
)]
=
{
default_motion_mode_cdf
[
BLOCK_SIZES
_ALL
][
CDF_SIZE
(
MOTION_MODES
)]
=
{
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{
AOM_ICDF
(
255
*
128
),
AOM_ICDF
(
32768
),
0
},
{
AOM_ICDF
(
255
*
128
),
AOM_ICDF
(
32768
),
0
},
...
...
@@ -800,8 +800,8 @@ static const aom_cdf_prob
const
aom_tree_index
av1_motion_mode_tree
[
TREE_SIZE
(
MOTION_MODES
)]
=
{
-
SIMPLE_TRANSLATION
,
2
,
-
OBMC_CAUSAL
,
-
NCOBMC_ADAPT_WEIGHT
,
};
static
const
aom_prob
default_motion_mode_prob
[
BLOCK_SIZES
][
MOTION_MODES
-
1
]
=
{
static
const
aom_prob
default_motion_mode_prob
[
BLOCK_SIZES_ALL
][
MOTION_MODES
-
1
]
=
{
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{
255
,
200
},
{
255
,
200
},
{
255
,
200
},
#endif
...
...
@@ -811,9 +811,10 @@ static const aom_prob default_motion_mode_prob[BLOCK_SIZES][MOTION_MODES - 1] =
#if CONFIG_EXT_PARTITION
{
252
,
200
},
{
252
,
200
},
{
252
,
200
},
#endif // CONFIG_EXT_PARTITION
{
255
,
200
},
{
255
,
200
},
{
255
,
200
},
{
255
,
200
},
};
static
const
aom_cdf_prob
default_motion_mode_cdf
[
BLOCK_SIZES
][
CDF_SIZE
(
MOTION_MODES
)]
=
{
default_motion_mode_cdf
[
BLOCK_SIZES
_ALL
][
CDF_SIZE
(
MOTION_MODES
)]
=
{
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{
AOM_ICDF
(
16384
),
AOM_ICDF
(
24576
),
AOM_ICDF
(
32768
),
0
},
{
AOM_ICDF
(
16384
),
AOM_ICDF
(
24576
),
AOM_ICDF
(
32768
),
0
},
...
...
@@ -837,6 +838,10 @@ static const aom_cdf_prob
{
AOM_ICDF
(
32256
),
AOM_ICDF
(
32656
),
AOM_ICDF
(
32768
),
0
},
{
AOM_ICDF
(
32256
),
AOM_ICDF
(
32656
),
AOM_ICDF
(
32768
),
0
},
#endif
{
AOM_ICDF
(
32640
),
AOM_ICDF
(
32740
),
AOM_ICDF
(
32768
),
0
},
{
AOM_ICDF
(
32640
),
AOM_ICDF
(
32740
),
AOM_ICDF
(
32768
),
0
},
{
AOM_ICDF
(
32640
),
AOM_ICDF
(
32740
),
AOM_ICDF
(
32768
),
0
},
{
AOM_ICDF
(
32640
),
AOM_ICDF
(
32740
),
AOM_ICDF
(
32768
),
0
},
};
#endif // CONFIG_NCOBMC_ADAPT_WEIGHT
...
...
@@ -860,7 +865,7 @@ static const aom_prob
};
static
const
aom_cdf_prob
default_motion_mode_cdf
[
BLOCK_SIZES
][
CDF_SIZE
(
MOTION_MODES
)]
=
{
default_motion_mode_cdf
[
BLOCK_SIZES
_ALL
][
CDF_SIZE
(
MOTION_MODES
)]
=
{
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{
AOM_ICDF
(
255
*
128
),
AOM_ICDF
(
32768
),
0
},
{
AOM_ICDF
(
255
*
128
),
AOM_ICDF
(
32768
),
0
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment