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
c2ec0e4e
Commit
c2ec0e4e
authored
Jan 11, 2017
by
Thomas Davies
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EC_ADAPT: use tile context for partition type.
Change-Id: I4b53dab674390496d8fe7299970c5fb327b5a7be
parent
489dad8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+12
-1
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+12
-1
No files found.
av1/decoder/decodeframe.c
View file @
c2ec0e4e
...
...
@@ -1854,17 +1854,28 @@ static PARTITION_TYPE read_partition(AV1_COMMON *cm, MACROBLOCKD *xd,
FRAME_COUNTS
*
const
counts
=
xd
->
counts
;
#endif
PARTITION_TYPE
p
;
#if CONFIG_EC_ADAPT
FRAME_CONTEXT
*
ec_ctx
=
xd
->
tile_ctx
;
(
void
)
cm
;
#elif CONFIG_EC_MULTISYMBOL
FRAME_CONTEXT
*
ec_ctx
=
cm
->
fc
;
#endif
if
(
has_rows
&&
has_cols
)
#if CONFIG_EXT_PARTITION_TYPES
if
(
bsize
<=
BLOCK_8X8
)
#if CONFIG_EC_MULTISYMBOL
p
=
(
PARTITION_TYPE
)
aom_read_symbol
(
r
,
ec_ctx
->
partition_cdf
[
ctx
],
PARTITION_TYPES
,
ACCT_STR
);
#else
p
=
(
PARTITION_TYPE
)
aom_read_tree
(
r
,
av1_partition_tree
,
probs
,
ACCT_STR
);
#endif
else
p
=
(
PARTITION_TYPE
)
aom_read_tree
(
r
,
av1_ext_partition_tree
,
probs
,
ACCT_STR
);
#else
#if CONFIG_EC_MULTISYMBOL
p
=
(
PARTITION_TYPE
)
aom_read_symbol
(
r
,
cm
->
fc
->
partition_cdf
[
ctx
],
p
=
(
PARTITION_TYPE
)
aom_read_symbol
(
r
,
ec_ctx
->
partition_cdf
[
ctx
],
PARTITION_TYPES
,
ACCT_STR
);
#else
p
=
(
PARTITION_TYPE
)
aom_read_tree
(
r
,
av1_partition_tree
,
probs
,
ACCT_STR
);
...
...
av1/encoder/bitstream.c
View file @
c2ec0e4e
...
...
@@ -2315,18 +2315,29 @@ static void write_partition(const AV1_COMMON *const cm,
const
aom_prob
*
const
probs
=
cm
->
fc
->
partition_prob
[
ctx
];
#endif
#if CONFIG_EC_ADAPT
FRAME_CONTEXT
*
ec_ctx
=
xd
->
tile_ctx
;
(
void
)
cm
;
#elif CONFIG_EC_MULTISYMBOL
FRAME_CONTEXT
*
ec_ctx
=
cm
->
fc
;
#endif
if
(
!
is_partition_point
)
return
;
if
(
has_rows
&&
has_cols
)
{
#if CONFIG_EXT_PARTITION_TYPES
if
(
bsize
<=
BLOCK_8X8
)
#if CONFIG_EC_MULTISYMBOL
aom_write_symbol
(
w
,
p
,
ec_ctx
->
partition_cdf
[
ctx
],
PARTITION_TYPES
);
#else
av1_write_token
(
w
,
av1_partition_tree
,
probs
,
&
partition_encodings
[
p
]);
#endif
else
av1_write_token
(
w
,
av1_ext_partition_tree
,
probs
,
&
ext_partition_encodings
[
p
]);
#else
#if CONFIG_EC_MULTISYMBOL
aom_write_symbol
(
w
,
p
,
cm
->
fc
->
partition_cdf
[
ctx
],
PARTITION_TYPES
);
aom_write_symbol
(
w
,
p
,
ec_ctx
->
partition_cdf
[
ctx
],
PARTITION_TYPES
);
#else
av1_write_token
(
w
,
av1_partition_tree
,
probs
,
&
partition_encodings
[
p
]);
#endif
...
...
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