Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
749c057a
Commit
749c057a
authored
Apr 07, 2017
by
Yushin Cho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pvq for ext-tile
Change-Id: I2011f113cf6a66a766c1c754b4d47e913ba54689
parent
982d9852
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+7
-1
av1/encoder/encoder.c
av1/encoder/encoder.c
+2
-2
No files found.
av1/encoder/bitstream.c
View file @
749c057a
...
...
@@ -3971,6 +3971,10 @@ static uint32_t write_tiles(AV1_COMP *const cpi, uint8_t *const dst,
this_tile
->
tctx
=
*
cm
->
fc
;
cpi
->
td
.
mb
.
e_mbd
.
tile_ctx
=
&
this_tile
->
tctx
;
#endif
#if CONFIG_PVQ
cpi
->
td
.
mb
.
pvq_q
=
&
this_tile
->
pvq_q
;
cpi
->
td
.
mb
.
daala_enc
.
state
.
adapt
=
&
this_tile
->
tctx
.
pvq_context
;
#endif // CONFIG_PVQ
#if !CONFIG_ANS
aom_start_encode
(
&
mode_bc
,
buf
->
data
+
data_offset
);
write_modes
(
cpi
,
&
tile_info
,
&
mode_bc
,
&
tok
,
tok_end
);
...
...
@@ -3984,7 +3988,9 @@ static uint32_t write_tiles(AV1_COMP *const cpi, uint8_t *const dst,
aom_buf_ans_flush
(
buf_ans
);
tile_size
=
buf_ans_write_end
(
buf_ans
);
#endif // !CONFIG_ANS
#if CONFIG_PVQ
cpi
->
td
.
mb
.
pvq_q
=
NULL
;
#endif
buf
->
size
=
tile_size
;
// Record the maximum tile size we see, so we can compact headers later.
...
...
av1/encoder/encoder.c
View file @
749c057a
...
...
@@ -422,8 +422,8 @@ static void dealloc_compressor_data(AV1_COMP *cpi) {
#if CONFIG_PVQ
if
(
cpi
->
oxcf
.
pass
!=
1
)
{
const
int
tile_cols
=
1
<<
cm
->
log2_
tile_cols
;
const
int
tile_rows
=
1
<<
cm
->
log2_
tile_rows
;
const
int
tile_cols
=
cm
->
tile_cols
;
const
int
tile_rows
=
cm
->
tile_rows
;
int
tile_col
,
tile_row
;
for
(
tile_row
=
0
;
tile_row
<
tile_rows
;
++
tile_row
)
...
...
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