diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-01-08 13:31:37 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-01-08 13:31:37 -0800 |
| commit | cd0f36b24f3e529bd68fc111c880bcd5fc152a78 (patch) | |
| tree | eacef35d5cc8047976964fddb7170593d54f1c3e /vp9/encoder/vp9_onyx_if.c | |
| parent | f1c56a8c8cb0959734a14446c60c132de676388a (diff) | |
| parent | 4455036cfc3c6b7fb9d7b85af1982e7df3711a05 (diff) | |
| download | libvpx-cd0f36b24f3e529bd68fc111c880bcd5fc152a78.tar libvpx-cd0f36b24f3e529bd68fc111c880bcd5fc152a78.tar.gz libvpx-cd0f36b24f3e529bd68fc111c880bcd5fc152a78.tar.bz2 libvpx-cd0f36b24f3e529bd68fc111c880bcd5fc152a78.zip | |
Merge "Merge superblocks (32x32) experiment." into experimental
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 0e4b47ddf..a56fcc0c0 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1761,12 +1761,10 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { cm->prob_last_coded = 128; cm->prob_gf_coded = 128; cm->prob_intra_coded = 63; -#if CONFIG_SUPERBLOCKS cm->sb32_coded = 200; #if CONFIG_SUPERBLOCKS64 cm->sb64_coded = 200; #endif -#endif for (i = 0; i < COMP_PRED_CONTEXTS; i++) cm->prob_comppred[i] = 128; for (i = 0; i < TX_SIZE_MAX_SB - 1; i++) @@ -1966,7 +1964,6 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { cpi->fn_ptr[BT].sdx4df = SDX4DF; -#if CONFIG_SUPERBLOCKS BFP(BLOCK_32X32, vp9_sad32x32, vp9_variance32x32, vp9_sub_pixel_variance32x32, vp9_variance_halfpixvar32x32_h, vp9_variance_halfpixvar32x32_v, vp9_variance_halfpixvar32x32_hv, vp9_sad32x32x3, vp9_sad32x32x8, @@ -1978,7 +1975,6 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { vp9_variance_halfpixvar64x64_hv, vp9_sad64x64x3, vp9_sad64x64x8, vp9_sad64x64x4d) #endif -#endif BFP(BLOCK_16X16, vp9_sad16x16, vp9_variance16x16, vp9_sub_pixel_variance16x16, vp9_variance_halfpixvar16x16_h, vp9_variance_halfpixvar16x16_v, @@ -3655,14 +3651,12 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, vp9_copy(cpi->common.fc.coef_counts_16x16, cpi->coef_counts_16x16); vp9_copy(cpi->common.fc.hybrid_coef_counts_16x16, cpi->hybrid_coef_counts_16x16); -#if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS +#if CONFIG_TX32X32 vp9_copy(cpi->common.fc.coef_counts_32x32, cpi->coef_counts_32x32); #endif vp9_adapt_coef_probs(&cpi->common); if (cpi->common.frame_type != KEY_FRAME) { -#if CONFIG_SUPERBLOCKS vp9_copy(cpi->common.fc.sb_ymode_counts, cpi->sb_ymode_count); -#endif vp9_copy(cpi->common.fc.ymode_counts, cpi->ymode_count); vp9_copy(cpi->common.fc.uv_mode_counts, cpi->y_uv_mode_count); vp9_copy(cpi->common.fc.bmode_counts, cpi->bmode_count); |