shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes If13946e4,I61a1814d,I2ca9aa3c,I44d91eaa

* changes:
  intrapred: protect functions w/CONFIG check
  vp9_noise_estimate: protect copy_frame w/CONFIG check
  vp8_cx_iface: delete 3 unused functions
  vp8: mark intra_prediction_down_copy inline

--- a/vp8/common/reconintra4x4.h

+++ b/vp8/common/reconintra4x4.h

@@ -17,8 +17,8 @@

 extern "C" {

 #endif

-static void intra_prediction_down_copy(MACROBLOCKD *xd,

-                                       unsigned char *above_right_src)

+static INLINE void intra_prediction_down_copy(MACROBLOCKD *xd,

+                                              unsigned char *above_right_src)

 {

     int dst_stride = xd->dst.y_stride;

     unsigned char *above_right_dst = xd->dst.y_buffer - dst_stride + 16;

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -1162,31 +1162,6 @@

         return NULL;

 }

-static vpx_codec_err_t vp8e_update_entropy(vpx_codec_alg_priv_t *ctx,

-                                           va_list args)

-{

-    int update = va_arg(args, int);

-    vp8_update_entropy(ctx->cpi, update);

-    return VPX_CODEC_OK;

-

-}

-

-static vpx_codec_err_t vp8e_update_reference(vpx_codec_alg_priv_t *ctx,

-                                             va_list args)

-{

-    int update = va_arg(args, int);

-    vp8_update_reference(ctx->cpi, update);

-    return VPX_CODEC_OK;

-}

-

-static vpx_codec_err_t vp8e_use_reference(vpx_codec_alg_priv_t *ctx,

-                                          va_list args)

-{

-    int reference_flag = va_arg(args, int);

-    vp8_use_as_reference(ctx->cpi, reference_flag);

-    return VPX_CODEC_OK;

-}

-

 static vpx_codec_err_t vp8e_set_frame_flags(vpx_codec_alg_priv_t *ctx,

                                             va_list args)

 {

--- a/vp9/encoder/vp9_noise_estimate.c

+++ b/vp9/encoder/vp9_noise_estimate.c

@@ -66,6 +66,7 @@

     return 0;

 }

+#if CONFIG_VP9_TEMPORAL_DENOISING

 static void copy_frame(YV12_BUFFER_CONFIG * const dest,

                        const YV12_BUFFER_CONFIG * const src) {

   int r;

@@ -81,6 +82,7 @@

     srcbuf += src->y_stride;

   }

 }

+#endif  // CONFIG_VP9_TEMPORAL_DENOISING

 NOISE_LEVEL vp9_noise_estimate_extract_level(NOISE_ESTIMATE *const ne) {

   int noise_level = kLowLow;

--- a/vpx_dsp/intrapred.c

+++ b/vpx_dsp/intrapred.c

@@ -44,6 +44,7 @@

       dst[r * stride + c] = dst[(r + 1) * stride + c - 2];

 }

+#if CONFIG_MISC_FIXES

 static INLINE void d207e_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                    const uint8_t *above, const uint8_t *left) {

   int r, c;

@@ -58,6 +59,7 @@

     dst += stride;

   }

 }

+#endif  // CONFIG_MISC_FIXES

 static INLINE void d63_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                  const uint8_t *above, const uint8_t *left) {

@@ -76,6 +78,7 @@

   }

 }

+#if CONFIG_MISC_FIXES

 static INLINE void d63e_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                   const uint8_t *above, const uint8_t *left) {

   int r, c;

@@ -89,6 +92,7 @@

     dst += stride;

   }

 }

+#endif  // CONFIG_MISC_FIXES

 static INLINE void d45_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                  const uint8_t *above, const uint8_t *left) {

@@ -109,6 +113,7 @@

   }

 }

+#if CONFIG_MISC_FIXES

 static INLINE void d45e_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                   const uint8_t *above, const uint8_t *left) {

   int r, c;

@@ -121,6 +126,7 @@

     dst += stride;

   }

 }

+#endif  // CONFIG_MISC_FIXES

 static INLINE void d117_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                   const uint8_t *above, const uint8_t *left) {