Skip to content
GitLab
Menu
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
22a51d9e
Commit
22a51d9e
authored
Jan 16, 2018
by
Hui Su
Committed by
Yaowu Xu
Jan 17, 2018
Browse files
intrabc: do not transmit delta_lf_present_flag
BUG=aomedia:1230 Change-Id: I8a66b6303752b77a09cca1fe6890137146c50d1e
parent
7ebfaf4f
Changes
3
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodeframe.c
View file @
22a51d9e
...
...
@@ -3051,7 +3051,10 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
xd
->
prev_qindex
=
cm
->
base_qindex
;
cm
->
delta_q_res
=
1
<<
aom_rb_read_literal
(
rb
,
2
);
#if CONFIG_EXT_DELTA_Q
cm
->
delta_lf_present_flag
=
aom_rb_read_bit
(
rb
);
#if CONFIG_INTRABC
if
(
!
cm
->
allow_intrabc
||
!
NO_FILTER_FOR_IBC
)
#endif // CONFIG_INTRABC
cm
->
delta_lf_present_flag
=
aom_rb_read_bit
(
rb
);
if
(
cm
->
delta_lf_present_flag
)
{
xd
->
prev_delta_lf_from_base
=
0
;
cm
->
delta_lf_res
=
1
<<
aom_rb_read_literal
(
rb
,
2
);
...
...
av1/encoder/bitstream.c
View file @
22a51d9e
...
...
@@ -4148,7 +4148,12 @@ static void write_uncompressed_header_obu(AV1_COMP *cpi,
aom_wb_write_literal
(
wb
,
OD_ILOG_NZ
(
cm
->
delta_q_res
)
-
1
,
2
);
xd
->
prev_qindex
=
cm
->
base_qindex
;
#if CONFIG_EXT_DELTA_Q
aom_wb_write_bit
(
wb
,
cm
->
delta_lf_present_flag
);
#if CONFIG_INTRABC
if
(
cm
->
allow_intrabc
&&
NO_FILTER_FOR_IBC
)
assert
(
cm
->
delta_lf_present_flag
==
0
);
else
#endif // CONFIG_INTRABC
aom_wb_write_bit
(
wb
,
cm
->
delta_lf_present_flag
);
if
(
cm
->
delta_lf_present_flag
)
{
aom_wb_write_literal
(
wb
,
OD_ILOG_NZ
(
cm
->
delta_lf_res
)
-
1
,
2
);
xd
->
prev_delta_lf_from_base
=
0
;
...
...
av1/encoder/encodeframe.c
View file @
22a51d9e
...
...
@@ -4082,6 +4082,9 @@ static void encode_frame_internal(AV1_COMP *cpi) {
#if CONFIG_INTRABC
// If intrabc is allowed but never selected, reset the allow_intrabc flag.
if
(
cm
->
allow_intrabc
&&
!
cpi
->
intrabc_used
)
cm
->
allow_intrabc
=
0
;
#if CONFIG_EXT_DELTA_Q
if
(
cm
->
allow_intrabc
)
cm
->
delta_lf_present_flag
=
0
;
#endif // CONFIG_EXT_DELTA_Q
#endif // CONFIG_INTRABC
}
...
...
Write
Preview
Supports
Markdown
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