Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
12d127e3
Commit
12d127e3
authored
Sep 29, 2017
by
Jonathan Matthews
Browse files
Fix CONFIG_LV_MAP and CONFIG_NEW_MULTISYMBOL conflict
bug=aomedia:837 Change-Id: I54233963eac76d7667d5b1350f49ef3108027708
parent
a1a1e365
Changes
3
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodeframe.c
View file @
12d127e3
...
...
@@ -5216,9 +5216,9 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
av1_diff_update_prob
(
&
r
,
&
fc
->
quarter_tx_size_prob
,
ACCT_STR
);
#endif
#if CONFIG_LV_MAP
#if CONFIG_LV_MAP
&& !LV_MAP_PROB
av1_read_txb_probs
(
fc
,
cm
->
tx_mode
,
&
r
,
&
cm
->
counts
);
#endif // CONFIG_LV_MAP
#endif // CONFIG_LV_MAP
&& !LV_MAP_PROB
#if !CONFIG_NEW_MULTISYMBOL
#if CONFIG_VAR_TX
...
...
av1/decoder/decodetxb.c
View file @
12d127e3
...
...
@@ -556,6 +556,7 @@ uint8_t av1_read_coeffs_txb_facade(AV1_COMMON *cm, MACROBLOCKD *xd,
return
cul_level
;
}
#if !LV_MAP_PROB
static
void
read_txb_probs
(
FRAME_CONTEXT
*
fc
,
const
TX_SIZE
tx_size
,
aom_reader
*
r
,
FRAME_COUNTS
*
counts
)
{
#if !CONFIG_SYMBOLRATE
...
...
@@ -593,10 +594,6 @@ void av1_read_txb_probs(FRAME_CONTEXT *fc, TX_MODE tx_mode, aom_reader *r,
TX_SIZE
tx_size
;
int
ctx
,
plane
;
#if LV_MAP_PROB
return
;
#endif
for
(
plane
=
0
;
plane
<
PLANE_TYPES
;
++
plane
)
for
(
ctx
=
0
;
ctx
<
DC_SIGN_CONTEXTS
;
++
ctx
)
av1_diff_update_prob
(
r
,
&
fc
->
dc_sign
[
plane
][
ctx
],
ACCT_STR
);
...
...
@@ -604,3 +601,4 @@ void av1_read_txb_probs(FRAME_CONTEXT *fc, TX_MODE tx_mode, aom_reader *r,
for
(
tx_size
=
TX_4X4
;
tx_size
<=
max_tx_size
;
++
tx_size
)
read_txb_probs
(
fc
,
tx_size
,
r
,
counts
);
}
#endif // !LV_MAP_PROB
av1/decoder/decodetxb.h
View file @
12d127e3
...
...
@@ -28,6 +28,8 @@ uint8_t av1_read_coeffs_txb_facade(AV1_COMMON *cm, MACROBLOCKD *xd,
int
plane
,
tran_low_t
*
tcoeffs
,
TX_SIZE
tx_size
,
int16_t
*
max_scan_line
,
int
*
eob
);
#if !LV_MAP_PROB
void
av1_read_txb_probs
(
FRAME_CONTEXT
*
fc
,
TX_MODE
tx_mode
,
aom_reader
*
r
,
FRAME_COUNTS
*
counts
);
#endif // !LV_MAP_PROB
#endif // DECODETXB_H_
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