diff options
| author | Minghai Shang <minghai@google.com> | 2014-05-22 15:51:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-22 15:51:19 -0700 |
| commit | 76bf681338ee60fa90eb64f5832161686aa6c792 (patch) | |
| tree | c7d6b326d74fc307e3a03c37603386747a3832c1 | |
| parent | 00fbdc159b1ac4896a57a8ef5665a24df4a06e19 (diff) | |
| parent | 39aef4023639857d282d65524ac9b5c091df176b (diff) | |
| download | libvpx-76bf681338ee60fa90eb64f5832161686aa6c792.tar libvpx-76bf681338ee60fa90eb64f5832161686aa6c792.tar.gz libvpx-76bf681338ee60fa90eb64f5832161686aa6c792.tar.bz2 libvpx-76bf681338ee60fa90eb64f5832161686aa6c792.zip | |
Merge "[spatial svc] Remove hard coded rc_end_usage setting"
| -rw-r--r-- | examples/vp9_spatial_svc_encoder.c | 1 | ||||
| -rw-r--r-- | vpx/src/svc_encodeframe.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c index 983f52d93..5bc657576 100644 --- a/examples/vp9_spatial_svc_encoder.c +++ b/examples/vp9_spatial_svc_encoder.c @@ -150,6 +150,7 @@ static void parse_command_line(int argc, const char **argv_, 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; diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c index 7ee2a98fd..17e165bfb 100644 --- a/vpx/src/svc_encodeframe.c +++ b/vpx/src/svc_encodeframe.c @@ -580,7 +580,6 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx, // 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) { |