From 9e7fec216e37e6efe364428d9cba2f7b70f8ef3a Mon Sep 17 00:00:00 2001
From: Scott LaVarnway <slavarnway@google.com>
Date: Mon, 31 Jan 2011 19:53:02 -0500
Subject: [PATCH] Removed prediction_error accumulation
from vp8cx_encode_intra_macro_block. prediction_error is used when
deciding if a frame should be a keyframe. After reviewing this with
Yaowu, it was pointed out that vp8cx_encode_intra_macro_block
is only called for keyframes, so the accumulation is unnecessary.
Change-Id: Id79dc81b80d4f5d124f3a0dba1b923887e2e1ec8
---
vp8/encoder/encodeframe.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 7ca27a624f..ee9578b617 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1185,22 +1185,11 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t)
x->e_mbd.block[i].bmi.mode = intra_bmodes[i];
vp8_encode_intra4x4mby(IF_RTCD(&cpi->rtcd), x);
- cpi->prediction_error += Error4x4 ;
-#if 0
- // Experimental RD code
- cpi->frame_distortion += dist4x4;
-#endif
}
else
{
vp8_encode_intra16x16mby(IF_RTCD(&cpi->rtcd), x);
rate += rate16x16;
-
-#if 0
- // Experimental RD code
- cpi->prediction_error += Error16x16;
- cpi->frame_distortion += dist16x16;
-#endif
}
sum_intra_stats(cpi, x);
@@ -1245,13 +1234,11 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t)
{
x->e_mbd.mode_info_context->mbmi.mode = B_PRED;
vp8_encode_intra4x4mby(IF_RTCD(&cpi->rtcd), x);
- cpi->prediction_error += Error4x4;
}
else
{
x->e_mbd.mode_info_context->mbmi.mode = best_mode;
vp8_encode_intra16x16mby(IF_RTCD(&cpi->rtcd), x);
- cpi->prediction_error += Error16x16;
}
vp8_pick_intra_mbuv_mode(x);
--
GitLab