ref: 1338a98d07154c25023735bff1fa6f344ef010fb
parent: 33d91719d05eac25d6074c2e867de53a63af56f9
parent: 260f5071ed902bdae6c7a07aaad43d985de01423
author: Scott LaVarnway <slavarnway@google.com>
date: Mon Sep 17 09:08:18 EDT 2012
Merge "Removed pre_mvc"
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -42,7 +42,6 @@
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
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -939,36 +939,6 @@
}
-#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
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -310,9 +310,6 @@
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!
*/