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
8aca36d3
Commit
8aca36d3
authored
Jan 31, 2017
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ans: Remove some out of date ifdefs
Change-Id: Ibd4bbceca8218eb94ed0af3c980f8e829a1896de
parent
1da2edcd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
16 deletions
+5
-16
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+5
-16
No files found.
av1/decoder/decodeframe.c
View file @
8aca36d3
...
...
@@ -478,16 +478,9 @@ static int av1_pvq_decode_helper2(AV1_COMMON *cm, MACROBLOCKD *const xd,
}
#endif
static
void
predict_and_reconstruct_intra_block
(
AV1_COMMON
*
cm
,
MACROBLOCKD
*
const
xd
,
#if CONFIG_ANS
struct
AnsDecoder
*
const
r
,
#else
aom_reader
*
r
,
#endif // CONFIG_ANS
MB_MODE_INFO
*
const
mbmi
,
int
plane
,
int
row
,
int
col
,
TX_SIZE
tx_size
)
{
static
void
predict_and_reconstruct_intra_block
(
AV1_COMMON
*
cm
,
MACROBLOCKD
*
const
xd
,
aom_reader
*
const
r
,
MB_MODE_INFO
*
const
mbmi
,
int
plane
,
int
row
,
int
col
,
TX_SIZE
tx_size
)
{
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
PREDICTION_MODE
mode
=
(
plane
==
0
)
?
mbmi
->
mode
:
mbmi
->
uv_mode
;
PLANE_TYPE
plane_type
=
(
plane
==
0
)
?
PLANE_TYPE_Y
:
PLANE_TYPE_UV
;
...
...
@@ -586,12 +579,8 @@ static void decode_reconstruct_tx(AV1_COMMON *cm, MACROBLOCKD *const xd,
#if !CONFIG_VAR_TX || CONFIG_SUPERTX || \
(!CONFIG_VAR_TX && CONFIG_EXT_TX && CONFIG_RECT_TX)
static
int
reconstruct_inter_block
(
AV1_COMMON
*
cm
,
MACROBLOCKD
*
const
xd
,
#if CONFIG_ANS
struct
AnsDecoder
*
const
r
,
#else
aom_reader
*
r
,
#endif
int
segment_id
,
int
plane
,
int
row
,
int
col
,
aom_reader
*
const
r
,
int
segment_id
,
int
plane
,
int
row
,
int
col
,
TX_SIZE
tx_size
)
{
PLANE_TYPE
plane_type
=
(
plane
==
0
)
?
PLANE_TYPE_Y
:
PLANE_TYPE_UV
;
int
block_idx
=
(
row
<<
1
)
+
col
;
...
...
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