shithub: libvpx

Download patch

ref: 5a955973d9949e57a419c6b420b83702d9108640
parent: 120690989b8bc3df738b06e9a81bcd0526b14aaf
parent: b527c4dbb759e40ebbc699086f3ff67f858d481c
author: pascal massimino <pascal.massimino@gmail.com>
date: Wed Nov 14 19:24:56 EST 2012 

Merge changes I63348ae3,I658ea409 into experimental

* changes:
  Segment mode coding bug.
  Silenced a few warnings.


--- a/vp9/common/reconintra.c
+++ b/vp9/common/reconintra.c
@@ -199,7 +199,7 @@
 static void corner_predictor(unsigned char *ypred_ptr, int y_stride, int n,
                              unsigned char *yabove_row,
                              unsigned char *yleft_col) {
-  int h[32], v[32], mh, mv, maxgradh, maxgradv, x, y, nx, ny;
+  int mh, mv, maxgradh, maxgradv, x, y, nx, ny;
   int i, j;
   int top_left = yabove_row[-1];
   mh = mv = 0;
--- a/vp9/common/seg_common.c
+++ b/vp9/common/seg_common.c
@@ -11,7 +11,8 @@
 #include "vp9/common/seg_common.h"
 
 static const int segfeaturedata_signed[SEG_LVL_MAX] = { 1, 1, 0, 0, 0, 0 };
-static const int seg_feature_data_bits[SEG_LVL_MAX] = { QINDEX_BITS, 6, 4, 4, 6, 2 };
+static const int seg_feature_data_bits[SEG_LVL_MAX] =
+                 { QINDEX_BITS, 6, 4, 5, 6, 2 };
 
 // These functions provide access to new segment level features.
 // Eventually these function may be "optimized out" but for the moment,
--- a/vp9/decoder/decodemv.c
+++ b/vp9/decoder/decodemv.c
@@ -19,6 +19,7 @@
 #include "vp9/common/pred_common.h"
 #include "vp9/common/entropy.h"
 #include "vp9/decoder/decodemv.h"
+#include "vp9/common/mvref_common.h"
 #if CONFIG_DEBUG
 #include <assert.h>
 #endif
@@ -725,7 +726,6 @@
 
   // If reference frame is an Inter frame
   if (mbmi->ref_frame) {
-    int rct[4];
     int_mv nearest, nearby, best_mv;
     int_mv nearest_second, nearby_second, best_mv_second;
     vp9_prob mv_ref_p [VP9_MVREFS - 1];
--- a/vp9/decoder/detokenize.c
+++ b/vp9/decoder/detokenize.c
@@ -615,7 +615,8 @@
   return c;
 }
 
-int vp9_decode_mb_tokens(VP9D_COMP *dx, MACROBLOCKD *xd,
+int vp9_decode_mb_tokens(VP9D_COMP* const dx,
+                         MACROBLOCKD* const xd,
                          BOOL_DECODER* const bc) {
   int i, type, eobtotal = 0;
 
--- a/vp9/encoder/bitstream.c
+++ b/vp9/encoder/bitstream.c
@@ -917,13 +917,10 @@
           }
         } else {
           int_mv best_mv, best_second_mv;
-          int ct[4];
 
           vp9_prob mv_ref_p [VP9_MVREFS - 1];
 
           {
-            int_mv n1, n2;
-
             best_mv.as_int = mi->ref_mvs[rf][0].as_int;
 
             vp9_mv_ref_probs(&cpi->common, mv_ref_p, mi->mb_mode_context[rf]);
@@ -977,7 +974,6 @@
 
           if (mi->second_ref_frame &&
               (mode == NEWMV || mode == SPLITMV)) {
-            int_mv n1, n2;
 
             best_second_mv.as_int =
               mi->ref_mvs[mi->second_ref_frame][0].as_int;
--- a/vp9/encoder/encodeframe.c
+++ b/vp9/encoder/encodeframe.c
@@ -1549,9 +1549,10 @@
 
 static void reset_skip_txfm_size(VP9_COMP *cpi, TX_SIZE txfm_max) {
   VP9_COMMON *cm = &cpi->common;
-  int mb_row, mb_col, mis = cm->mode_info_stride, segment_id, skip;
+  int mb_row, mb_col, mis = cm->mode_info_stride, segment_id;
   MODE_INFO *mi, *mi_ptr = cm->mi;
 #if CONFIG_SUPERBLOCKS
+  int skip;
   MODE_INFO *sb_mi_ptr = cm->mi, *sb_mi;
   MB_MODE_INFO *sb_mbmi;
 #endif
-- 
⑨