diff options
| author | Deb Mukherjee <debargha@google.com> | 2013-01-08 12:18:16 -0800 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2013-01-08 14:05:58 -0800 |
| commit | 4b7304ee68dc28f96d73ff4ff1894de833d54f1a (patch) | |
| tree | af086452b9cdd2446a55a817efab7817985c1af7 /vp9/encoder/vp9_rdopt.c | |
| parent | cd0f36b24f3e529bd68fc111c880bcd5fc152a78 (diff) | |
| download | libvpx-4b7304ee68dc28f96d73ff4ff1894de833d54f1a.tar libvpx-4b7304ee68dc28f96d73ff4ff1894de833d54f1a.tar.gz libvpx-4b7304ee68dc28f96d73ff4ff1894de833d54f1a.tar.bz2 libvpx-4b7304ee68dc28f96d73ff4ff1894de833d54f1a.zip | |
Adds 64x64 hybrid dct/dwt transform
This is to add to the 64x64 transform experiment as an alternative to
a 64x64 DCT.
Two levels of wavelet decomposition is used on a 64x64 block, followed
by 16x16 DCT on the four lowest subbands. The highest three subbands
are left untransformed after the first level DWT.
Change-Id: I3d48d5800468d655191933894df6b46e15adca56
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index c695c049a..956d8f90c 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -965,17 +965,17 @@ static void super_block_yrd_32x32(MACROBLOCK *x, SUPERBLOCK * const x_sb = &x->sb_coeff_data; MACROBLOCKD * const xd = &x->e_mbd; SUPERBLOCKD * const xd_sb = &xd->sb_coeff_data; -#if DEBUG_ERROR || CONFIG_DWT32X32HYBRID +#if DEBUG_ERROR || CONFIG_DWTDCTHYBRID int16_t out[1024]; #endif vp9_transform_sby_32x32(x); vp9_quantize_sby_32x32(x); -#if DEBUG_ERROR || CONFIG_DWT32X32HYBRID +#if DEBUG_ERROR || CONFIG_DWTDCTHYBRID vp9_short_idct32x32(xd_sb->dqcoeff, out, 64); #endif -#if !CONFIG_DWT32X32HYBRID +#if !CONFIG_DWTDCTHYBRID *distortion = vp9_sb_block_error_c(x_sb->coeff, xd_sb->dqcoeff, 1024); #else *distortion = vp9_block_error_c(x_sb->src_diff, out, 1024) << 4; |