Commit b8a28fbb authored by James Zern's avatar James Zern Committed by Gerrit Code Review

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
parents 4ff6d137 849e9907
......@@ -57,6 +57,12 @@ void vp10_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
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);
......
......@@ -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"
......
......@@ -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) {
......
......@@ -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"
......
......@@ -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) {
......
......@@ -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"
......
......@@ -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"
......
......@@ -81,8 +81,9 @@ static INLINE void accumulate_store_4_pixel(const __m128i *x, uint8_t *dst) {
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 @@ void horiz_w4_ssse3(const uint8_t *src, const __m128i *f,
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 @@ static void (*horizTab[6])(const uint8_t *, const __m128i *, int,
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 @@ static void filter_vert_horiz_parallel_ssse3(const uint8_t *src, int src_stride,
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 @@ void filter_vert_compute_small(const uint8_t *src, int src_stride, __m128i *f,
} 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;
......
......@@ -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"
......
......@@ -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"
......
......@@ -121,7 +121,7 @@ static struct vp10_token interintra_mode_encodings[INTERINTRA_MODES];
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) {
......
......@@ -20,7 +20,7 @@ extern "C" {
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 &&
......
......@@ -582,10 +582,10 @@ void vp10_model_rd_from_var_lapndz(unsigned int var, unsigned int n_log2,
}
}
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 @@ void vp10_get_entropy_contexts(BLOCK_SIZE bsize, TX_SIZE tx_size,
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,
......
......@@ -604,11 +604,10 @@ static void get_energy_distribution_fine(const VP10_COMP *cpi,
(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,
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment