diff options
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 10 | ||||
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index d65eff451..224e786b6 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1601,12 +1601,22 @@ void vp9_rc_postencode_update(VP9_COMP *cpi, uint64_t bytes_used) { // update the golden frame counter, only for base temporal layer. if (cpi->use_svc && cpi->svc.use_gf_temporal_ref_current_layer && cpi->svc.temporal_layer_id == 0) { + int i = 0; + SVC *const svc = &cpi->svc; if (cpi->refresh_golden_frame) rc->frames_since_golden = 0; else rc->frames_since_golden++; // Decrement count down till next gf if (rc->frames_till_gf_update_due > 0) rc->frames_till_gf_update_due--; + // Update the frames_since_golden for all upper temporal layers. + for (i = 1; i < svc->number_temporal_layers; ++i) { + const int layer = LAYER_IDS_TO_IDX(svc->spatial_layer_id, i, + svc->number_temporal_layers); + LAYER_CONTEXT *const lc = &svc->layer_context[layer]; + RATE_CONTROL *const lrc = &lc->rc; + lrc->frames_since_golden = rc->frames_since_golden; + } } if (cm->frame_type == KEY_FRAME) rc->frames_since_key = 0; diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index f7e97cebc..09d45b769 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -629,6 +629,12 @@ static void set_rt_speed_feature_framesize_independent( cpi->svc.number_spatial_layers == 3 && cpi->svc.temporal_layer_id > 0 && cpi->oxcf.width * cpi->oxcf.height > 640 * 480) sf->svc_use_lowres_part = 1; + // For SVC when golden is used as second temporal reference: to avoid + // encode time increase only use this feature on base temporal layer. + // (i.e remove golden flag from frame_flags for temporal_layer_id > 0). + if (cpi->use_svc && cpi->svc.use_gf_temporal_ref_current_layer && + cpi->svc.temporal_layer_id > 0) + cpi->ref_frame_flags &= (~VP9_GOLD_FLAG); } if (speed >= 8) { |