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
e46382a4
Commit
e46382a4
authored
May 15, 2017
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
intrabc: Fix build when palette is disabled
Change-Id: I2ad15784cbc238fa4b0f993bfa64c06591ece5e9
parent
28d15c71
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
av1/common/onyxc_int.h
av1/common/onyxc_int.h
+2
-2
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+4
-4
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+4
-4
No files found.
av1/common/onyxc_int.h
View file @
e46382a4
...
...
@@ -214,9 +214,9 @@ typedef struct AV1Common {
int
allow_high_precision_mv
;
#if CONFIG_PALETTE
#if CONFIG_PALETTE
|| CONFIG_INTRABC
int
allow_screen_content_tools
;
#endif // CONFIG_PALETTE
#endif // CONFIG_PALETTE
|| CONFIG_INTRABC
// Flag signaling which frame contexts should be reset to default values.
RESET_FRAME_CONTEXT_MODE
reset_frame_context
;
...
...
av1/decoder/decodeframe.c
View file @
e46382a4
...
...
@@ -4107,17 +4107,17 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
#if CONFIG_ANS && ANS_MAX_SYMBOLS
cm
->
ans_window_size_log2
=
aom_rb_read_literal
(
rb
,
4
)
+
8
;
#endif // CONFIG_ANS && ANS_MAX_SYMBOLS
#if CONFIG_PALETTE
#if CONFIG_PALETTE
|| CONFIG_INTRABC
cm
->
allow_screen_content_tools
=
aom_rb_read_bit
(
rb
);
#endif // CONFIG_PALETTE
#endif // CONFIG_PALETTE
|| CONFIG_INTRABC
#if CONFIG_TEMPMV_SIGNALING
cm
->
use_prev_frame_mvs
=
0
;
#endif
}
else
{
cm
->
intra_only
=
cm
->
show_frame
?
0
:
aom_rb_read_bit
(
rb
);
#if CONFIG_PALETTE
#if CONFIG_PALETTE
|| CONFIG_INTRABC
if
(
cm
->
intra_only
)
cm
->
allow_screen_content_tools
=
aom_rb_read_bit
(
rb
);
#endif // CONFIG_PALETTE
#endif // CONFIG_PALETTE
|| CONFIG_INTRABC
#if CONFIG_TEMPMV_SIGNALING
if
(
cm
->
intra_only
||
cm
->
error_resilient_mode
)
cm
->
use_prev_frame_mvs
=
0
;
#endif
...
...
av1/encoder/bitstream.c
View file @
e46382a4
...
...
@@ -4399,14 +4399,14 @@ static void write_uncompressed_header(AV1_COMP *cpi,
assert
(
cpi
->
common
.
ans_window_size_log2
<
24
);
aom_wb_write_literal
(
wb
,
cpi
->
common
.
ans_window_size_log2
-
8
,
4
);
#endif // CONFIG_ANS && ANS_MAX_SYMBOLS
#if CONFIG_PALETTE
#if CONFIG_PALETTE
|| CONFIG_INTRABC
aom_wb_write_bit
(
wb
,
cm
->
allow_screen_content_tools
);
#endif // CONFIG_PALETTE
#endif // CONFIG_PALETTE
|| CONFIG_INTRABC
}
else
{
if
(
!
cm
->
show_frame
)
aom_wb_write_bit
(
wb
,
cm
->
intra_only
);
#if CONFIG_PALETTE
#if CONFIG_PALETTE
|| CONFIG_INTRABC
if
(
cm
->
intra_only
)
aom_wb_write_bit
(
wb
,
cm
->
allow_screen_content_tools
);
#endif // CONFIG_PALETTE
#endif // CONFIG_PALETTE
|| CONFIG_INTRABC
if
(
!
cm
->
error_resilient_mode
)
{
if
(
cm
->
intra_only
)
{
aom_wb_write_bit
(
wb
,
...
...
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