commit 4ab2241f5ba3146415ac6871270e9ed4579d1212
author Dmitry Kovalev <dkovalev@google.com> Thu Aug 21 17:28:44 2014 -0700
committer Dmitry Kovalev <dkovalev@google.com> Fri Aug 29 17:33:20 2014 -0700
tree 2bf20257f82353dc0aa52153bbc049840d3e2c1c
parent deb8882cca46cbc468cd2384cb74fdf2d2b4a7be

Removing dummy_packing member from VP9_COMP.

Change-Id: I571ce84c97087f8a1a36a10058393bfdcefbf72a

vp9/encoder/vp9_encodemv.c

diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c
index 9ad6db0..9d42a12 100644
--- a/vp9/encoder/vp9_encodemv.c
+++ b/vp9/encoder/vp9_encodemv.c
@@ -216,7 +216,7 @@
 
   // If auto_mv_step_size is enabled then keep track of the largest
   // motion vector component used.
-  if (!cpi->dummy_packing && cpi->sf.mv.auto_mv_step_size) {
+  if (cpi->sf.mv.auto_mv_step_size) {
     unsigned int maxv = MAX(abs(mv->row), abs(mv->col)) >> 3;
     cpi->max_mv_magnitude = MAX(maxv, cpi->max_mv_magnitude);
   }

vp9/encoder/vp9_encoder.c

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 88b67cf..0c422a3 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -1778,7 +1778,6 @@
     // to recode.
     if (cpi->sf.recode_loop >= ALLOW_RECODE_KFARFGF) {
       save_coding_context(cpi);
-      cpi->dummy_packing = 1;
       if (!cpi->sf.use_nonrd_pick_mode)
         vp9_pack_bitstream(cpi, dest, size);
 
@@ -2248,7 +2247,6 @@
   loopfilter_frame(cpi, cm);
 
   // build the bitstream
-  cpi->dummy_packing = 0;
   vp9_pack_bitstream(cpi, dest, size);
 
   if (cm->seg.update_map)

vp9/encoder/vp9_encoder.h

diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h
index b26c8c7..d03839c 100644
--- a/vp9/encoder/vp9_encoder.h
+++ b/vp9/encoder/vp9_encoder.h
@@ -370,8 +370,6 @@
 
   int droppable;
 
-  int dummy_packing;    /* flag to indicate if packing is dummy */
-
   int initial_width;
   int initial_height;