ref: e4ca542a3be5b470338cf753e0208de62883f8b3
parent: 3a82bf4d0597c79a41029004b1a5622ad70268a9
author: Christian Duvivier <cduvivier@google.com>
date: Wed Dec 21 11:19:09 EST 2011
Fix more warnings. Change-Id: Ifadf65026a11bdb5d39840748613880bcfb364bb
--- a/vp8/common/seg_common.c
+++ b/vp8/common/seg_common.c
@@ -42,6 +42,7 @@
{xd->segment_feature_mask[segment_id] |= (0x01 << feature_id);
}
+
void disable_segfeature( MACROBLOCKD *xd,
int segment_id,
SEG_LVL_FEATURES feature_id )
--- a/vp8/common/seg_common.h
+++ b/vp8/common/seg_common.h
@@ -29,6 +29,8 @@
int segment_id,
SEG_LVL_FEATURES feature_id );
+int seg_feature_data_bits( SEG_LVL_FEATURES feature_id );
+
int is_segfeature_signed( SEG_LVL_FEATURES feature_id );
void clear_segdata( MACROBLOCKD *xd,
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -922,7 +922,9 @@
const MV_CONTEXT *mvc = pc->fc.mvc;
MACROBLOCKD *xd = &cpi->mb.e_mbd;
+#if CONFIG_DUALPRED
int i;
+#endif
int pred_context;
const int *const rfct = cpi->count_mb_ref_frame_usage;
@@ -1306,7 +1308,6 @@
const VP8_COMMON *const c = & cpi->common;
/* const */
MODE_INFO *m = c->mi;
- int i;
int mb_row = -1;
int prob_skip_false = 0;
@@ -1601,7 +1602,9 @@
int vp8_estimate_entropy_savings(VP8_COMP *cpi)
{int savings = 0;
+#if CONFIG_T8X8
int i=0;
+#endif
const int *const rfct = cpi->count_mb_ref_frame_usage;
const int rf_intra = rfct[INTRA_FRAME];
@@ -1671,7 +1674,6 @@
#if CONFIG_T8X8
- i = 0;
do
{int j = 0;
@@ -2001,7 +2003,6 @@
int extra_bytes_packed = 0;
unsigned char *cx_data = dest;
- const int *mb_feature_data_bits;
oh.show_frame = (int) pc->show_frame;
oh.type = (int)pc->frame_type;
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -25,6 +25,7 @@
#include "pickinter.h"
#include "vp8/common/findnearmv.h"
#include "vp8/common/reconintra.h"
+#include "vp8/common/seg_common.h"
#include <stdio.h>
#include <math.h>
#include <limits.h>
--- a/vp8/encoder/encodeintra.h
+++ b/vp8/encoder/encodeintra.h
@@ -19,4 +19,9 @@
void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb);
void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
MACROBLOCK *x, int ib);
+void vp8_encode_intra8x8mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x);
+void vp8_encode_intra8x8mbuv(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x);
+void vp8_encode_intra8x8(const VP8_ENCODER_RTCD *rtcd,
+ MACROBLOCK *x, int ib);
+
#endif
--- a/vp8/encoder/encodemb.h
+++ b/vp8/encoder/encodemb.h
@@ -113,6 +113,6 @@
void vp8_optimize_mbuv_8x8(MACROBLOCK *x, const struct VP8_ENCODER_RTCD *rtcd);
#endif
-
+void vp8_subtract_4b_c(BLOCK *be, BLOCKD *bd, int pitch);
#endif
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -91,7 +91,6 @@
for (mb_row = ithread + 1; mb_row < cm->mb_rows; mb_row += (cpi->encoding_thread_count + 1))
{- int i;
int recon_yoffset, recon_uvoffset;
int mb_col;
int ref_fb_idx = cm->lst_fb_idx;
--- a/vp8/encoder/mbgraph.c
+++ b/vp8/encoder/mbgraph.c
@@ -183,8 +183,7 @@
{MACROBLOCK * const x = &cpi->mb;
MACROBLOCKD * const xd = &x->e_mbd;
- unsigned int err, tmp_err;
- int_mv tmp_mv;
+ unsigned int err;
int n;
for (n = 0; n < 16; n++) {--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -25,6 +25,7 @@
#include "vp8/common/reconintra.h"
#include "vp8/common/reconintra4x4.h"
#include "vp8/common/findnearmv.h"
+#include "vp8/common/quant_common.h"
#include "encodemb.h"
#include "quantize.h"
#include "vp8/common/idct.h"
@@ -226,7 +227,6 @@
};
// 3* dc_qlookup[Q]*dc_qlookup[Q];
-static int rdmult_lut[QINDEX_RANGE];
/* values are now correlated to quantizer */
static int sad_per_bit16lut[QINDEX_RANGE];
@@ -1005,7 +1005,6 @@
for (i = 0; i < 4; i++)
{MODE_INFO *const mic = xd->mode_info_context;
- const int mis = xd->mode_info_stride;
B_PREDICTION_MODE UNINITIALIZED_IS_SAFE(best_mode);
int UNINITIALIZED_IS_SAFE(r), UNINITIALIZED_IS_SAFE(ry), UNINITIALIZED_IS_SAFE(d);
@@ -2033,7 +2032,6 @@
BLOCK *b = &x->block[0];
BLOCKD *d = &x->e_mbd.block[0];
MACROBLOCKD *xd = &x->e_mbd;
- VP8_COMMON *cm = &cpi->common;
union b_mode_info best_bmodes[16];
MB_MODE_INFO best_mbmode;
PARTITION_INFO best_partition;
@@ -2993,7 +2991,9 @@
void vp8_rd_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate_)
{+#if CONFIG_T8X8
MACROBLOCKD *xd = &x->e_mbd;
+#endif
int error4x4, error16x16;
int rate4x4, rate16x16 = 0, rateuv;
int dist4x4, dist16x16, distuv;
--- a/vp8/encoder/rdopt.h
+++ b/vp8/encoder/rdopt.h
@@ -34,5 +34,6 @@
);
extern void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffset, int near_sadidx[]);
extern void vp8_init_me_luts();
+extern void vp8_set_mbmode_and_mvs(MACROBLOCK *x, MB_PREDICTION_MODE mb, int_mv *mv);
#endif
--
⑨