shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes from topic 'missing-proto'

* changes:
  vp9_frame_scale_ssse3.c: make 2 functions static
  vp9_pickmode.c: make function static
  vp9_noise_estimate.c: make function static
  vp9_aq_360.c: add missing include
  vp9_idct_intrin_sse2: add missing vp9_rtcd.h include
  vpx_dsp/*.[hc]: add missing vpx_dsp_rtcd.h include

--- a/vp9/common/x86/vp9_idct_intrin_sse2.c

+++ b/vp9/common/x86/vp9_idct_intrin_sse2.c

@@ -8,6 +8,7 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#include "./vp9_rtcd.h"

 #include "vpx_dsp/x86/inv_txfm_sse2.h"

 #include "vpx_dsp/x86/txfm_common_sse2.h"

 #include "vpx_ports/mem.h"

--- a/vp9/encoder/vp9_aq_360.c

+++ b/vp9/encoder/vp9_aq_360.c

@@ -13,6 +13,7 @@

 #include "vpx_ports/mem.h"

 #include "vpx_ports/system_state.h"

+#include "vp9/encoder/vp9_aq_360.h"

 #include "vp9/encoder/vp9_aq_variance.h"

 #include "vp9/common/vp9_seg_common.h"

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

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

@@ -39,7 +39,7 @@

   ne->num_frames_estimate = 20;

 }

-int enable_noise_estimation(VP9_COMP *const cpi) {

+static int enable_noise_estimation(VP9_COMP *const cpi) {

   // Enable noise estimation if denoising is on.

 #if CONFIG_VP9_TEMPORAL_DENOISING

   if (cpi->oxcf.noise_sensitivity > 0)

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1105,7 +1105,7 @@

     {GOLDEN_FRAME, NEWMV}

 };

-int set_intra_cost_penalty(const VP9_COMP *const cpi, BLOCK_SIZE bsize) {

+static int set_intra_cost_penalty(const VP9_COMP *const cpi, BLOCK_SIZE bsize) {

   const VP9_COMMON *const cm = &cpi->common;

   // Reduce the intra cost penalty for small blocks (<=16x16).

   int reduction_fac =

--- a/vp9/encoder/x86/vp9_frame_scale_ssse3.c

+++ b/vp9/encoder/x86/vp9_frame_scale_ssse3.c

@@ -23,9 +23,9 @@

 extern void vp9_scale_and_extend_frame_c(const YV12_BUFFER_CONFIG *src,

                                          YV12_BUFFER_CONFIG *dst);

-void downsample_2_to_1_ssse3(const uint8_t *src, ptrdiff_t src_stride,

-                             uint8_t *dst, ptrdiff_t dst_stride,

-                             int w, int h) {

+static void downsample_2_to_1_ssse3(const uint8_t *src, ptrdiff_t src_stride,

+                                    uint8_t *dst, ptrdiff_t dst_stride,

+                                    int w, int h) {

   const __m128i mask = _mm_set1_epi16(0x00FF);

   const int max_width = w & ~15;

   int y;

@@ -92,9 +92,9 @@

   }

 }

-void upsample_1_to_2_ssse3(const uint8_t *src, ptrdiff_t src_stride,

-                           uint8_t *dst, ptrdiff_t dst_stride,

-                           int dst_w, int dst_h) {

+static void upsample_1_to_2_ssse3(const uint8_t *src, ptrdiff_t src_stride,

+                                  uint8_t *dst, ptrdiff_t dst_stride,

+                                  int dst_w, int dst_h) {

   dst_w /= 2;

   dst_h /= 2;

   {

--- a/vpx_dsp/fwd_txfm.c

+++ b/vpx_dsp/fwd_txfm.c

@@ -8,6 +8,7 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#include "./vpx_dsp_rtcd.h"

 #include "vpx_dsp/fwd_txfm.h"

 void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride) {

--- a/vpx_dsp/inv_txfm.c

+++ b/vpx_dsp/inv_txfm.c

@@ -11,6 +11,7 @@

 #include <math.h>

 #include <string.h>

+#include "./vpx_dsp_rtcd.h"

 #include "vpx_dsp/inv_txfm.h"

 void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) {

--- a/vpx_dsp/loopfilter.c

+++ b/vpx_dsp/loopfilter.c

@@ -11,6 +11,7 @@

 #include <stdlib.h>

 #include "./vpx_config.h"

+#include "./vpx_dsp_rtcd.h"

 #include "vpx_dsp/vpx_dsp_common.h"

 #include "vpx_ports/mem.h"

--- a/vpx_dsp/quantize.c

+++ b/vpx_dsp/quantize.c

@@ -8,6 +8,7 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#include "./vpx_dsp_rtcd.h"

 #include "vpx_dsp/quantize.h"

 #include "vpx_mem/vpx_mem.h"

--- a/vpx_dsp/x86/fwd_dct32x32_impl_avx2.h

+++ b/vpx_dsp/x86/fwd_dct32x32_impl_avx2.h

@@ -10,6 +10,7 @@

 #include <immintrin.h>  // AVX2

+#include "./vpx_dsp_rtcd.h"

 #include "vpx_dsp/txfm_common.h"

 #define pair256_set_epi16(a, b) \

--- a/vpx_dsp/x86/fwd_txfm_sse2.c

+++ b/vpx_dsp/x86/fwd_txfm_sse2.c

@@ -11,6 +11,7 @@

 #include <emmintrin.h>  // SSE2

 #include "./vpx_config.h"

+#include "./vpx_dsp_rtcd.h"

 #include "vpx_dsp/vpx_dsp_common.h"

 #include "vpx_dsp/x86/fwd_txfm_sse2.h"