Removed frames_since_golden from MACROBLOCKD

Change-Id: I10efa441d663fceb6bc97a3bfad518cd3d9a5128

diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 87b83694f34471fcacfd2adff815712eecb93993..2c8c8cd33d4182251cbd22fcc2e50ddc88f9df08 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_since_golden;
     unsigned int frames_till_alt_ref_frame;
     vp8_subpix_fn_t  subpixel_predict;
     vp8_subpix_fn_t  subpixel_predict8x4;

diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c
index 30665fd2977397bd169a411c19a703b6bf4100ca..f65b7448ef8c55d3bbec589ab7afa1aeefbbad3c 100644 (file)
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -47,7 +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_since_golden      = pc->frames_since_golden;
         mbd->frames_till_alt_ref_frame  = pc->frames_till_alt_ref_frame;
 
         mbd->pre = pc->yv12_fb[pc->lst_fb_idx];

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

diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c
index bb6b2846c87c9e2c975f8f2728520c035e54a5a5..fdc4efa0574ba6ba4d7afb3504feaf5d78d5f481 100644 (file)
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -437,7 +437,6 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
 
         mbd->frame_type = cm->frame_type;
 
-        mbd->frames_since_golden = cm->frames_since_golden;
         mbd->frames_till_alt_ref_frame = cm->frames_till_alt_ref_frame;
 
         mb->src = * cpi->Source;