summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_encodemb.c
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2013-05-04 22:09:43 -0700
committerJingning Han <jingning@google.com>2013-05-07 09:08:25 -0700
commit776c1482a302f5ea42dfe4517f51c0f1e48f2670 (patch)
tree50af5bd8efe251aa065f94249f172a1922aae0f2 /vp9/encoder/vp9_encodemb.c
parent8c70a0fcab18ed3ebbdceee43a9e4305251677ae (diff)
downloadlibvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar
libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar.gz
libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar.bz2
libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.zip
Merge SB8X8 into the codebase
Pull sb8x8 out of experimental list. verified via borg run tests. Fixed unit test failures. Change-Id: I12a4bbd17395930580c048ab68becad1ffe46e76
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
-rw-r--r--vp9/encoder/vp9_encodemb.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index 6e28f90cd..421052753 100644
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -404,9 +404,6 @@ void vp9_optimize_sby(VP9_COMMON *const cm, MACROBLOCK *x,
struct optimize_block_args arg = {cm, x, &ctx};
vp9_optimize_init(&x->e_mbd, bsize, &ctx);
foreach_transformed_block_in_plane(&x->e_mbd, bsize, 0,
-#if !CONFIG_SB8X8
- 0,
-#endif
optimize_block, &arg);
}
@@ -551,9 +548,6 @@ void vp9_xform_quant_sby(VP9_COMMON *const cm, MACROBLOCK *x,
struct encode_b_args arg = {cm, x, NULL};
foreach_transformed_block_in_plane(xd, bsize, 0,
-#if !CONFIG_SB8X8
- 0,
-#endif
xform_quant, &arg);
}
@@ -576,9 +570,6 @@ void vp9_encode_sby(VP9_COMMON *const cm, MACROBLOCK *x,
vp9_optimize_init(xd, bsize, &ctx);
foreach_transformed_block_in_plane(xd, bsize, 0,
-#if !CONFIG_SB8X8
- 0,
-#endif
encode_block, &arg);
vp9_recon_sby(xd, bsize);