Fix more warnings.

Change-Id: Ifadf65026a11bdb5d39840748613880bcfb364bb

diff --git a/vp8/common/seg_common.c b/vp8/common/seg_common.c
index cab642abc26072e098310d41277da362277f065a..e4a105e6fd2eb8bd8dd33c1b615b29415164df9d 100644 (file)
--- a/vp8/common/seg_common.c
+++ b/vp8/common/seg_common.c
@@ -42,6 +42,7 @@ void enable_segfeature( MACROBLOCKD *xd,
 {
      xd->segment_feature_mask[segment_id] |= (0x01 << feature_id);
 }
+
 void disable_segfeature( MACROBLOCKD *xd,
                          int segment_id,
                          SEG_LVL_FEATURES feature_id )

diff --git a/vp8/common/seg_common.h b/vp8/common/seg_common.h
index 6bd03eed8696320f1ca0fd529c8f9266dbf41975..1f4e38dadeee39e6e2929070fc399e5d7454d49d 100644 (file)
--- a/vp8/common/seg_common.h
+++ b/vp8/common/seg_common.h
@@ -29,6 +29,8 @@ void disable_segfeature( MACROBLOCKD *xd,
                          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,

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index cad4ef2d6385d3f7e09774dbdd91825100db9177..eb003d82b385e3c9df98c971a200703625e905c7 100644 (file)
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -922,7 +922,9 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
     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 @@ static void write_kfmodes(VP8_COMP *cpi)
     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 @@ static int default_coef_context_savings(VP8_COMP *cpi)
 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 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
 
 
 #if CONFIG_T8X8
-    i = 0;
     do
     {
         int j = 0;
@@ -2001,7 +2003,6 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
     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;

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 1b1afa0c8126c46316b23870f74cea8f1721ee45..de452b236e555fbd1ee4f629a146632f7ab4f392 100644 (file)
--- 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>

diff --git a/vp8/encoder/encodeintra.h b/vp8/encoder/encodeintra.h
index 30f7fce16830327e9f3d9c8314307b93659053b5..ae822d3d9d288ec356f5dd0ffddac2f05c5266c0 100644 (file)
--- a/vp8/encoder/encodeintra.h
+++ b/vp8/encoder/encodeintra.h
@@ -19,4 +19,9 @@ void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
 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

diff --git a/vp8/encoder/encodemb.h b/vp8/encoder/encodemb.h
index 498afe7854b85ca912330d3fe521fdc1e3288f7f..e0fcb644fdf4a2b0c0adf8c5d8b4acce8176407a 100644 (file)
--- a/vp8/encoder/encodemb.h
+++ b/vp8/encoder/encodemb.h
@@ -113,6 +113,6 @@ void vp8_optimize_mby_8x8(MACROBLOCK *x, const struct VP8_ENCODER_RTCD *rtcd);
 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

diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c
index 67b708db3289202217bac4bbccf8cbf23cc17dbc..89fe00962bcb3867c7b3b229cb0e68036244a835 100644 (file)
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -91,7 +91,6 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
             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;

diff --git a/vp8/encoder/mbgraph.c b/vp8/encoder/mbgraph.c
index 100a036fd247dc101aab2a8fa59367f503c76043..ad40c9e33b20666a25c84be677720022ffd543bc 100644 (file)
--- a/vp8/encoder/mbgraph.c
+++ b/vp8/encoder/mbgraph.c
@@ -183,8 +183,7 @@ static int do_16x16_zerozero_search
 {
     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++) {

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 10d6e3cdbc4f0c1e67596ea2a6fc4dc1f72cf83e..619f061ec7100690e5472f4e9f2cb1ea61ff0c1a 100644 (file)
--- 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 @@ static int rd_iifactor [ 32 ] =  {    4,   4,   3,   2,   1,   0,   0,   0,
                                  };
 
 // 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 @@ int rd_pick_intra8x8mby_modes(VP8_COMP *cpi,
     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 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     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_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
 
 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;

diff --git a/vp8/encoder/rdopt.h b/vp8/encoder/rdopt.h
index a22abd12e595f8b97f8f780d3141e8c4ef985779..78412c5fbe8b224c252ff30b4e0d01fbb9a0277a 100644 (file)
--- a/vp8/encoder/rdopt.h
+++ b/vp8/encoder/rdopt.h
@@ -34,5 +34,6 @@ extern void vp8_mv_pred
 );
 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