shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes Ide5eefad,I28026b86,Ie9a6fac0,Ia8a20c67,I8c7f5b97,I33ca9cdd,I438cbf49

* changes:
  vp8_regular_quantize_b_sse2: remove dead init
  vp8cx_pick_filter_level*: remove dead inits
  vp8_decode_frame: remove dead increment
  rdopt: remove dead stores
  find_next_key_frame: remove dead init & store
  multiframe_quality_enhance_block: remove dead stores
  vp8_print_modes_and_motion_vectors: remove dead stores

--- a/vp8/common/debugmodes.c

+++ b/vp8/common/debugmodes.c

@@ -81,7 +81,6 @@

     fprintf(mvs, "\n");

     /* print out the block modes */

-    mb_index = 0;

     fprintf(mvs, "Mbs for Frame %d\n", frame);

     {

         int b_row;

@@ -129,7 +128,6 @@

     /* print out the block modes */

-    mb_index = 0;

     fprintf(mvs, "MVs for Frame %d\n", frame);

     {

         int b_row;

--- a/vp8/common/mfqe.c

+++ b/vp8/common/mfqe.c

@@ -153,11 +153,11 @@

         actd = (vp8_variance16x16(yd, yd_stride, VP8_ZEROS, 0, &sse)+128)>>8;

         act = (vp8_variance16x16(y, y_stride, VP8_ZEROS, 0, &sse)+128)>>8;

 #ifdef USE_SSD

-        sad = (vp8_variance16x16(y, y_stride, yd, yd_stride, &sse));

+        vp8_variance16x16(y, y_stride, yd, yd_stride, &sse);

         sad = (sse + 128)>>8;

-        usad = (vp8_variance8x8(u, uv_stride, ud, uvd_stride, &sse));

+        vp8_variance8x8(u, uv_stride, ud, uvd_stride, &sse);

         usad = (sse + 32)>>6;

-        vsad = (vp8_variance8x8(v, uv_stride, vd, uvd_stride, &sse));

+        vp8_variance8x8(v, uv_stride, vd, uvd_stride, &sse);

         vsad = (sse + 32)>>6;

 #else

         sad = (vp8_sad16x16(y, y_stride, yd, yd_stride, UINT_MAX) + 128) >> 8;

@@ -170,11 +170,11 @@

         actd = (vp8_variance8x8(yd, yd_stride, VP8_ZEROS, 0, &sse)+32)>>6;

         act = (vp8_variance8x8(y, y_stride, VP8_ZEROS, 0, &sse)+32)>>6;

 #ifdef USE_SSD

-        sad = (vp8_variance8x8(y, y_stride, yd, yd_stride, &sse));

+        vp8_variance8x8(y, y_stride, yd, yd_stride, &sse);

         sad = (sse + 32)>>6;

-        usad = (vp8_variance4x4(u, uv_stride, ud, uvd_stride, &sse));

+        vp8_variance4x4(u, uv_stride, ud, uvd_stride, &sse);

         usad = (sse + 8)>>4;

-        vsad = (vp8_variance4x4(v, uv_stride, vd, uvd_stride, &sse));

+        vp8_variance4x4(v, uv_stride, vd, uvd_stride, &sse);

         vsad = (sse + 8)>>4;

 #else

         sad = (vp8_sad8x8(y, y_stride, yd, yd_stride, UINT_MAX) + 32) >> 6;

--- a/vp8/decoder/decodeframe.c

+++ b/vp8/decoder/decodeframe.c

@@ -1069,7 +1069,6 @@

                 pc->vert_scale = clear[6] >> 6;

             }

             data += 7;

-            clear += 7;

         }

         else

         {

--- a/vp8/encoder/firstpass.c

+++ b/vp8/encoder/firstpass.c

@@ -2969,7 +2969,6 @@

      */

     decay_accumulator = 1.0;

     boost_score = 0.0;

-    loop_decay_rate = 1.00;       /* Starting decay rate */

     for (i = 0 ; i < cpi->twopass.frames_to_key ; i++)

     {

@@ -3213,7 +3212,7 @@

         int new_width = cpi->oxcf.Width;

         int new_height = cpi->oxcf.Height;

-        int projected_buffer_level = (int)cpi->buffer_level;

+        int projected_buffer_level;

         int tmp_q;

         double projected_bits_perframe;

--- a/vp8/encoder/picklpf.c

+++ b/vp8/encoder/picklpf.c

@@ -142,7 +142,7 @@

     int min_filter_level = get_min_filter_level(cpi, cm->base_qindex);

     int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);

     int filt_val;

-    int best_filt_val = cm->filter_level;

+    int best_filt_val;

     YV12_BUFFER_CONFIG * saved_frame = cm->frame_to_show;

     /* Replace unfiltered frame buffer with a new one */

@@ -274,8 +274,7 @@

     int filter_step;

     int filt_high = 0;

-    /* Start search at previous frame filter level */

-    int filt_mid = cm->filter_level;

+    int filt_mid;

     int filt_low = 0;

     int filt_best;

     int filt_direction = 0;

--- a/vp8/encoder/rdopt.c

+++ b/vp8/encoder/rdopt.c

@@ -1661,7 +1661,6 @@

             mv.as_mv.row = mvx[vcnt/2];

             mv.as_mv.col = mvy[vcnt/2];

-            find = 1;

             /* sr is set to 0 to allow calling function to decide the search

              * range.

              */

@@ -2293,7 +2292,6 @@

                 mode_mv[NEWMV].as_int = d->bmi.mv.as_int;

                 /* Further step/diamond searches as necessary */

-                n = 0;

                 further_steps = (cpi->sf.max_step_search_steps - 1) - step_param;

                 n = num00;

@@ -2560,8 +2558,6 @@

                                                intra_rd_penalty, cpi, x);

             if (this_rd < best_mode.rd || x->skip)

             {

-                /* Note index of best mode so far */

-                best_mode_index = mode_index;

                 *returnrate = rd.rate2;

                 *returndistortion = rd.distortion2;

                 update_best_mode(&best_mode, this_rd, &rd, other_cost, x);

--- a/vp8/encoder/x86/quantize_sse2.c

+++ b/vp8/encoder/x86/quantize_sse2.c

@@ -35,7 +35,7 @@

 void vp8_regular_quantize_b_sse2(BLOCK *b, BLOCKD *d)

 {

     char eob = 0;

-    short *zbin_boost_ptr  = b->zrun_zbin_boost;

+    short *zbin_boost_ptr;

     short *qcoeff_ptr      = d->qcoeff;

     DECLARE_ALIGNED_ARRAY(16, short, x, 16);

     DECLARE_ALIGNED_ARRAY(16, short, y, 16);

-- 

⑨