shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "[spatial svc] Remove hard coded rc_end_usage setting"

--- a/examples/vp9_spatial_svc_encoder.c

+++ b/examples/vp9_spatial_svc_encoder.c

@@ -150,6 +150,7 @@

   enc_cfg->rc_target_bitrate = default_bitrate;

   enc_cfg->kf_min_dist = default_kf_dist;

   enc_cfg->kf_max_dist = default_kf_dist;

+  enc_cfg->rc_end_usage = VPX_CQ;

   // initialize AppInput with default values

   app_input->frames_to_code = default_frames_to_code;

--- a/vpx/src/svc_encodeframe.c

+++ b/vpx/src/svc_encodeframe.c

@@ -580,7 +580,6 @@

   // TODO(ivanmaltz): determine if these values need to be set explicitly for

   // svc, or if the normal default/override mechanism can be used

   enc_cfg->rc_dropframe_thresh = 0;

-  enc_cfg->rc_end_usage = VPX_CBR;

   enc_cfg->rc_resize_allowed = 0;

   if (enc_cfg->g_pass == VPX_RC_ONE_PASS) {