From 105da4128daba45a83eea7ef8cccfd7c86341961 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Fri, 5 Feb 2016 07:50:57 -0800 Subject: [PATCH] Fix bad merge artifacts Temporaly disable warning for unused function for vp10, needs clean out the warnings before re-enable the flag for vp10. Change-Id: I5636f8cd607423f6ea6963db9c2cbd688e30b495 --- configure | 2 +- vp10/decoder/decodeframe.c | 7 ++++--- vpx_dsp/intrapred.c | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configure b/configure index c93c22cb4..322be7c07 100755 --- a/configure +++ b/configure @@ -611,7 +611,7 @@ process_toolchain() { ;; *) check_add_cflags -Wunused-but-set-variable ;; esac - if enabled mips || [ -z "${INLINE}" ]; then + if enabled mips || [ -z "${INLINE}" ] || enabled vp10; then enabled extra_warnings || check_add_cflags -Wno-unused-function else check_add_cflags -Wunused-function diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c index 48b121792..19364c976 100644 --- a/vp10/decoder/decodeframe.c +++ b/vp10/decoder/decodeframe.c @@ -862,7 +862,7 @@ static void dec_build_inter_predictors_sb(VP10Decoder *const pbi, } } } - +#if CONFIG_SUPERTX static void dec_build_inter_predictors_sb_sub8x8(VP10Decoder *const pbi, MACROBLOCKD *xd, int mi_row, int mi_col, @@ -905,7 +905,7 @@ static void dec_build_inter_predictors_sb_sub8x8(VP10Decoder *const pbi, } } } - +#endif static INLINE TX_SIZE dec_get_uv_tx_size(const MB_MODE_INFO *mbmi, int n4_wl, int n4_hl) { // get minimum log2 num4x4s dimension @@ -2024,7 +2024,7 @@ static void setup_bool_decoder(const uint8_t *data, vpx_internal_error(error_info, VPX_CODEC_MEM_ERROR, "Failed to allocate bool decoder %d", 1); } - +#if CONFIG_ANS static void setup_token_decoder(const uint8_t *data, const uint8_t *data_end, const size_t read_size, @@ -2045,6 +2045,7 @@ static void setup_token_decoder(const uint8_t *data, vpx_internal_error(error_info, VPX_CODEC_MEM_ERROR, "Failed to allocate token decoder %d", 1); } +#endif static void read_coef_probs_common(vp10_coeff_probs_model *coef_probs, vpx_reader *r) { diff --git a/vpx_dsp/intrapred.c b/vpx_dsp/intrapred.c index cbb2d8df1..18bcd87f2 100644 --- a/vpx_dsp/intrapred.c +++ b/vpx_dsp/intrapred.c @@ -528,7 +528,6 @@ static INLINE void highbd_d207_predictor(uint16_t *dst, ptrdiff_t stride, } } -#if CONFIG_MISC_FIXES static INLINE void highbd_d207e_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, const uint16_t *left, int bd) { @@ -545,7 +544,6 @@ static INLINE void highbd_d207e_predictor(uint16_t *dst, ptrdiff_t stride, dst += stride; } } -#endif // CONFIG_MISC_FIXES static INLINE void highbd_d63_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, @@ -581,7 +579,6 @@ static INLINE void highbd_d45_predictor(uint16_t *dst, ptrdiff_t stride, int bs, } } -#if CONFIG_MISC_FIXES static INLINE void highbd_d45e_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, const uint16_t *left, int bd) { @@ -596,7 +593,6 @@ static INLINE void highbd_d45e_predictor(uint16_t *dst, ptrdiff_t stride, dst += stride; } } -#endif // CONFIG_MISC_FIXES static INLINE void highbd_d117_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, -- 2.40.0