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
5bb8f5b7
Commit
5bb8f5b7
authored
Nov 02, 2016
by
Yaowu Xu
Browse files
fix build issue with --enable-delta-q
BUG=webm:1330 Change-Id: I120ce8ea3581018b232b19ca7ffbb07d3e99d8d0
parent
c1ca945c
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/common/thread_common.c
View file @
5bb8f5b7
...
...
@@ -528,7 +528,9 @@ void av1_accumulate_frame_counts(AV1_COMMON *cm, FRAME_COUNTS *counts) {
for
(
i
=
0
;
i
<
n_counts
;
i
++
)
acc
[
i
]
+=
cnt
[
i
];
#if CONFIG_DELTA_Q
for
(
i
=
0
;
i
<
DELTA_Q_CONTEXTS
;
i
++
)
for
(
i
=
0
;
i
<
DELTA_Q_CONTEXTS
;
i
++
)
{
int
j
;
for
(
j
=
0
;
j
<
2
;
++
j
)
cm
->
counts
.
delta_q
[
i
][
j
]
+=
counts
->
delta_q
[
i
][
j
];
}
#endif
}
av1/encoder/encodeframe.c
View file @
5bb8f5b7
...
...
@@ -1114,7 +1114,7 @@ static void update_state(const AV1_COMP *const cpi, ThreadData *td,
#if CONFIG_DELTA_Q
if
(
cpi
->
oxcf
.
aq_mode
>
NO_AQ
&&
cpi
->
oxcf
.
aq_mode
<
DELTA_AQ
)
av1_init_plane_quantizers
(
cpi
,
x
);
av1_init_plane_quantizers
(
cpi
,
x
,
xd
->
mi
[
0
]
->
mbmi
.
segment_id
);
#else
if
(
cpi
->
oxcf
.
aq_mode
)
av1_init_plane_quantizers
(
cpi
,
x
,
xd
->
mi
[
0
]
->
mbmi
.
segment_id
);
...
...
@@ -1797,7 +1797,8 @@ static void update_inter_mode_stats(FRAME_COUNTS *counts, PREDICTION_MODE mode,
}
#endif
static
void
update_stats
(
const
AV1_COMMON
*
const
cm
,
ThreadData
*
td
static
void
update_stats
(
const
AV1_COMMON
*
const
cm
,
ThreadData
*
td
,
int
mi_row
,
int
mi_col
#if CONFIG_SUPERTX
,
int
supertx_enabled
...
...
@@ -1830,6 +1831,9 @@ static void update_stats(const AV1_COMMON *const cm, ThreadData *td
if
(
absdq
<
DELTA_Q_SMALL
)
td
->
counts
->
delta_q
[
absdq
][
0
]
++
;
xd
->
prev_qindex
=
mbmi
->
current_q_index
;
}
#else
(
void
)
mi_row
;
(
void
)
mi_col
;
#endif
if
(
!
frame_is_intra_only
(
cm
))
{
FRAME_COUNTS
*
const
counts
=
td
->
counts
;
...
...
@@ -2147,9 +2151,9 @@ static void encode_b(const AV1_COMP *const cpi, const TileInfo *const tile,
if
(
!
dry_run
)
{
#if CONFIG_SUPERTX
update_stats
(
&
cpi
->
common
,
td
,
0
);
update_stats
(
&
cpi
->
common
,
td
,
mi_row
,
mi_col
,
0
);
#else
update_stats
(
&
cpi
->
common
,
td
);
update_stats
(
&
cpi
->
common
,
td
,
mi_row
,
mi_col
);
#endif
}
}
...
...
@@ -4240,7 +4244,7 @@ static void encode_rd_sb_row(AV1_COMP *cpi, ThreadData *td,
set_offsets
(
cpi
,
tile_info
,
x
,
mi_row
,
mi_col
,
BLOCK_64X64
);
xd
->
mi
[
0
]
->
mbmi
.
current_q_index
=
current_qindex
;
xd
->
mi
[
0
]
->
mbmi
.
segment_id
=
0
;
av1_init_plane_quantizers
(
cpi
,
x
);
av1_init_plane_quantizers
(
cpi
,
x
,
xd
->
mi
[
0
]
->
mbmi
.
segment_id
);
}
#endif
...
...
@@ -5565,7 +5569,13 @@ static void predict_b_extend(const AV1_COMP *const cpi, ThreadData *td,
#endif // CONFIG_EXT_INTER
mi_row_pred
,
mi_col_pred
,
bsize_pred
,
b_sub8x8
,
block
);
if
(
!
dry_run
&&
!
bextend
)
update_stats
(
&
cpi
->
common
,
td
,
1
);
if
(
!
dry_run
&&
!
bextend
)
{
#if CONFIG_SUPERTX
update_stats
(
&
cpi
->
common
,
td
,
mi_row_pred
,
mi_col_pred
,
1
);
#else
update_stats
(
&
cpi
->
common
,
td
,
mi_row_pred
,
mi_col_pred
);
#endif
}
}
static
void
extend_dir
(
const
AV1_COMP
*
const
cpi
,
ThreadData
*
td
,
...
...
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