Removed frames_till_alt_ref_frame from MACROBLOCKD

Change-Id: Ieb05270ac332a4cc38ec4b7b995fc0150e0fffdf

diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 2c8c8cd..6a03f1e 100644 (file)
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -261,7 +261,6 @@ typedef struct macroblockd
     int ref_frame_cost[MAX_REF_FRAMES];
 
 
-    unsigned int frames_till_alt_ref_frame;
     vp8_subpix_fn_t  subpixel_predict;
     vp8_subpix_fn_t  subpixel_predict8x4;
     vp8_subpix_fn_t  subpixel_predict8x8;

diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c
index f65b744..16c5d39 100644 (file)
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -47,8 +47,6 @@ static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_D
         mbd->mode_info_stride  = pc->mode_info_stride;
 
         mbd->frame_type = pc->frame_type;
-        mbd->frames_till_alt_ref_frame  = pc->frames_till_alt_ref_frame;
-
         mbd->pre = pc->yv12_fb[pc->lst_fb_idx];
         mbd->dst = pc->yv12_fb[pc->new_fb_idx];
 

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 0af3e55..e762d25 100644 (file)
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -595,8 +595,6 @@ void init_encode_frame_mb_context(VP8_COMP *cpi)
 
     xd->frame_type = cm->frame_type;
 
-    xd->frames_till_alt_ref_frame = cm->frames_till_alt_ref_frame;
-
     // reset intra mode contexts
     if (cm->frame_type == KEY_FRAME)
         vp8_init_mbmode_probs(cm);

diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c
index fdc4efa..7740e5d 100644 (file)
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -437,8 +437,6 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
 
         mbd->frame_type = cm->frame_type;
 
-        mbd->frames_till_alt_ref_frame = cm->frames_till_alt_ref_frame;
-
         mb->src = * cpi->Source;
         mbd->pre = cm->yv12_fb[cm->lst_fb_idx];
         mbd->dst = cm->yv12_fb[cm->new_fb_idx];