Commit fc892cc5 authored by Christian Duvivier's avatar Christian Duvivier
Browse files

Fix warnings.

Change-Id: I01dd96da18fe22450bb372b10ba90eab52e29bdf
parent ee59dd7e
......@@ -10,6 +10,7 @@
#include "findnearmv.h"
#include "vp8/encoder/variance.h"
#include <limits.h>
const unsigned char vp8_mbsplit_offset[4][16] = {
......
......@@ -18,6 +18,18 @@
#include "treecoder.h"
#include "onyxc_int.h"
#if CONFIG_NEWBESTREFMV
/* check a list of motion vectors by sad score using a number rows of pixels
* above and a number cols of pixels in the left to select the one with best
* score to use as ref motion vector
*/
void vp8_find_best_ref_mvs(MACROBLOCKD *xd,
unsigned char *ref_y_buffer,
int ref_y_stride,
int_mv *best_mv,
int_mv *nearest,
int_mv *near);
#endif
static void mv_bias(int refmb_ref_frame_sign_bias, int refframe, int_mv *mvp, const int *ref_frame_sign_bias) {
MV xmv;
......
......@@ -372,8 +372,10 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
if (mode == I8X8_PRED) {
for (i = 0; i < 4; i++) {
int ib = vp8_i8x8_block[i];
#if !CONFIG_HYBRIDTRANSFORM8X8
const int iblock[4] = {0, 1, 4, 5};
int j;
#endif
int i8x8mode;
BLOCKD *b;
......
......@@ -195,4 +195,11 @@ typedef struct {
#define DEQUANT_INVOKE(ctx,fn) vp8_dequant_##fn
#endif
#if CONFIG_HYBRIDTRANSFORM8X8
void vp8_ht_dequant_idct_add_8x8_c(TX_TYPE tx_type, short *input, short *dq,
unsigned char *pred, unsigned char *dest,
int pitch, int stride);
#endif
#endif
......@@ -707,14 +707,12 @@ void vp8_set_speed_features(VP8_COMP *cpi) {
sf->thresh_mult[THR_V_PRED ] = 1000;
sf->thresh_mult[THR_H_PRED ] = 1000;
#if CONFIG_NEWINTRAMODES
sf->thresh_mult[THR_D45_PRED ] = 1000;
sf->thresh_mult[THR_D135_PRED] = 1000;
sf->thresh_mult[THR_D117_PRED] = 1000;
sf->thresh_mult[THR_D153_PRED] = 1000;
sf->thresh_mult[THR_D27_PRED ] = 1000;
sf->thresh_mult[THR_D63_PRED ] = 1000;
#endif
sf->thresh_mult[THR_B_PRED ] = 2000;
sf->thresh_mult[THR_I8X8_PRED] = 2000;
sf->thresh_mult[THR_TM ] = 1000;
......
......@@ -2699,7 +2699,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
int best_filter_state;
#endif
#if CONFIG_NEWBESTREFMV
int_mv ref_mv[MAX_REF_FRAMES] = {0};
int_mv ref_mv[MAX_REF_FRAMES] = {{0}};
#endif
#if CONFIG_SWITCHABLE_INTERP
......
......@@ -422,4 +422,19 @@ typedef struct {
#define SSIMPF_INVOKE(ctx,fn) vp8_ssimpf_##fn
#endif
#if CONFIG_NEWBESTREFMV
unsigned int vp8_sad2x16_c(
const unsigned char *src_ptr,
int src_stride,
const unsigned char *ref_ptr,
int ref_stride,
int max_sad);
unsigned int vp8_sad16x2_c(
const unsigned char *src_ptr,
int src_stride,
const unsigned char *ref_ptr,
int ref_stride,
int max_sad);
#endif
#endif
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