From 583f2d8fc7edeaf9d8eec5b928a485334a5b8544 Mon Sep 17 00:00:00 2001
From: Paul Wilkins <paulwilkins@google.com>
Date: Thu, 23 Feb 2012 19:22:29 +0000
Subject: [PATCH] Deleted code.
Removed redundant code for ref frame cost.
---
vp8/common/blockd.h | 3 ---
vp8/encoder/encodeframe.c | 33 ---------------------------------
2 files changed, 36 deletions(-)
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 934c740b22..c3360e7a1e 100644
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -299,9 +299,6 @@ typedef struct MacroBlockD
int mb_to_top_edge;
int mb_to_bottom_edge;
- // TODO this is not used in the decoder so should not be in this structure
- 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;
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index bf88cdb6a1..e33e6ce621 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1025,39 +1025,6 @@ void init_encode_frame_mb_context(VP8_COMP *cpi)
vpx_memset(cm->above_context, 0,
sizeof(ENTROPY_CONTEXT_PLANES) * cm->mb_cols);
-
-//#if CONFIG_COMPRED
-// TODO... this will all need changing for new reference frame coding model
-// in addition... ref_frame_cost should not be in the MACROBLOCKD structure as
-// it is only referenced in the encoder.
-//#endif
-
- xd->ref_frame_cost[INTRA_FRAME] = vp8_cost_zero(cm->prob_intra_coded);
-
- // Special case treatment when GF and ARF are not sensible options for reference
- if (cpi->ref_frame_flags == VP8_LAST_FLAG)
- {
- xd->ref_frame_cost[LAST_FRAME] = vp8_cost_one(cm->prob_intra_coded)
- + vp8_cost_zero(255);
- xd->ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cm->prob_intra_coded)
- + vp8_cost_one(255)
- + vp8_cost_zero(128);
- xd->ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cm->prob_intra_coded)
- + vp8_cost_one(255)
- + vp8_cost_one(128);
- }
- else
- {
- xd->ref_frame_cost[LAST_FRAME] = vp8_cost_one(cm->prob_intra_coded)
- + vp8_cost_zero(cm->prob_last_coded);
- xd->ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cm->prob_intra_coded)
- + vp8_cost_one(cm->prob_last_coded)
- + vp8_cost_zero(cm->prob_gf_coded);
- xd->ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cm->prob_intra_coded)
- + vp8_cost_one(cm->prob_last_coded)
- + vp8_cost_one(cm->prob_gf_coded);
- }
-
xd->fullpixel_mask = 0xffffffff;
if(cm->full_pixel)
xd->fullpixel_mask = 0xfffffff8;
--
GitLab