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
b39378e7
Commit
b39378e7
authored
Feb 21, 2017
by
Yushin Cho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the bug that prevents both pvq and ec_adapt work together
Change-Id: Ie7edfbcdd7f5f2cc3aa3aa6c2575d081616da6b6
parent
e68a3e4f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+2
-1
av1/encoder/encodeframe.c
av1/encoder/encodeframe.c
+4
-2
No files found.
av1/encoder/bitstream.c
View file @
b39378e7
...
...
@@ -4098,7 +4098,8 @@ static uint32_t write_tiles(AV1_COMP *const cpi, uint8_t *const dst,
// NOTE: This will not work with CONFIG_ANS turned on.
od_adapt_ctx_reset
(
&
cpi
->
td
.
mb
.
daala_enc
.
state
.
adapt
,
0
);
cpi
->
td
.
mb
.
pvq_q
=
&
this_tile
->
pvq_q
;
#elif CONFIG_EC_ADAPT
#endif
#if CONFIG_EC_ADAPT
// Initialise tile context from the frame context
this_tile
->
tctx
=
*
cm
->
fc
;
cpi
->
td
.
mb
.
e_mbd
.
tile_ctx
=
&
this_tile
->
tctx
;
...
...
av1/encoder/encodeframe.c
View file @
b39378e7
...
...
@@ -4914,10 +4914,12 @@ void av1_encode_tile(AV1_COMP *cpi, ThreadData *td, int tile_row,
#error "CONFIG_PVQ currently requires CONFIG_DAALA_EC."
#endif
od_adapt_ctx_reset
(
adapt
,
0
);
#elif CONFIG_EC_ADAPT
#endif // #if CONFIG_PVQ
#if CONFIG_EC_ADAPT
this_tile
->
tctx
=
*
cm
->
fc
;
td
->
mb
.
e_mbd
.
tile_ctx
=
&
this_tile
->
tctx
;
#endif // #if CONFIG_
PVQ
#endif // #if CONFIG_
EC_ADAPT
for
(
mi_row
=
tile_info
->
mi_row_start
;
mi_row
<
tile_info
->
mi_row_end
;
mi_row
+=
cm
->
mib_size
)
{
...
...
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