Google Git
Sign in
aomedia/avm/b8a28fbb3a23f2512261e801fbdc341d96c324dd^1..b8a28fbb3a23f2512261e801fbdc341d96c324dd/.
commit
b8a28fbb3a23f2512261e801fbdc341d96c324dd
[log]
author
James Zern <jzern@google.com>
Tue Jul 12 02:39:24 2016 +0000
committer
Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue Jul 12 02:39:24 2016 +0000
tree
149ab46cf34851d1024d9f6b6bfa6cb53640889d
parent
4ff6d13771456019e8d2e5eb262595b9ca2a06b8 [diff]
parent
849e99077985f4f040b99412d1eb28244a11156f [diff]
Merge changes from topic 'missing-proto' into nextgenv2

* changes:
  vp10/encoder/rdopt.c: make a function static
  vp10/encoder/rd.c: make a function static
  vp10_convolve_ssse3.c: make some functions static
  vp10/encoder/bitstream.[hc]: correct a prototype
  vp10/common/idct.h: add some missing prototypes
  highbd_quantize_intrin_sse2.c: add missing rtcd include
  vp10: add some missing includes

diff --git a/vp10/common/idct.h b/vp10/common/idct.h
index ffdad0c..5d52314 100644
--- a/vp10/common/idct.h
+++ b/vp10/common/idct.h

@@ -57,6 +57,12 @@
                      int eob);
 void vp10_idct4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
                      int eob);
+void vp10_idct8x8_add(const tran_low_t *input, uint8_t *dest, int stride,
+                      int eob);
+void vp10_idct16x16_add(const tran_low_t *input, uint8_t *dest, int stride,
+                        int eob);
+void vp10_idct32x32_add(const tran_low_t *input, uint8_t *dest, int stride,
+                        int eob);
 
 void vp10_inv_txfm_add_4x4(const tran_low_t *input, uint8_t *dest,
                            int stride, int eob, TX_TYPE tx_type, int lossless);

diff --git a/vp10/common/vp10_convolve.c b/vp10/common/vp10_convolve.c
index 2026df1..6794a4b 100644
--- a/vp10/common/vp10_convolve.c
+++ b/vp10/common/vp10_convolve.c

@@ -2,6 +2,7 @@
 #include <string.h>
 
 #include "./vp10_rtcd.h"
+#include "vp10/common/vp10_convolve.h"
 #include "vp10/common/filter.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"

diff --git a/vp10/common/vp10_fwd_txfm.c b/vp10/common/vp10_fwd_txfm.c
index 3211cd0..17935c5 100644
--- a/vp10/common/vp10_fwd_txfm.c
+++ b/vp10/common/vp10_fwd_txfm.c

@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp10_rtcd.h"
 #include "vp10/common/vp10_fwd_txfm.h"
 
 void vp10_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride) {

diff --git a/vp10/common/vp10_fwd_txfm2d.c b/vp10/common/vp10_fwd_txfm2d.c
index 91a5357..cddd7dc 100644
--- a/vp10/common/vp10_fwd_txfm2d.c
+++ b/vp10/common/vp10_fwd_txfm2d.c

@@ -10,6 +10,7 @@
 
 #include <assert.h>
 
+#include "./vp10_rtcd.h"
 #include "vp10/common/enums.h"
 #include "vp10/common/vp10_fwd_txfm1d.h"
 #include "vp10/common/vp10_fwd_txfm2d_cfg.h"

diff --git a/vp10/common/vp10_inv_txfm.c b/vp10/common/vp10_inv_txfm.c
index 403b209..0ebac42 100644
--- a/vp10/common/vp10_inv_txfm.c
+++ b/vp10/common/vp10_inv_txfm.c

@@ -12,6 +12,7 @@
 #include <math.h>
 #include <string.h>
 
+#include "./vp10_rtcd.h"
 #include "vp10/common/vp10_inv_txfm.h"
 
 void vp10_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) {

diff --git a/vp10/common/vp10_inv_txfm2d.c b/vp10/common/vp10_inv_txfm2d.c
index ccf4614..85a33ba 100644
--- a/vp10/common/vp10_inv_txfm2d.c
+++ b/vp10/common/vp10_inv_txfm2d.c

@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp10_rtcd.h"
 #include "vp10/common/enums.h"
 #include "vp10/common/vp10_txfm.h"
 #include "vp10/common/vp10_inv_txfm1d.h"

diff --git a/vp10/common/x86/idct_intrin_sse2.c b/vp10/common/x86/idct_intrin_sse2.c
index d8b6d95..da60764 100644
--- a/vp10/common/x86/idct_intrin_sse2.c
+++ b/vp10/common/x86/idct_intrin_sse2.c

@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp10_rtcd.h"
 #include "vpx_dsp/x86/inv_txfm_sse2.h"
 #include "vpx_dsp/x86/txfm_common_sse2.h"
 #include "vpx_ports/mem.h"

diff --git a/vp10/common/x86/vp10_convolve_ssse3.c b/vp10/common/x86/vp10_convolve_ssse3.c
index 75520c9..07dc11d 100644
--- a/vp10/common/x86/vp10_convolve_ssse3.c
+++ b/vp10/common/x86/vp10_convolve_ssse3.c

@@ -81,8 +81,9 @@
 static store_pixel_t store4pixelTab[2] = {
   store_4_pixel_only, accumulate_store_4_pixel};
 
-void horiz_w4_ssse3(const uint8_t *src, const __m128i *f,
-                    int tapsNum, store_pixel_t store_func, uint8_t *dst) {
+static void horiz_w4_ssse3(const uint8_t *src, const __m128i *f,
+                           int tapsNum, store_pixel_t store_func,
+                           uint8_t *dst) {
   __m128i sumPairRow[4];
   __m128i sumPairCol[8];
   __m128i pixel;
@@ -122,40 +123,40 @@
   store_func(&sumPairRow[1], dst);
 }
 
-void horiz_w8_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
-                    store_pixel_t store, uint8_t *buf) {
+static void horiz_w8_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
+                           store_pixel_t store, uint8_t *buf) {
   horiz_w4_ssse3(src, f, tapsNum, store, buf);
   src += 4;
   buf += 4;
   horiz_w4_ssse3(src, f, tapsNum, store, buf);
 }
 
-void horiz_w16_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
-                     store_pixel_t store, uint8_t *buf) {
+static void horiz_w16_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
+                            store_pixel_t store, uint8_t *buf) {
   horiz_w8_ssse3(src, f, tapsNum, store, buf);
   src += 8;
   buf += 8;
   horiz_w8_ssse3(src, f, tapsNum, store, buf);
 }
 
-void horiz_w32_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
-                     store_pixel_t store, uint8_t *buf) {
+static void horiz_w32_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
+                            store_pixel_t store, uint8_t *buf) {
   horiz_w16_ssse3(src, f, tapsNum, store, buf);
   src += 16;
   buf += 16;
   horiz_w16_ssse3(src, f, tapsNum, store, buf);
 }
 
-void horiz_w64_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
-                     store_pixel_t store, uint8_t *buf) {
+static void horiz_w64_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
+                            store_pixel_t store, uint8_t *buf) {
   horiz_w32_ssse3(src, f, tapsNum, store, buf);
   src += 32;
   buf += 32;
   horiz_w32_ssse3(src, f, tapsNum, store, buf);
 }
 
-void horiz_w128_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
-                      store_pixel_t store, uint8_t *buf) {
+static void horiz_w128_ssse3(const uint8_t *src, const __m128i *f, int tapsNum,
+                             store_pixel_t store, uint8_t *buf) {
   horiz_w64_ssse3(src, f, tapsNum, store, buf);
   src += 64;
   buf += 64;
@@ -172,8 +173,8 @@
   horiz_w128_ssse3,
 };
 
-void filter_horiz_ssse3(const uint8_t *src, __m128i *f, int tapsNum, int width,
-                        store_pixel_t store, uint8_t *dst) {
+static void filter_horiz_ssse3(const uint8_t *src, __m128i *f, int tapsNum,
+                               int width, store_pixel_t store, uint8_t *dst) {
   switch (width) {
     // Note:
     // For width=2 and 4, store function must be different
@@ -813,9 +814,10 @@
   store_func(&sum, dst);
 }
 
-void filter_vert_compute_small(const uint8_t *src, int src_stride, __m128i *f,
-                               int tapsNum, store_pixel_t store_func, int h,
-                               uint8_t *dst, int dst_stride) {
+static void filter_vert_compute_small(const uint8_t *src, int src_stride,
+                                      __m128i *f, int tapsNum,
+                                      store_pixel_t store_func, int h,
+                                      uint8_t *dst, int dst_stride) {
   int rowIndex = 0;
   do {
     filter_vert_horiz_parallel_ssse3(src, src_stride, f, tapsNum, store_func,
@@ -826,9 +828,10 @@
   } while (rowIndex < h);
 }
 
-void filter_vert_compute_large(const uint8_t *src, int src_stride, __m128i *f,
-                               int tapsNum, store_pixel_t store_func, int w,
-                               int h, uint8_t *dst, int dst_stride) {
+static void filter_vert_compute_large(const uint8_t *src, int src_stride,
+                                      __m128i *f, int tapsNum,
+                                      store_pixel_t store_func, int w, int h,
+                                      uint8_t *dst, int dst_stride) {
   int col;
   int rowIndex = 0;
   const uint8_t *src_ptr = src;

diff --git a/vp10/common/x86/vp10_fwd_txfm2d_sse4.c b/vp10/common/x86/vp10_fwd_txfm2d_sse4.c
index 1d70f14..ff04dc8 100644
--- a/vp10/common/x86/vp10_fwd_txfm2d_sse4.c
+++ b/vp10/common/x86/vp10_fwd_txfm2d_sse4.c

@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "./vp10_rtcd.h"
 #include "vp10/common/enums.h"
 #include "vp10/common/vp10_txfm.h"
 #include "vp10/common/x86/vp10_txfm1d_sse4.h"

diff --git a/vp10/common/x86/vp10_fwd_txfm_sse2.c b/vp10/common/x86/vp10_fwd_txfm_sse2.c
index 032c3cc..30bce5f 100644
--- a/vp10/common/x86/vp10_fwd_txfm_sse2.c
+++ b/vp10/common/x86/vp10_fwd_txfm_sse2.c

@@ -10,6 +10,7 @@
 
 #include <emmintrin.h>  // SSE2
 
+#include "./vp10_rtcd.h"
 #include "./vpx_config.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_dsp/x86/fwd_txfm_sse2.h"

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 389e40b..3999c94 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c

@@ -121,7 +121,7 @@
 static struct vp10_token motvar_encodings[MOTION_VARIATIONS];
 #endif  // CONFIG_OBMC || CONFIG_WARPED_MOTION
 
-void vp10_encode_token_init() {
+void vp10_encode_token_init(void) {
 #if CONFIG_EXT_TX
   int s;
   for (s = 1; s < EXT_TX_SETS_INTER; ++s) {

diff --git a/vp10/encoder/bitstream.h b/vp10/encoder/bitstream.h
index 0284920..cacdb43 100644
--- a/vp10/encoder/bitstream.h
+++ b/vp10/encoder/bitstream.h

@@ -20,7 +20,7 @@
 
 void vp10_pack_bitstream(VP10_COMP *const cpi, uint8_t *dest, size_t *size);
 
-void vp10_encode_token_init();
+void vp10_encode_token_init(void);
 
 static INLINE int vp10_preserve_existing_gf(VP10_COMP *cpi) {
   return !cpi->multi_arf_allowed && cpi->refresh_golden_frame &&

diff --git a/vp10/encoder/rd.c b/vp10/encoder/rd.c
index f82e74c..9e0a339 100644
--- a/vp10/encoder/rd.c
+++ b/vp10/encoder/rd.c

@@ -582,10 +582,10 @@
   }
 }
 
-void vp10_get_entropy_contexts_plane(BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
-                                     const struct macroblockd_plane *pd,
-                                     ENTROPY_CONTEXT t_above[2 * MAX_MIB_SIZE],
-                                     ENTROPY_CONTEXT t_left[2 * MAX_MIB_SIZE]) {
+static void get_entropy_contexts_plane(
+    BLOCK_SIZE plane_bsize, TX_SIZE tx_size, const struct macroblockd_plane *pd,
+    ENTROPY_CONTEXT t_above[2 * MAX_MIB_SIZE],
+    ENTROPY_CONTEXT t_left[2 * MAX_MIB_SIZE]) {
   const int num_4x4_w = num_4x4_blocks_wide_lookup[plane_bsize];
   const int num_4x4_h = num_4x4_blocks_high_lookup[plane_bsize];
   const ENTROPY_CONTEXT *const above = pd->above_context;
@@ -626,7 +626,7 @@
                               ENTROPY_CONTEXT t_above[2 * MAX_MIB_SIZE],
                               ENTROPY_CONTEXT t_left[2 * MAX_MIB_SIZE]) {
   const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
-  vp10_get_entropy_contexts_plane(plane_bsize, tx_size, pd, t_above, t_left);
+  get_entropy_contexts_plane(plane_bsize, tx_size, pd, t_above, t_left);
 }
 
 void vp10_mv_pred(VP10_COMP *cpi, MACROBLOCK *x,

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index c64d57e..b96e6e4 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c

@@ -604,11 +604,10 @@
   (void) var[15];
 }
 
-int adst_vs_flipadst(const VP10_COMP *cpi,
-                     BLOCK_SIZE bsize,
-                     uint8_t *src, int src_stride,
-                     uint8_t *dst, int dst_stride,
-                     double *hdist, double *vdist) {
+static int adst_vs_flipadst(const VP10_COMP *cpi, BLOCK_SIZE bsize,
+                            uint8_t *src, int src_stride,
+                            uint8_t *dst, int dst_stride,
+                            double *hdist, double *vdist) {
   int prune_bitmask = 0;
   double svm_proj_h = 0, svm_proj_v = 0;
   get_energy_distribution_fine(cpi, bsize, src, src_stride,

diff --git a/vpx_dsp/x86/highbd_quantize_intrin_sse2.c b/vpx_dsp/x86/highbd_quantize_intrin_sse2.c
index fd46bef..164ffcf 100644
--- a/vpx_dsp/x86/highbd_quantize_intrin_sse2.c
+++ b/vpx_dsp/x86/highbd_quantize_intrin_sse2.c

@@ -10,6 +10,7 @@
 
 #include <emmintrin.h>
 
+#include "./vpx_dsp_rtcd.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"