From 136a022d71c78b9e2717163d9078970e548d9612 Mon Sep 17 00:00:00 2001 From: Minghai Shang Date: Mon, 11 Aug 2014 13:43:25 -0700 Subject: [PATCH] [spatial svc]Remove CONFIG_SPATIAL_SVC for ss_enable_auto_alt_ref in vpx_codec_enc_cfg to fix heap-overflow issue in asan config Change-Id: Icdf08501db5f416285f751d316941dfacd2c69ba --- vp8/vp8_cx_iface.c | 2 -- vp9/vp9_cx_iface.c | 2 -- vpx/vpx_encoder.h | 2 -- 3 files changed, 6 deletions(-) diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 8767f0d..d515fc0 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -1316,9 +1316,7 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] = "vp8.fpf" /* first pass filename */ #endif VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */ -#if CONFIG_SPATIAL_SVC {0}, -#endif {0}, /* ss_target_bitrate */ 1, /* ts_number_layers */ {0}, /* ts_target_bitrate */ diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 35ee1ae..dc89b4e 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1325,9 +1325,7 @@ static vpx_codec_enc_cfg_map_t encoder_usage_cfg_map[] = { 9999, // kf_max_dist VPX_SS_DEFAULT_LAYERS, // ss_number_layers -#if CONFIG_SPATIAL_SVC {0}, -#endif {0}, // ss_target_bitrate 1, // ts_number_layers {0}, // ts_target_bitrate diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h index 9d2f18c..52495ce 100644 --- a/vpx/vpx_encoder.h +++ b/vpx/vpx_encoder.h @@ -637,14 +637,12 @@ extern "C" { */ unsigned int ss_number_layers; -#if CONFIG_SPATIAL_SVC /*!\brief Enable auto alt reference flags for each spatial layer. * * These values specify if auto alt reference frame is enabled for each * spatial layer. */ int ss_enable_auto_alt_ref[VPX_SS_MAX_LAYERS]; -#endif /*!\brief Target bitrate for each spatial layer. * -- 2.7.4