Removed pre_mvc

Not used.

Change-Id: Ifbd97c9ad537d5184f7e305fa8acf6f027978b6b

diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index c44ba8d23c3089bab2ca0b85fe922cc720af4593..36d75093a900e291a8bd36867be843c86c09f6f6 100644 (file)
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -42,7 +42,6 @@ typedef struct frame_contexts
     vp8_prob sub_mv_ref_prob [VP8_SUBMVREFS-1];
     vp8_prob coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
     MV_CONTEXT mvc[2];
-    MV_CONTEXT pre_mvc[2];  /* not to caculate the mvcost for the frame if mvc doesn't change. */
 } FRAME_CONTEXT;
 
 typedef enum

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 600e815dd64a07eaa2f8325cd44461e6e7d4165b..2a86b88fd042790dbf411ac91ff11356e35dd87f 100644 (file)
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -939,36 +939,6 @@ void vp8_encode_frame(VP8_COMP *cpi)
 
     }
 
-#if 0
-    {
-        int cnt = 0;
-        int flag[2] = {0, 0};
-
-        for (cnt = 0; cnt < MVPcount; cnt++)
-        {
-            if (cm->fc.pre_mvc[0][cnt] != cm->fc.mvc[0][cnt])
-            {
-                flag[0] = 1;
-                vpx_memcpy(cm->fc.pre_mvc[0], cm->fc.mvc[0], MVPcount);
-                break;
-            }
-        }
-
-        for (cnt = 0; cnt < MVPcount; cnt++)
-        {
-            if (cm->fc.pre_mvc[1][cnt] != cm->fc.mvc[1][cnt])
-            {
-                flag[1] = 1;
-                vpx_memcpy(cm->fc.pre_mvc[1], cm->fc.mvc[1], MVPcount);
-                break;
-            }
-        }
-
-        if (flag[0] || flag[1])
-            vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) cm->fc.mvc, flag);
-    }
-#endif
-
 #if ! CONFIG_REALTIME_ONLY
     /* Adjust the projected reference frame usage probability numbers to
      * reflect what we have just seen. This may be useful when we make

diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c
index 4dc078a1d1bec4478018a65215702448ffdb2837..1432c143be5de6efea34e9e987dbc30a0db17c73 100644 (file)
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -310,9 +310,6 @@ void vp8_setup_key_frame(VP8_COMP *cpi)
         vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) cpi->common.fc.mvc, flag);
     }
 
-    /* initialize pre_mvc to all zero. */
-    vpx_memset(cpi->common.fc.pre_mvc, 0, sizeof(cpi->common.fc.pre_mvc));
-
     /* Make sure we initialize separate contexts for altref,gold, and normal.
      * TODO shouldn't need 3 different copies of structure to do this!
      */