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
619576b4
Commit
619576b4
authored
May 10, 2017
by
Alex Converse
Browse files
Deduplicate write_mb_modes_kf declaration
Change-Id: I325f781759c1087815a38ff7c12ea31b8e444575
parent
5ab58722
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/encoder/bitstream.c
View file @
619576b4
...
...
@@ -2083,15 +2083,14 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const int mi_row,
#endif // !CONFIG_TXK_SEL
}
static
void
write_mb_modes_kf
(
AV1_COMMON
*
cm
,
#if CONFIG_DELTA_Q
static
void
write_mb_modes_kf
(
AV1_COMMON
*
cm
,
MACROBLOCKD
*
xd
,
const
int
mi_row
,
const
int
mi_col
,
aom_writer
*
w
)
{
int
skip
;
MACROBLOCKD
*
xd
,
#else
static
void
write_mb_modes_kf
(
AV1_COMMON
*
cm
,
const
MACROBLOCKD
*
xd
,
const
MACROBLOCKD
*
xd
,
#endif // CONFIG_DELTA_Q
const
int
mi_row
,
const
int
mi_col
,
aom_writer
*
w
)
{
#endif
const
struct
segmentation
*
const
seg
=
&
cm
->
seg
;
struct
segmentation_probs
*
const
segp
=
&
cm
->
fc
->
seg
;
const
MODE_INFO
*
const
mi
=
xd
->
mi
[
0
];
...
...
@@ -2116,7 +2115,7 @@ static void write_mb_modes_kf(AV1_COMMON *cm, const MACROBLOCKD *xd,
if
(
seg
->
update_map
)
write_segment_id
(
w
,
seg
,
segp
,
mbmi
->
segment_id
);
#if CONFIG_DELTA_Q
skip
=
write_skip
(
cm
,
xd
,
mbmi
->
segment_id
,
mi
,
w
);
const
int
skip
=
write_skip
(
cm
,
xd
,
mbmi
->
segment_id
,
mi
,
w
);
if
(
cm
->
delta_q_present_flag
)
{
int
super_block_upper_left
=
((
mi_row
&
MAX_MIB_MASK
)
==
0
)
&&
((
mi_col
&
MAX_MIB_MASK
)
==
0
);
...
...
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