From a390b90f0153c4f861f3848c4e700b3847376275 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 24 Aug 2015 20:03:19 -0700 Subject: [PATCH 1/2] vp9_update_layer_...config: delete dead assignment Change-Id: I7401a70a3f33d13fa1ab0393e59fceb5ef083534 --- vp9/encoder/vp9_svc_layercontext.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index e69404ad9..7b9c4cde0 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -113,8 +113,6 @@ void vp9_update_layer_context_change_config(VP9_COMP *const cpi, if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_NOLAYERING) { for (sl = 0; sl < oxcf->ss_number_layers; ++sl) { - spatial_layer_target = 0; - for (tl = 0; tl < oxcf->ts_number_layers; ++tl) { layer = LAYER_IDS_TO_IDX(sl, tl, oxcf->ts_number_layers); svc->layer_context[layer].target_bandwidth = From c0523090be68f578c612403d8844b583dcc685ed Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 24 Aug 2015 20:07:48 -0700 Subject: [PATCH 2/2] vp8e_encode: check validate_config return Change-Id: I56fad85cae4537f9d68febf9b9264c3e1cf82ce1 --- vp8/vp8_cx_iface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index fe88cd4b1..960c2f4ef 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -879,7 +879,8 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx, } ctx->control_frame_flags = 0; - res = set_reference_and_update(ctx, flags); + if (!res) + res = set_reference_and_update(ctx, flags); /* Handle fixed keyframe intervals */ if (ctx->cfg.kf_mode == VPX_KF_AUTO