ref: c54bfcb6f01a954c2e54f364852c4c4c9ff432a6
parent: 4cfb8ed4c93a7ddcd3b93b8d588251f05e608245
parent: b92a96d8adfcdb381d559c65aaa65805e1bc9321
author: Yaowu Xu <yaowu@google.com>
date: Wed Feb 22 10:55:37 EST 2012
Merge "Reworked context conversion between 8x8 and 4x4" into experimental
--- a/vp8/common/blockd.c
+++ b/vp8/common/blockd.c
@@ -12,6 +12,7 @@
#include "blockd.h"
#include "vpx_mem/vpx_mem.h"
+
const unsigned char vp8_block2left[25] =
{0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8
@@ -20,3 +21,16 @@
{0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8
};
+
+
+const unsigned char vp8_block2left_8x8[25] =
+{+ 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8
+};
+const unsigned char vp8_block2above_8x8[25] =
+{+ 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8
+};
+
+
+
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -65,6 +65,9 @@
extern const unsigned char vp8_block2left[25];
extern const unsigned char vp8_block2above[25];
+extern const unsigned char vp8_block2left_8x8[25];
+extern const unsigned char vp8_block2above_8x8[25];
+
#define VP8_COMBINEENTROPYCONTEXTS( Dest, A, B) \
Dest = ((A)!=0) + ((B)!=0);
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -321,20 +321,9 @@
coef_probs = oc->fc.coef_probs_8x8 [type] [ 0 ] [0];
BLOCK_LOOP_8x8:
- a = A + vp8_block2above[i];
- l = L + vp8_block2left[i];
+ a = A + vp8_block2above_8x8[i];
+ l = L + vp8_block2left_8x8[i];
- if(i < 16)
- {- a1 = A + vp8_block2above[i+1];
- l1 = L + vp8_block2left[i+4];
- }
- else if(i<24)
- {- a1 = A + vp8_block2above[i+1];
- l1 = L + vp8_block2left[i+2];
-
- }
c = (INT16)(!type);
// Dest = ((A)!=0) + ((B)!=0);
@@ -350,7 +339,7 @@
}
else
{- VP8_COMBINEENTROPYCONTEXTS_8x8(v, *a, *l, *a1, *l1);
+ VP8_COMBINEENTROPYCONTEXTS(v, *a, *l);
if ( segfeature_active( x, segment_id, SEG_LVL_EOB ) )
{seg_eob = get_segdata( x, segment_id, SEG_LVL_EOB );
@@ -549,45 +538,10 @@
BLOCK_FINISHED_8x8:
*a = *l = ((eobs[i] = c) != !type); // any nonzero data?
- /*if (i!=24) {- *(A + vp8_block2above[i+1]) = *(A + vp8_block2above[i+2]) = *(A + vp8_block2above[i+3]) = *a;
- *(L + vp8_block2left[i+1]) = *(L + vp8_block2left[i+2]) = *(L + vp8_block2left[i+3]) = *l;
- }*/
-
if (i!=24)
{- if(i==0)
- {- *(A + vp8_block2above[1]) = *(A + vp8_block2above[4]) = *(A + vp8_block2above[5]) = *a;
- *(L + vp8_block2left[1]) = *(L + vp8_block2left[4]) = *(L + vp8_block2left[5]) = *l;
- }
- else if(i==4)
- {- *(A + vp8_block2above[2]) = *(A + vp8_block2above[3]) = *(A + vp8_block2above[6]) = *(A + vp8_block2above[7]) = *a;
- *(L + vp8_block2left[2]) = *(L + vp8_block2left[3]) = *(L + vp8_block2left[6]) = *(L + vp8_block2left[7]) = *l;
- *(A + vp8_block2above[4]) = *(A + vp8_block2above[1]);
- *(L + vp8_block2left[4]) = *(L + vp8_block2left[1]);
- }
- else if(i==8)
- {- *(A + vp8_block2above[9]) = *(A + vp8_block2above[12]) = *(A + vp8_block2above[13]) = *a;
- *(L + vp8_block2left[9]) = *(L + vp8_block2left[12]) = *(L + vp8_block2left[13]) = *l;
-
- }
- else if(i==12)
- {- *(A + vp8_block2above[10]) = *(A + vp8_block2above[11]) = *(A + vp8_block2above[14]) = *(A + vp8_block2above[15]) = *a;
- *(L + vp8_block2left[10]) = *(L + vp8_block2left[11]) = *(L + vp8_block2left[14]) = *(L + vp8_block2left[15]) = *l;
- *(A + vp8_block2above[12]) = *(A + vp8_block2above[8]);
- *(L + vp8_block2left[12]) = *(L + vp8_block2left[8]);
-
- }
- else
- {- *(A + vp8_block2above[i+1]) = *(A + vp8_block2above[i+2]) = *(A + vp8_block2above[i+3]) = *a;
- *(L + vp8_block2left[i+1]) = *(L + vp8_block2left[i+2]) = *(L + vp8_block2left[i+3]) = *l;
-
- }
+ *(a + 1) = *a;
+ *(l + 1) = *l;
}
eobtotal += c;
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -2429,6 +2429,7 @@
((vp8_cost_one(upd) - vp8_cost_zero(upd)) >> 8);
const int s = old_b - new_b - update_b;
const int u = s > 0 ? 1 : 0;
+
#ifdef ENTROPY_STATS
++ tree_update_hist_8x8 [i][j][k][t] [u];
#endif
--- a/vp8/encoder/encodemb.c
+++ b/vp8/encoder/encodemb.c
@@ -656,7 +656,6 @@
ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l)
{int sum=0;
- int i;
BLOCKD *bd = &x->block[24];
int coef;
@@ -802,7 +801,6 @@
#if CONFIG_T8X8
void optimize_b_8x8(MACROBLOCK *mb, int i, int type,
ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l,
- ENTROPY_CONTEXT *a1, ENTROPY_CONTEXT *l1,
const VP8_ENCODER_RTCD *rtcd)
{BLOCK *b;
@@ -1010,7 +1008,7 @@
/* Now pick the best path through the whole trellis. */
band = vp8_coef_bands_8x8[i + 1];
- VP8_COMBINEENTROPYCONTEXTS_8x8(pt, *a, *l, *a1, *l1);
+ VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
rate0 = tokens[next][0].rate;
rate1 = tokens[next][1].rate;
error0 = tokens[next][0].error;
@@ -1051,7 +1049,6 @@
{int b;
int type;
- int has_2nd_order;
ENTROPY_CONTEXT_PLANES t_above, t_left;
ENTROPY_CONTEXT *ta;
ENTROPY_CONTEXT *tl;
@@ -1062,80 +1059,29 @@
ta = (ENTROPY_CONTEXT *)&t_above;
tl = (ENTROPY_CONTEXT *)&t_left;
- has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED
- &&x->e_mbd.mode_info_context->mbmi.mode != I8X8_PRED
- && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV);
- type = has_2nd_order ? 0 : 3;
-
+ type = 0;
for (b = 0; b < 16; b+=4)
{optimize_b_8x8(x, b, type,
- ta + vp8_block2above[b], tl + vp8_block2left[b],
- ta + vp8_block2above[b+1], tl + vp8_block2left[b+4],
+ ta + vp8_block2above_8x8[b], tl + vp8_block2left_8x8[b],
rtcd);
-
- if(b==0)
- {- *(ta + vp8_block2above[1]) = *(ta + vp8_block2above[4]) = *(ta + vp8_block2above[5]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[1]) = *(tl + vp8_block2left[4]) = *(tl + vp8_block2left[5]) = *(tl + vp8_block2left[b]);
- }
- else if(b==4)
- {- *(ta + vp8_block2above[2]) = *(ta + vp8_block2above[3]) = *(ta + vp8_block2above[6]) = *(ta + vp8_block2above[7]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[2]) = *(tl + vp8_block2left[3]) = *(tl + vp8_block2left[6]) = *(tl + vp8_block2left[7]) = *(tl + vp8_block2left[b]);
- *(ta + vp8_block2above[4]) = *(ta + vp8_block2above[1]);
- *(tl + vp8_block2left[4]) = *(tl + vp8_block2left[1]);
- }
- else if(b==8)
- {- *(ta + vp8_block2above[9]) = *(ta + vp8_block2above[12]) = *(ta + vp8_block2above[13]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[9]) = *(tl + vp8_block2left[12]) = *(tl + vp8_block2left[13]) = *(tl + vp8_block2left[b]);
-
- }
- else if(b==12)
- {- *(ta + vp8_block2above[10]) = *(ta + vp8_block2above[11]) = *(ta + vp8_block2above[14]) = *(ta + vp8_block2above[15]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[10]) = *(tl + vp8_block2left[11]) = *(tl + vp8_block2left[14]) = *(tl + vp8_block2left[15]) = *(tl + vp8_block2left[b]);
- *(ta + vp8_block2above[12]) = *(ta + vp8_block2above[8]);
- *(tl + vp8_block2left[12]) = *(tl + vp8_block2left[8]);
-
- }
-
-
-
+ *(ta + vp8_block2above_8x8[b] + 1) = *(ta + vp8_block2above_8x8[b]);
+ *(tl + vp8_block2left_8x8[b] + 1) = *(tl + vp8_block2left_8x8[b] );
}
- for (b = 16; b < 20; b+=4)
+ for (b = 16; b < 24; b+=4)
{- optimize_b_8x8(x, b, PLANE_TYPE_UV, //vp8_block2type[b],
- ta + vp8_block2above[b], tl + vp8_block2left[b],
- ta + vp8_block2above[b+1], tl + vp8_block2left[b+2],
+ optimize_b_8x8(x, b, PLANE_TYPE_UV,
+ ta + vp8_block2above_8x8[b], tl + vp8_block2left_8x8[b],
rtcd);
- *(ta + vp8_block2above[b+1]) = *(ta + vp8_block2above[b+2]) = *(ta + vp8_block2above[b+3]) =
- *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[b+1]) = *(tl + vp8_block2left[b+2]) = *(tl + vp8_block2left[b+3]) =
- *(tl + vp8_block2left[b]);
-
+ *(ta + vp8_block2above_8x8[b]+1) = *(ta + vp8_block2above_8x8[b]);
+ *(tl + vp8_block2left_8x8[b]+1 ) = *(tl + vp8_block2left_8x8[b]);
}
- for (b = 20; b < 24; b+=4)
- {- optimize_b_8x8(x, b, PLANE_TYPE_UV, //vp8_block2type[b],
- ta + vp8_block2above[b], tl + vp8_block2left[b],
- ta + vp8_block2above[b+1], tl + vp8_block2left[b+2],
- rtcd);
- *(ta + vp8_block2above[b+1]) = *(ta + vp8_block2above[b+2]) = *(ta + vp8_block2above[b+3]) =
- *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[b+1]) = *(tl + vp8_block2left[b+2]) = *(tl + vp8_block2left[b+3]) =
- *(tl + vp8_block2left[b]);
-
- }
-
//8x8 always have 2nd roder haar block
check_reset_8x8_2nd_coeffs(&x->e_mbd, PLANE_TYPE_Y2,
- ta + vp8_block2above[24], tl + vp8_block2left[24]);
+ ta + vp8_block2above_8x8[24], tl + vp8_block2left_8x8[24]);
-
}
void vp8_optimize_mby_8x8(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd)
@@ -1160,50 +1106,18 @@
ta = (ENTROPY_CONTEXT *)&t_above;
tl = (ENTROPY_CONTEXT *)&t_left;
-
- has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED
- && x->e_mbd.mode_info_context->mbmi.mode != I8X8_PRED
- && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV);
- type = has_2nd_order ? 0 : 3;
-
+ type = 0;
for (b = 0; b < 16; b+=4)
{optimize_b_8x8(x, b, type,
ta + vp8_block2above[b], tl + vp8_block2left[b],
- ta + vp8_block2above[b+1], tl + vp8_block2left[b+4],
rtcd);
- if(b==0)
- {- *(ta + vp8_block2above[1]) = *(ta + vp8_block2above[4]) = *(ta + vp8_block2above[5]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[1]) = *(tl + vp8_block2left[4]) = *(tl + vp8_block2left[5]) = *(tl + vp8_block2left[b]);
- }
- else if(b==4)
- {- *(ta + vp8_block2above[2]) = *(ta + vp8_block2above[3]) = *(ta + vp8_block2above[6]) = *(ta + vp8_block2above[7]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[2]) = *(tl + vp8_block2left[3]) = *(tl + vp8_block2left[6]) = *(tl + vp8_block2left[7]) = *(tl + vp8_block2left[b]);
- *(ta + vp8_block2above[4]) = *(ta + vp8_block2above[1]);
- *(tl + vp8_block2left[4]) = *(tl + vp8_block2left[1]);
- }
- else if(b==8)
- {- *(ta + vp8_block2above[9]) = *(ta + vp8_block2above[12]) = *(ta + vp8_block2above[13]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[9]) = *(tl + vp8_block2left[12]) = *(tl + vp8_block2left[13]) = *(tl + vp8_block2left[b]);
-
- }
- else if(b==12)
- {- *(ta + vp8_block2above[10]) = *(ta + vp8_block2above[11]) = *(ta + vp8_block2above[14]) = *(ta + vp8_block2above[15]) = *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[10]) = *(tl + vp8_block2left[11]) = *(tl + vp8_block2left[14]) = *(tl + vp8_block2left[15]) = *(tl + vp8_block2left[b]);
- *(ta + vp8_block2above[12]) = *(ta + vp8_block2above[8]);
- *(tl + vp8_block2left[12]) = *(tl + vp8_block2left[8]);
-
- }
-
-
+ *(ta + vp8_block2above_8x8[b] + 1) = *(ta + vp8_block2above_8x8[b]);
+ *(tl + vp8_block2left_8x8[b] + 1) = *(tl + vp8_block2left_8x8[b] );
}
//8x8 always have 2nd roder haar block
check_reset_8x8_2nd_coeffs(&x->e_mbd, PLANE_TYPE_Y2,
- ta + vp8_block2above[24], tl + vp8_block2left[24]);
+ ta + vp8_block2above_8x8[24], tl + vp8_block2left_8x8[24]);
}
@@ -1226,30 +1140,13 @@
ta = (ENTROPY_CONTEXT *)&t_above;
tl = (ENTROPY_CONTEXT *)&t_left;
- for (b = 16; b < 20; b+=4)
+ for (b = 16; b < 24; b+=4)
{- optimize_b_8x8(x, b, PLANE_TYPE_UV, //vp8_block2type[b],
- ta + vp8_block2above[b], tl + vp8_block2left[b],
- ta + vp8_block2above[b+1], tl + vp8_block2left[b+2],
+ optimize_b_8x8(x, b, PLANE_TYPE_UV,
+ ta + vp8_block2above_8x8[b], tl + vp8_block2left_8x8[b],
rtcd);
- *(ta + vp8_block2above[b+1]) = *(ta + vp8_block2above[b+2]) = *(ta + vp8_block2above[b+3]) =
- *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[b+1]) = *(tl + vp8_block2left[b+2]) = *(tl + vp8_block2left[b+3]) =
- *(tl + vp8_block2left[b]);
-
- }
-
- for (b = 20; b < 24; b+=4)
- {- optimize_b_8x8(x, b, PLANE_TYPE_UV, //vp8_block2type[b],
- ta + vp8_block2above[b], tl + vp8_block2left[b],
- ta + vp8_block2above[b+1], tl + vp8_block2left[b+2],
- rtcd);
- *(ta + vp8_block2above[b+1]) = *(ta + vp8_block2above[b+2]) = *(ta + vp8_block2above[b+3]) =
- *(ta + vp8_block2above[b]);
- *(tl + vp8_block2left[b+1]) = *(tl + vp8_block2left[b+2]) = *(tl + vp8_block2left[b+3]) =
- *(tl + vp8_block2left[b]);
-
+ *(ta + vp8_block2above_8x8[b]+1) = *(ta + vp8_block2above_8x8[b]);
+ *(tl + vp8_block2left_8x8[b]+1 ) = *(tl + vp8_block2left_8x8[b]);
}
}
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -690,8 +690,7 @@
static int cost_coeffs_8x8(MACROBLOCK *mb,
BLOCKD *b, int type,
- ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l,
- ENTROPY_CONTEXT *a1, ENTROPY_CONTEXT *l1)
+ ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l)
{int c = !type; /* start at coef 0, unless Y with Y2 */
int eob = b->eob;
@@ -699,7 +698,7 @@
int cost = 0;
short *qcoeff_ptr = b->qcoeff;
- VP8_COMBINEENTROPYCONTEXTS_8x8(pt, *a, *l, *a1, *l1);
+ VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
# define QC8X8( I) ( qcoeff_ptr [vp8_default_zig_zag1d_8x8[I]] )
@@ -738,8 +737,7 @@
for (b = 0; b < 16; b+=4)
cost += cost_coeffs_8x8(mb, x->block + b, PLANE_TYPE_Y_NO_DC,
- ta + vp8_block2above[b], tl + vp8_block2left[b],
- ta + vp8_block2above[b+1], tl + vp8_block2left[b+4]);
+ ta + vp8_block2above_8x8[b], tl + vp8_block2left_8x8[b]);
cost += cost_coeffs_2x2(mb, x->block + 24, PLANE_TYPE_Y2,
ta + vp8_block2above[24], tl + vp8_block2left[24]);
@@ -1204,10 +1202,8 @@
for (b = 16; b < 24; b+=4)
cost += cost_coeffs_8x8(mb, x->block + b, PLANE_TYPE_UV,
- ta + vp8_block2above[b],
- tl + vp8_block2left[b],
- ta + vp8_block2above[b+1],
- tl + vp8_block2left[b+2]);
+ ta + vp8_block2above_8x8[b],
+ tl + vp8_block2left_8x8[b]);
return cost;
}
--- a/vp8/encoder/tokenize.c
+++ b/vp8/encoder/tokenize.c
@@ -257,8 +257,6 @@
const FRAME_TYPE frametype,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
- ENTROPY_CONTEXT *a1,
- ENTROPY_CONTEXT *l1,
VP8_COMP *cpi
)
{@@ -277,7 +275,7 @@
seg_eob = get_segdata( xd, segment_id, SEG_LVL_EOB );
}
- VP8_COMBINEENTROPYCONTEXTS_8x8(pt, *a, *l, *a1, *l1);
+ VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
do
{@@ -559,7 +557,8 @@
ENTROPY_CONTEXT * L = (ENTROPY_CONTEXT *)x->left_context;
tokenize2nd_order_b_8x8(x,
x->block + 24, t, 1, x->frame_type,
- A + vp8_block2above[24], L + vp8_block2left[24], cpi);
+ A + vp8_block2above_8x8[24],
+ L + vp8_block2left_8x8[24], cpi);
}
else
#endif
@@ -576,56 +575,22 @@
for (b = 0; b < 16; b+=4)
{tokenize1st_order_b_8x8(x,
- x->block + b, t, plane_type, x->frame_type,
- A + vp8_block2above[b],
- L + vp8_block2left[b],
- A + vp8_block2above[b+1],
- L + vp8_block2left[b+4],
- cpi);
- /* *(A + vp8_block2above[b+1]) = *(A + vp8_block2above[b+2]) = *(A + vp8_block2above[b+3]) =
- *(A + vp8_block2above[b]);
- *(L + vp8_block2left[b+1]) = *(L + vp8_block2left[b+2]) = *(L + vp8_block2left[b+3]) =
- *(L + vp8_block2left[b]);*/
- // build coeff context for 8x8 transform
- if(b==0)
- {- *(A + vp8_block2above[1]) = *(A + vp8_block2above[4]) = *(A + vp8_block2above[5]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[1]) = *(L + vp8_block2left[4]) = *(L + vp8_block2left[5]) = *(L + vp8_block2left[b]);
- }
- else if(b==4)
- {- *(A + vp8_block2above[2]) = *(A + vp8_block2above[3]) = *(A + vp8_block2above[6]) = *(A + vp8_block2above[7]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[2]) = *(L + vp8_block2left[3]) = *(L + vp8_block2left[6]) = *(L + vp8_block2left[7]) = *(L + vp8_block2left[b]);
- *(A + vp8_block2above[4]) = *(A + vp8_block2above[1]);
- *(L + vp8_block2left[4]) = *(L + vp8_block2left[1]);
- }
- else if(b==8)
- {- *(A + vp8_block2above[9]) = *(A + vp8_block2above[12]) = *(A + vp8_block2above[13]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[9]) = *(L + vp8_block2left[12]) = *(L + vp8_block2left[13]) = *(L + vp8_block2left[b]);
- }
- else if(b==12)
- {- *(A + vp8_block2above[10]) = *(A + vp8_block2above[11]) = *(A + vp8_block2above[14]) = *(A + vp8_block2above[15]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[10]) = *(L + vp8_block2left[11]) = *(L + vp8_block2left[14]) = *(L + vp8_block2left[15]) = *(L + vp8_block2left[b]);
- *(A + vp8_block2above[12]) = *(A + vp8_block2above[8]);
- *(L + vp8_block2left[12]) = *(L + vp8_block2left[8]);
- }
-
+ x->block + b, t, plane_type, x->frame_type,
+ A + vp8_block2above_8x8[b],
+ L + vp8_block2left_8x8[b],
+ cpi);
+ *(A + vp8_block2above_8x8[b] + 1) = *(A + vp8_block2above_8x8[b]);
+ *(L + vp8_block2left_8x8[b] + 1) = *(L + vp8_block2left_8x8[b] );
}
-
- for (b = 16; b < 24; b+=4) {+ for (b = 16; b < 24; b+=4)
+ {tokenize1st_order_b_8x8(x,
- x->block + b, t, 2, x->frame_type,
- A + vp8_block2above[b],
- L + vp8_block2left[b],
- A + vp8_block2above[b+1],
- L + vp8_block2left[b+2],
- cpi);
- *(A + vp8_block2above[b+1]) = *(A + vp8_block2above[b+2]) = *(A + vp8_block2above[b+3]) =
- *(A + vp8_block2above[b]);
- *(L + vp8_block2left[b+1]) = *(L + vp8_block2left[b+2]) = *(L + vp8_block2left[b+3]) =
- *(L + vp8_block2left[b]);
+ x->block + b, t, 2, x->frame_type,
+ A + vp8_block2above_8x8[b],
+ L + vp8_block2left_8x8[b],
+ cpi);
+ *(A + vp8_block2above_8x8[b]+1) = *(A + vp8_block2above_8x8[b]);
+ *(L + vp8_block2left_8x8[b]+1 ) = *(L + vp8_block2left_8x8[b]);
}
}
else
@@ -806,14 +771,12 @@
const FRAME_TYPE frametype,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
- ENTROPY_CONTEXT *a1,
- ENTROPY_CONTEXT *l1,
VP8_COMP *cpi
)
{int pt; /* near block/prev token context index */
TOKENEXTRA *t = *tp; /* store tokens starting here */
- VP8_COMBINEENTROPYCONTEXTS_8x8(pt, *a, *l, *a1, *l1);
+ VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
(void) frametype;
(void) type;
(void) b;
@@ -840,14 +803,12 @@
const FRAME_TYPE frametype,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
- ENTROPY_CONTEXT *a1,
- ENTROPY_CONTEXT *l1,
VP8_COMP *cpi
)
{int pt; /* near block/prev token context index */
TOKENEXTRA *t = *tp; /* store tokens starting here */
- VP8_COMBINEENTROPYCONTEXTS_8x8(pt, *a, *l, *a1, *l1);
+ VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
(void) frametype;
(void) type;
(void) b;
@@ -872,80 +833,29 @@
int b;
stuff2nd_order_b_8x8(x->block + 24, t, 1, x->frame_type,
- A + vp8_block2above[24], L + vp8_block2left[24], cpi);
+ A + vp8_block2above_8x8[24],
+ L + vp8_block2left_8x8[24], cpi);
plane_type = 0;
- for (b = 0; b < 16; b+=4) {+ for (b = 0; b < 16; b+=4)
+ {stuff1st_order_b_8x8(x->block + b, t, plane_type, x->frame_type,
- A + vp8_block2above[b],
- L + vp8_block2left[b],
- A + vp8_block2above[b+1],
- L + vp8_block2left[b+4],
- cpi);
- // build coeff context for 8x8 transform
- if(b==0)
- {- *(A + vp8_block2above[1]) = *(A + vp8_block2above[4]) = *(A + vp8_block2above[5]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[1]) = *(L + vp8_block2left[4]) = *(L + vp8_block2left[5]) = *(L + vp8_block2left[b]);
- }
- else if(b==4)
- {- *(A + vp8_block2above[2]) = *(A + vp8_block2above[3]) = *(A + vp8_block2above[6]) = *(A + vp8_block2above[7]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[2]) = *(L + vp8_block2left[3]) = *(L + vp8_block2left[6]) = *(L + vp8_block2left[7]) = *(L + vp8_block2left[b]);
- *(A + vp8_block2above[4]) = *(A + vp8_block2above[1]);
- *(L + vp8_block2left[4]) = *(L + vp8_block2left[1]);
- }
- else if(b==8)
- {- *(A + vp8_block2above[9]) = *(A + vp8_block2above[12]) = *(A + vp8_block2above[13]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[9]) = *(L + vp8_block2left[12]) = *(L + vp8_block2left[13]) = *(L + vp8_block2left[b]);
-
- }
- else if(b==12)
- {- *(A + vp8_block2above[10]) = *(A + vp8_block2above[11]) = *(A + vp8_block2above[14]) = *(A + vp8_block2above[15]) = *(A + vp8_block2above[b]);
- *(L + vp8_block2left[10]) = *(L + vp8_block2left[11]) = *(L + vp8_block2left[14]) = *(L + vp8_block2left[15]) = *(L + vp8_block2left[b]);
- *(A + vp8_block2above[12]) = *(A + vp8_block2above[8]);
- *(L + vp8_block2left[12]) = *(L + vp8_block2left[8]);
-
- }
-
+ A + vp8_block2above_8x8[b],
+ L + vp8_block2left_8x8[b],
+ cpi);
+ *(A + vp8_block2above_8x8[b] + 1) = *(A + vp8_block2above_8x8[b]);
+ *(L + vp8_block2left_8x8[b] + 1) = *(L + vp8_block2left_8x8[b] );
}
- /*
- for (b = 0; b < 16; b+=4) {- stuff1st_order_b_8x8(x->block + b, t, plane_type, x->frame_type,
- A + vp8_block2above[b],
- L + vp8_block2left[b], cpi);
- *(A + vp8_block2above[b+1]) = *(A + vp8_block2above[b+2]) = *(A + vp8_block2above[b+3]) =
- *(A + vp8_block2above[b]);
- *(L + vp8_block2left[b+1]) = *(L + vp8_block2left[b+2]) = *(L + vp8_block2left[b+3]) =
- *(L + vp8_block2left[b]);
- }
- */
- for (b = 16; b < 24; b+=4) {- stuff1st_order_buv_8x8(x->block + b, t, 2, x->frame_type,
- A + vp8_block2above[b],
- L + vp8_block2left[b],
- A + vp8_block2above[b+1],
- L + vp8_block2left[b+2],
- cpi);
- *(A + vp8_block2above[b+1]) = *(A + vp8_block2above[b+2]) = *(A + vp8_block2above[b+3]) =
- *(A + vp8_block2above[b]);
- *(L + vp8_block2left[b+1]) = *(L + vp8_block2left[b+2]) = *(L + vp8_block2left[b+3]) =
- *(L + vp8_block2left[b]);
- }
- /*
- for (b = 16; b < 24; b+=4) {+ for (b = 16; b < 24; b+=4)
+ {stuff1st_order_buv_8x8(x->block + b, t, 2, x->frame_type,
- A + vp8_block2above[b],
- L + vp8_block2left[b], cpi);
- *(A + vp8_block2above[b+1]) = *(A + vp8_block2above[b+2]) = *(A + vp8_block2above[b+3]) =
- *(A + vp8_block2above[b]);
- *(L + vp8_block2left[b+1]) = *(L + vp8_block2left[b+2]) = *(L + vp8_block2left[b+3]) =
- *(L + vp8_block2left[b]);
+ A + vp8_block2above[b],
+ L + vp8_block2left[b],
+ cpi);
+ *(A + vp8_block2above_8x8[b]+1) = *(A + vp8_block2above_8x8[b]);
+ *(L + vp8_block2left_8x8[b]+1 ) = *(L + vp8_block2left_8x8[b]);
}
- */
}
#endif