generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unnecessary MB_MODE_INFO copies

Browse Source 
These copies occurred for each macroblock in the encoder and decoder.
Thetemp MB_MODE_INFO mbmi was removed from MACROBLOCKD.  As a result,
a large number compile errors had to be fixed.

Change-Id: I4cf0ffae3ce244f6db04a4c217d52dd256382cf3
This commit is contained in:
Scott LaVarnway
2010-08-12 16:25:43 -04:00
parent f5615b6149
commit 9c7a0090e0
16 changed files with 216 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vp8/encoder/tokenize.c
View File

@@ -276,7 +276,7 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t)
TOKENEXTRA *start = *t;
TOKENEXTRA *tp = *t;
x->mbmi.dc_diff = 1;
x->mode_info_context->mbmi.dc_diff = 1;
#if 0
@@ -291,7 +291,7 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t)
#if 1
if (x->mbmi.mb_skip_coeff)
if (x->mode_info_context->mbmi.mb_skip_coeff)
{
cpi->skip_true_count++;
@@ -303,10 +303,10 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t)
vp8_fix_contexts(cpi, x);
}
if (x->mbmi.mode != B_PRED && x->mbmi.mode != SPLITMV)
x->mbmi.dc_diff = 0;
if (x->mode_info_context->mbmi.mode != B_PRED && x->mode_info_context->mbmi.mode != SPLITMV)
x->mode_info_context->mbmi.dc_diff = 0;
else
x->mbmi.dc_diff = 1;
x->mode_info_context->mbmi.dc_diff = 1;
return;
@@ -347,7 +347,7 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t)
vpx_memcpy(cpi->coef_counts_backup, cpi->coef_counts, sizeof(cpi->coef_counts));
#endif
if (x->mbmi.mode == B_PRED || x->mbmi.mode == SPLITMV)
if (x->mode_info_context->mbmi.mode == B_PRED || x->mode_info_context->mbmi.mode == SPLITMV)
{
plane_type = 3;
}
@@ -592,10 +592,10 @@ void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t)
plane_type = 0;
if (x->mbmi.mode != B_PRED && x->mbmi.mode != SPLITMV)
x->mbmi.dc_diff = 0;
if (x->mode_info_context->mbmi.mode != B_PRED && x->mode_info_context->mbmi.mode != SPLITMV)
x->mode_info_context->mbmi.dc_diff = 0;
else
x->mbmi.dc_diff = 1;
x->mode_info_context->mbmi.dc_diff = 1;
for (b = 0; b < 16; b++)
@@ -629,7 +629,7 @@ void vp8_fix_contexts(VP8_COMP *cpi, MACROBLOCKD *x)
x->above_context[UCONTEXT][1] = 0;
x->above_context[VCONTEXT][1] = 0;
if (x->mbmi.mode != B_PRED && x->mbmi.mode != SPLITMV)
if (x->mode_info_context->mbmi.mode != B_PRED && x->mode_info_context->mbmi.mode != SPLITMV)
{
x->left_context[Y2CONTEXT][0] = 0;
x->above_context[Y2CONTEXT][0] = 0;