Change enable_ref_short_signaling to bool type
Based on the usage of enable_ref_short_signaling, it's better to define
it as boolean instead of int.
Change-Id: I8dcf4c4ab522050682be1d81c32d89a789fbf5ef
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 0b74f2f..3f159c0 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2765,7 +2765,7 @@
}
static int check_frame_refs_short_signaling(AV1_COMMON *const cm,
- int enable_ref_short_signaling) {
+ bool enable_ref_short_signaling) {
// In rtc case when res < 360p and speed >= 9, we turn on
// frame_refs_short_signaling if it won't break the decoder.
if (enable_ref_short_signaling) {
@@ -3038,10 +3038,10 @@
#endif // FRAME_REFS_SHORT_SIGNALING
if (current_frame->frame_refs_short_signaling) {
- // In rtc case when cpi->sf.rt_sf.enable_ref_short_signaling is 1, we
- // turn on frame_refs_short_signaling when the current frame
- // and golden frame are in the same order_hint group,
- // and their relative distance is <= 64 (in order to be decodable).
+ // In rtc case when cpi->sf.rt_sf.enable_ref_short_signaling is true,
+ // we turn on frame_refs_short_signaling when the current frame and
+ // golden frame are in the same order_hint group, and their relative
+ // distance is <= 64 (in order to be decodable).
// For other cases, an example solution for encoder-side
// implementation on frame_refs_short_signaling is also provided in
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 1dbc95d..bbda2eb 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1283,12 +1283,11 @@
// Only turn on enable_ref_short_signaling for low resolution when only
// LAST and GOLDEN ref frames are used.
sf->rt_sf.enable_ref_short_signaling =
- (sf->rt_sf.use_nonrd_altref_frame ||
- (sf->rt_sf.use_comp_ref_nonrd &&
- (sf->rt_sf.ref_frame_comp_nonrd[1] ||
- sf->rt_sf.ref_frame_comp_nonrd[2])))
- ? 0
- : 1;
+ (!sf->rt_sf.use_nonrd_altref_frame &&
+ (!sf->rt_sf.use_comp_ref_nonrd ||
+ (!sf->rt_sf.ref_frame_comp_nonrd[1] &&
+ !sf->rt_sf.ref_frame_comp_nonrd[2])));
+
// TODO(kyslov) Re-enable when AV1 models are trained
#if 0
#if CONFIG_RT_ML_PARTITIONING
@@ -2082,7 +2081,7 @@
rt_sf->set_zeromv_skip_based_on_source_sad = 1;
rt_sf->use_adaptive_subpel_search = false;
rt_sf->screen_content_cdef_filter_qindex_thresh = 0;
- rt_sf->enable_ref_short_signaling = 0;
+ rt_sf->enable_ref_short_signaling = false;
}
// Populate appropriate sub-pel search method based on speed feature and user
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 7605a03..13846bc 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -1663,7 +1663,7 @@
// the final decision is made in check_frame_refs_short_signaling(). The flag
// can only be turned on when res < 360p and speed >= 9, in which case only
// LAST and GOLDEN ref frames are used now.
- int enable_ref_short_signaling;
+ bool enable_ref_short_signaling;
} REAL_TIME_SPEED_FEATURES;
/*!\endcond */
