From: Yaowu Xu Date: Tue, 18 Dec 2012 19:25:24 +0000 (-0800) Subject: correct logic in cnvcontext experiment for tx32x32 X-Git-Tag: v1.3.0~1210^2~50^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de269c8a621ce5bb3a652559093617feb8061b7f;p=libvpx correct logic in cnvcontext experiment for tx32x32 Change-Id: I004ded11983b7fda85793912ebc5c6f266dc5eb5 --- diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 5e5861aad..117b8649f 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -252,45 +252,65 @@ int vp9_decode_sb_tokens(VP9D_COMP* const pbi, BOOL_DECODER* const bc) { ENTROPY_CONTEXT* const A = (ENTROPY_CONTEXT *)xd->above_context; ENTROPY_CONTEXT* const L = (ENTROPY_CONTEXT *)xd->left_context; + ENTROPY_CONTEXT* const A1 = (ENTROPY_CONTEXT *)(&xd->above_context[1]); + ENTROPY_CONTEXT* const L1 = (ENTROPY_CONTEXT *)(&xd->left_context[1]); unsigned short* const eobs = xd->eobs; const int segment_id = xd->mode_info_context->mbmi.segment_id; int c, i, eobtotal = 0, seg_eob; // Luma block - eobs[0] = c = decode_coefs(pbi, xd, bc, A, L, PLANE_TYPE_Y_WITH_DC, +#if CONFIG_CNVCONTEXT + ENTROPY_CONTEXT above_ec = (A[0] + A[1] + A[2] + A[3] + + A1[0] + A1[1] + A1[2] + A1[3]) != 0; + ENTROPY_CONTEXT left_ec = (L[0] + L[1] + L[2] + L[3] + + L1[0] + L1[1] + L1[2] + L1[3]) != 0; +#else + ENTROPY_CONTEXT above_ec = A[0]; + ENTROPY_CONTEXT left_ec = L[0]; +#endif + eobs[0] = c = decode_coefs(pbi, xd, bc, &above_ec, &left_ec, + PLANE_TYPE_Y_WITH_DC, DCT_DCT, get_eob(xd, segment_id, 1024), xd->sb_coeff_data.qcoeff, vp9_default_zig_zag1d_32x32, TX_32X32, vp9_coef_bands_32x32); - A[1] = A[2] = A[3] = A[0]; - L[1] = L[2] = L[3] = L[0]; + A[1] = A[2] = A[3] = A[0] = above_ec; + L[1] = L[2] = L[3] = L[0] = left_ec; + A1[1] = A1[2] = A1[3] = A1[0] = above_ec; + L1[1] = L1[2] = L1[3] = L1[0] = left_ec; + eobtotal += c; // 16x16 chroma blocks seg_eob = get_eob(xd, segment_id, 256); + for (i = 16; i < 24; i += 4) { ENTROPY_CONTEXT* const a = A + vp9_block2above[TX_16X16][i]; ENTROPY_CONTEXT* const l = L + vp9_block2left[TX_16X16][i]; + ENTROPY_CONTEXT* const a1 = A1 + vp9_block2above[TX_16X16][i]; + ENTROPY_CONTEXT* const l1 = L1 + vp9_block2left[TX_16X16][i]; +#if CONFIG_CNVCONTEXT + above_ec = (a[0] + a[1] + a1[0] + a1[1]) != 0; + left_ec = (l[0] + l[1] + l1[0] + l1[1]) != 0; +#else + above_ec = a[0]; + left_ec = l[0]; +#endif - eobs[i] = c = decode_coefs(pbi, xd, bc, a, l, PLANE_TYPE_UV, + eobs[i] = c = decode_coefs(pbi, xd, bc, + &above_ec, &left_ec, + PLANE_TYPE_UV, DCT_DCT, seg_eob, xd->sb_coeff_data.qcoeff + 1024 + (i - 16) * 64, vp9_default_zig_zag1d_16x16, TX_16X16, vp9_coef_bands_16x16); - a[1] = a[0]; - l[1] = l[0]; + + a1[1] = a1[0] = a[1] = a[0] = above_ec; + l1[1] = l1[0] = l[1] = l[0] = left_ec; eobtotal += c; } - // no Y2 block - vpx_memset(&A[8], 0, sizeof(A[8])); - vpx_memset(&L[8], 0, sizeof(L[8])); - - vpx_memcpy(xd->above_context + 1, xd->above_context, - sizeof(ENTROPY_CONTEXT_PLANES)); - vpx_memcpy(xd->left_context + 1, xd->left_context, - sizeof(ENTROPY_CONTEXT_PLANES)); - + A[8] = L[8] = A1[8] = L1[8] = 0; return eobtotal; } #endif diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index fb9e3ed72..491914a5b 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -130,6 +130,14 @@ static void tokenize_b(VP9_COMP *cpi, vp9_block2left[tx_size][ib]; ENTROPY_CONTEXT a_ec = *a, l_ec = *l; +#if CONFIG_SUPERBLOCKS && CONFIG_TX32X32 + ENTROPY_CONTEXT *const a1 = (ENTROPY_CONTEXT *)(&xd->above_context[1]) + + vp9_block2above[tx_size][ib]; + ENTROPY_CONTEXT *const l1 = (ENTROPY_CONTEXT *)(&xd->left_context[1]) + + vp9_block2left[tx_size][ib]; +#endif + + switch (tx_size) { default: case TX_4X4: @@ -176,6 +184,11 @@ static void tokenize_b(VP9_COMP *cpi, if (type != PLANE_TYPE_UV) { a_ec = (a[0] + a[1] + a[2] + a[3]) != 0; l_ec = (l[0] + l[1] + l[2] + l[3]) != 0; +#if CONFIG_SUPERBLOCKS && CONFIG_TX32X32 + } else { + a_ec = (a[0] + a[1] + a1[0] + a1[1]) != 0; + l_ec = (l[0] + l[1] + l1[0] + l1[1]) != 0; +#endif } #endif seg_eob = 256; @@ -197,6 +210,14 @@ static void tokenize_b(VP9_COMP *cpi, break; #if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS case TX_32X32: +#if CONFIG_CNVCONTEXT + a_ec = a[0] + a[1] + a[2] + a[3] + + a1[0] + a1[1] + a1[2] + a1[3]; + l_ec = l[0] + l[1] + l[2] + l[3] + + l1[0] + l1[1] + l1[2] + l1[3]; + a_ec = a_ec != 0; + l_ec = l_ec != 0; +#endif seg_eob = 1024; bands = vp9_coef_bands_32x32; scan = vp9_default_zig_zag1d_32x32; @@ -253,10 +274,17 @@ static void tokenize_b(VP9_COMP *cpi, l[1] = l[2] = l[3] = l_ec; #if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS } else { - a[1] = a_ec; - l[1] = l_ec; + a1[0] = a1[1] = a[1] = a_ec; + l1[0] = l1[1] = l[1] = l_ec; #endif } +#if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS + } else if (tx_size == TX_32X32) { + a[1] = a[2] = a[3] = a_ec; + l[1] = l[2] = l[3] = l_ec; + a1[0] = a1[1] = a1[2] = a1[3] = a_ec; + l1[0] = l1[1] = l1[2] = l1[3] = l_ec; +#endif } } @@ -381,18 +409,12 @@ void vp9_tokenize_sb(VP9_COMP *cpi, tokenize_b(cpi, xd, 0, t, PLANE_TYPE_Y_WITH_DC, TX_32X32, dry_run); - A[0][1] = A[0][2] = A[0][3] = A[0][0]; - L[0][1] = L[0][2] = L[0][3] = L[0][0]; for (b = 16; b < 24; b += 4) { tokenize_b(cpi, xd, b, t, PLANE_TYPE_UV, TX_16X16, dry_run); } - vpx_memset(&A[0][8], 0, sizeof(A[0][8])); - vpx_memset(&L[0][8], 0, sizeof(L[0][8])); - vpx_memcpy(A[1], A[0], sizeof(ENTROPY_CONTEXT_PLANES)); - vpx_memcpy(L[1], L[0], sizeof(ENTROPY_CONTEXT_PLANES)); - + A[0][8] = L[0][8] = A[1][8] = L[1][8] = 0; if (dry_run) *t = t_backup; } @@ -425,6 +447,7 @@ void vp9_tokenize_mb(VP9_COMP *cpi, switch (tx_size) { case TX_16X16: + xd->mode_info_context->mbmi.mb_skip_coeff = mb_is_skippable_16x16(xd); break; case TX_8X8: @@ -499,7 +522,6 @@ void vp9_tokenize_mb(VP9_COMP *cpi, *t = t_backup; } - #ifdef ENTROPY_STATS void init_context_counters(void) { FILE *f = fopen("context.bin", "rb"); @@ -719,12 +741,17 @@ static __inline void stuff_b(VP9_COMP *cpi, TOKENEXTRA *t = *tp; const TX_TYPE tx_type = (type == PLANE_TYPE_Y_WITH_DC) ? get_tx_type(xd, b) : DCT_DCT; - ENTROPY_CONTEXT *const a = (ENTROPY_CONTEXT *)xd->above_context + vp9_block2above[tx_size][ib]; ENTROPY_CONTEXT *const l = (ENTROPY_CONTEXT *)xd->left_context + vp9_block2left[tx_size][ib]; ENTROPY_CONTEXT a_ec = *a, l_ec = *l; +#if CONFIG_SUPERBLOCKS && CONFIG_TX32X32 + ENTROPY_CONTEXT *const a1 = (ENTROPY_CONTEXT *)(&xd->above_context[1]) + + vp9_block2above[tx_size][ib]; + ENTROPY_CONTEXT *const l1 = (ENTROPY_CONTEXT *)(&xd->left_context[1]) + + vp9_block2left[tx_size][ib]; +#endif switch (tx_size) { default: @@ -759,6 +786,11 @@ static __inline void stuff_b(VP9_COMP *cpi, if (type != PLANE_TYPE_UV) { a_ec = (a[0] + a[1] + a[2] + a[3]) != 0; l_ec = (l[0] + l[1] + l[2] + l[3]) != 0; +#if CONFIG_SUPERBLOCKS && CONFIG_TX32X32 + } else { + a_ec = (a[0] + a[1] + a1[0] + a1[1]) != 0; + l_ec = (l[0] + l[1] + l1[0] + l1[1]) != 0; +#endif } #endif bands = vp9_coef_bands_16x16; @@ -772,6 +804,14 @@ static __inline void stuff_b(VP9_COMP *cpi, break; #if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS case TX_32X32: +#if CONFIG_CNVCONTEXT + a_ec = a[0] + a[1] + a[2] + a[3] + + a1[0] + a1[1] + a1[2] + a1[3]; + l_ec = l[0] + l[1] + l[2] + l[3] + + l1[0] + l1[1] + l1[2] + l1[3]; + a_ec = a_ec != 0; + l_ec = l_ec != 0; +#endif bands = vp9_coef_bands_32x32; counts = cpi->coef_counts_32x32; probs = cpi->common.fc.coef_probs_32x32; @@ -797,10 +837,17 @@ static __inline void stuff_b(VP9_COMP *cpi, l[1] = l[2] = l[3] = 0; #if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS } else { - a[1] = 0; - l[1] = 0; + a1[0] = a1[1] = a[1] = a_ec; + l1[0] = l1[1] = l[1] = l_ec; #endif } +#if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS + } else if (tx_size == TX_32X32) { + a[1] = a[2] = a[3] = a_ec; + l[1] = l[2] = l[3] = l_ec; + a1[0] = a1[1] = a1[2] = a1[3] = a_ec; + l1[0] = l1[1] = l1[2] = l1[3] = l_ec; +#endif } if (!dry_run) { @@ -917,24 +964,12 @@ void vp9_stuff_mb(VP9_COMP *cpi, MACROBLOCKD *xd, TOKENEXTRA **t, int dry_run) { #if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS static void stuff_sb_32x32(VP9_COMP *cpi, MACROBLOCKD *xd, TOKENEXTRA **t, int dry_run) { - ENTROPY_CONTEXT *A[2] = { (ENTROPY_CONTEXT *) (xd->above_context + 0), - (ENTROPY_CONTEXT *) (xd->above_context + 1), }; - ENTROPY_CONTEXT *L[2] = { (ENTROPY_CONTEXT *) (xd->left_context + 0), - (ENTROPY_CONTEXT *) (xd->left_context + 1), }; int b; stuff_b(cpi, xd, 0, t, PLANE_TYPE_Y_WITH_DC, TX_32X32, dry_run); - A[0][1] = A[0][2] = A[0][3] = A[0][0]; - L[0][1] = L[0][2] = L[0][3] = L[0][0]; for (b = 16; b < 24; b += 4) { stuff_b(cpi, xd, b, t, PLANE_TYPE_UV, TX_16X16, dry_run); - A[0][vp9_block2above[TX_16X16][b] + 1] = A[0][vp9_block2above[TX_16X16][b]]; - L[0][vp9_block2left[TX_16X16][b] + 1] = L[0][vp9_block2left[TX_16X16][b]]; } - vpx_memset(&A[0][8], 0, sizeof(A[0][8])); - vpx_memset(&L[0][8], 0, sizeof(L[0][8])); - vpx_memcpy(A[1], A[0], sizeof(ENTROPY_CONTEXT_PLANES)); - vpx_memcpy(L[1], L[0], sizeof(ENTROPY_CONTEXT_PLANES)); } void vp9_stuff_sb(VP9_COMP *cpi, MACROBLOCKD *xd, TOKENEXTRA **t, int dry_run) {