rtc: Allow for setting 1 layer reference struct externally
The control SET_SVC_REF_FRAME_CONFIG allows for the application
to set the full reference structure. But for single layer
encoding we would still default to the internal reference
structure define in av1_set_reference_structure_one_pass_rt().
This change allows the user/application to also define the
reference structure for single layer (non-svc) encoding via
the same control. If the user does not use the control then
the default internal structure will be used. This is useful
to give more control to the app and also for the usage of
RPS (reference picture selection) for 1 layer.
The relevant functions are also renamed to make this clear.
Also renaming the control SET_SVC_REF_FRAME_CONFIG to
SET_RTC_REF_FRAME_CONFIG and related refactoring is considered in:
https://aomedia-review.googlesource.com/c/aom/+/161827
No change in stats.
Change-Id: Iead7c028d14b87a17588efb6c3447c28e4eba180
diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 4d7cb08..96ea687 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -630,7 +630,8 @@
int refresh_mask = 0;
if (ext_refresh_frame_flags->update_pending) {
- if (svc->set_ref_frame_config) {
+ if (svc->set_ref_frame_config ||
+ use_rtc_reference_structure_one_layer(cpi)) {
for (unsigned int i = 0; i < INTER_REFS_PER_FRAME; i++) {
int ref_frame_map_idx = svc->ref_idx[i];
refresh_mask |= svc->refresh[ref_frame_map_idx] << ref_frame_map_idx;
@@ -1412,13 +1413,13 @@
#endif
#if CONFIG_REALTIME_ONLY
av1_get_one_pass_rt_params(cpi, &frame_params, &frame_input, *frame_flags);
- if (use_one_pass_rt_reference_structure(cpi))
- av1_set_reference_structure_one_pass_rt(cpi, cpi->gf_frame_index == 0);
+ if (use_rtc_reference_structure_one_layer(cpi))
+ av1_set_rtc_reference_structure_one_layer(cpi, cpi->gf_frame_index == 0);
#else
if (use_one_pass_rt_params) {
av1_get_one_pass_rt_params(cpi, &frame_params, &frame_input, *frame_flags);
- if (use_one_pass_rt_reference_structure(cpi))
- av1_set_reference_structure_one_pass_rt(cpi, cpi->gf_frame_index == 0);
+ if (use_rtc_reference_structure_one_layer(cpi))
+ av1_set_rtc_reference_structure_one_layer(cpi, cpi->gf_frame_index == 0);
}
#endif
#if CONFIG_COLLECT_COMPONENT_TIMING
@@ -1499,7 +1500,8 @@
if (!ext_flags->refresh_frame.update_pending) {
av1_get_ref_frames(ref_frame_map_pairs, cur_frame_disp, cpi,
cpi->gf_frame_index, 1, cm->remapped_ref_idx);
- } else if (cpi->svc.set_ref_frame_config) {
+ } else if (cpi->svc.set_ref_frame_config ||
+ use_rtc_reference_structure_one_layer(cpi)) {
for (unsigned int i = 0; i < INTER_REFS_PER_FRAME; i++)
cm->remapped_ref_idx[i] = cpi->svc.ref_idx[i];
}
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index a8c1914..13be003 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -3832,9 +3832,10 @@
cpi->oxcf.gf_cfg.lag_in_frames == 0;
}
-static INLINE int use_one_pass_rt_reference_structure(const AV1_COMP *cpi) {
- return cpi->oxcf.speed >= 5 && cpi->ppi->number_spatial_layers == 1 &&
- cpi->ppi->number_temporal_layers == 1;
+static INLINE int use_rtc_reference_structure_one_layer(const AV1_COMP *cpi) {
+ return is_one_pass_rt_params(cpi) && cpi->ppi->number_spatial_layers == 1 &&
+ cpi->ppi->number_temporal_layers == 1 &&
+ !cpi->svc.set_ref_frame_config;
}
// Function return size of frame stats buffer
diff --git a/av1/encoder/encoder_utils.h b/av1/encoder/encoder_utils.h
index 44294db..654d67a 100644
--- a/av1/encoder/encoder_utils.h
+++ b/av1/encoder/encoder_utils.h
@@ -1000,7 +1000,7 @@
static AOM_INLINE int reduce_num_ref_buffers(const AV1_COMP *cpi) {
const SequenceHeader *const seq_params = cpi->common.seq_params;
return is_one_pass_rt_params(cpi) &&
- use_one_pass_rt_reference_structure(cpi) &&
+ use_rtc_reference_structure_one_layer(cpi) &&
(seq_params->order_hint_info.enable_order_hint == 0) &&
cpi->rt_reduce_num_ref_buffers;
}
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index f520d0b..d1618c0 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -2592,7 +2592,7 @@
* (for each of 7 references) and refresh flags (for each of the 8 slots)
* are set in \c cpi->svc.ref_idx[] and \c cpi->svc.refresh[].
*/
-void av1_set_reference_structure_one_pass_rt(AV1_COMP *cpi, int gf_update) {
+void av1_set_rtc_reference_structure_one_layer(AV1_COMP *cpi, int gf_update) {
AV1_COMMON *const cm = &cpi->common;
ExternalFlags *const ext_flags = &cpi->ext_flags;
RATE_CONTROL *const rc = &cpi->rc;
@@ -2606,7 +2606,6 @@
int alt_ref_idx = 0;
int last2_idx = 0;
ext_refresh_frame_flags->update_pending = 1;
- svc->set_ref_frame_config = 1;
ext_flags->ref_frame_flags = 0;
ext_refresh_frame_flags->last_frame = 1;
ext_refresh_frame_flags->golden_frame = 0;
@@ -2629,6 +2628,12 @@
else if (rc->avg_source_sad > th_frame_sad[th_idx][2])
lag_alt = 5;
}
+ // This defines the reference structure for 1 layer (non-svc) RTC encoding.
+ // To avoid the internal/default reference structure for non-realtime
+ // overwriting this behavior, we use the "svc" ref parameters from the
+ // external control SET_SVC_REF_FRAME_CONFIG.
+ // TODO(marpan): rename that control and the related internal parameters
+ // to rtc_ref.
for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) svc->ref_idx[i] = 7;
for (int i = 0; i < REF_FRAMES; ++i) svc->refresh[i] = 0;
// Set the reference frame flags.
diff --git a/av1/encoder/ratectrl.h b/av1/encoder/ratectrl.h
index 65ebbb6..1785e00 100644
--- a/av1/encoder/ratectrl.h
+++ b/av1/encoder/ratectrl.h
@@ -702,8 +702,8 @@
void av1_adjust_gf_refresh_qp_one_pass_rt(struct AV1_COMP *cpi);
-void av1_set_reference_structure_one_pass_rt(struct AV1_COMP *cpi,
- int gf_update);
+void av1_set_rtc_reference_structure_one_layer(struct AV1_COMP *cpi,
+ int gf_update);
/*!\endcond */
/*!\brief Calculates how many bits to use for a P frame in one pass vbr
