diff options
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/picklpf.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 49de62d7d..beefe8d8e 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -161,7 +161,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) if (cm->sharpness_level != cm->last_sharpness_level) { vp8_loop_filter_update_sharpness(&cm->lf_info, cm->sharpness_level); - cm->last_sharpness_level = cm->last_sharpness_level; + cm->last_sharpness_level = cm->sharpness_level; } // Start the search at the previous frame filter level unless it is now out of range. diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 8394c8e05..9f703a3c4 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -40,6 +40,7 @@ struct vp8_extracfg unsigned int experimental; vp8e_tuning tuning; unsigned int cq_level; /* constrained quality level */ + unsigned int rc_max_intra_bitrate_pct; }; @@ -73,6 +74,7 @@ static const struct extraconfig_map extracfg_map[] = 0, /* experimental mode */ 0, /* tuning*/ 10, /* cq_level */ + 0, /* rc_max_intra_bitrate_pct */ } } }; @@ -308,7 +310,7 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf, } oxcf->target_bandwidth = cfg.rc_target_bitrate; - oxcf->rc_max_intra_bitrate_pct = cfg.rc_max_intra_bitrate_pct; + oxcf->rc_max_intra_bitrate_pct = vp8_cfg.rc_max_intra_bitrate_pct; oxcf->best_allowed_q = cfg.rc_min_quantizer; oxcf->worst_allowed_q = cfg.rc_max_quantizer; @@ -465,6 +467,7 @@ static vpx_codec_err_t set_param(vpx_codec_alg_priv_t *ctx, MAP(VP8E_SET_ARNR_TYPE , xcfg.arnr_type); MAP(VP8E_SET_TUNING, xcfg.tuning); MAP(VP8E_SET_CQ_LEVEL, xcfg.cq_level); + MAP(VP8E_SET_MAX_INTRA_BITRATE_PCT, xcfg.rc_max_intra_bitrate_pct); } @@ -1107,6 +1110,7 @@ static vpx_codec_ctrl_fn_map_t vp8e_ctf_maps[] = {VP8E_SET_ARNR_TYPE , set_param}, {VP8E_SET_TUNING, set_param}, {VP8E_SET_CQ_LEVEL, set_param}, + {VP8E_SET_MAX_INTRA_BITRATE_PCT, set_param}, { -1, NULL}, }; @@ -1139,7 +1143,6 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] = {0}, /* rc_twopass_stats_in */ #endif 256, /* rc_target_bandwidth */ - 0, /* rc_max_intra_bitrate_pct */ 4, /* rc_min_quantizer */ 63, /* rc_max_quantizer */ 100, /* rc_undershoot_pct */ |