Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
bfa2b8ce
Commit
bfa2b8ce
authored
Nov 01, 2017
by
Pavel Frolov
Browse files
Fix delta_qindex signalling
BUG=aomedia:992 Change-Id: Ibac542608d9abd669d0e8cf871960b2cf0a6da6a
parent
d365d3cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodemv.c
View file @
bfa2b8ce
...
...
@@ -50,7 +50,7 @@ static int read_delta_qindex(AV1_COMMON *cm, MACROBLOCKD *xd, aom_reader *r,
FRAME_CONTEXT
*
ec_ctx
=
xd
->
tile_ctx
;
(
void
)
cm
;
if
((
bsize
!=
BLOCK_LARGEST
||
mbmi
->
skip
==
0
)
&&
read_delta_q_flag
)
{
if
((
bsize
!=
cm
->
sb_size
||
mbmi
->
skip
==
0
)
&&
read_delta_q_flag
)
{
abs
=
aom_read_symbol
(
r
,
ec_ctx
->
delta_q_cdf
,
DELTA_Q_PROBS
+
1
,
ACCT_STR
);
smallval
=
(
abs
<
DELTA_Q_SMALL
);
if
(
counts
)
{
...
...
av1/encoder/bitstream.c
View file @
bfa2b8ce
...
...
@@ -1493,7 +1493,7 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const int mi_row,
if
(
cm
->
delta_q_present_flag
)
{
int
super_block_upper_left
=
((
mi_row
&
MAX_MIB_MASK
)
==
0
)
&&
((
mi_col
&
MAX_MIB_MASK
)
==
0
);
if
((
bsize
!=
BLOCK_LARGEST
||
skip
==
0
)
&&
super_block_upper_left
)
{
if
((
bsize
!=
cm
->
sb_size
||
skip
==
0
)
&&
super_block_upper_left
)
{
assert
(
mbmi
->
current_q_index
>
0
);
int
reduced_delta_qindex
=
(
mbmi
->
current_q_index
-
xd
->
prev_qindex
)
/
cm
->
delta_q_res
;
...
...
@@ -1827,7 +1827,7 @@ static void write_mb_modes_kf(AV1_COMMON *cm, MACROBLOCKD *xd,
if
(
cm
->
delta_q_present_flag
)
{
int
super_block_upper_left
=
((
mi_row
&
MAX_MIB_MASK
)
==
0
)
&&
((
mi_col
&
MAX_MIB_MASK
)
==
0
);
if
((
bsize
!=
BLOCK_LARGEST
||
skip
==
0
)
&&
super_block_upper_left
)
{
if
((
bsize
!=
cm
->
sb_size
||
skip
==
0
)
&&
super_block_upper_left
)
{
assert
(
mbmi
->
current_q_index
>
0
);
int
reduced_delta_qindex
=
(
mbmi
->
current_q_index
-
xd
->
prev_qindex
)
/
cm
->
delta_q_res
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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