diff options
| author | Jingning Han <jingning@google.com> | 2013-05-07 09:23:47 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-07 09:23:47 -0700 |
| commit | c0504a9b2412967edb608afca07b717ac031b17f (patch) | |
| tree | cdf04cf7ba53a4180fb34f290d422ab90dec7991 /vp9/encoder/vp9_firstpass.c | |
| parent | 9c7d06e6f3bf9a0cb1f761184a64e8a13492c8cf (diff) | |
| parent | 776c1482a302f5ea42dfe4517f51c0f1e48f2670 (diff) | |
| download | libvpx-c0504a9b2412967edb608afca07b717ac031b17f.tar libvpx-c0504a9b2412967edb608afca07b717ac031b17f.tar.gz libvpx-c0504a9b2412967edb608afca07b717ac031b17f.tar.bz2 libvpx-c0504a9b2412967edb608afca07b717ac031b17f.zip | |
Merge "Merge SB8X8 into the codebase" into experimental
Diffstat (limited to 'vp9/encoder/vp9_firstpass.c')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 5afd8b5a0..a1898af48 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -518,9 +518,9 @@ void vp9_first_pass(VP9_COMP *cpi) { int use_dc_pred = (mb_col || mb_row) && (!mb_col || !mb_row); set_mi_row_col(cm, xd, - mb_row << CONFIG_SB8X8, + mb_row << 1, 1 << mi_height_log2(BLOCK_SIZE_MB16X16), - mb_col << CONFIG_SB8X8, + mb_col << 1, 1 << mi_height_log2(BLOCK_SIZE_MB16X16)); xd->plane[0].dst.buf = new_yv12->y_buffer + recon_yoffset; @@ -623,8 +623,8 @@ void vp9_first_pass(VP9_COMP *cpi) { this_error = motion_error; vp9_set_mbmode_and_mvs(x, NEWMV, &mv); xd->mode_info_context->mbmi.txfm_size = TX_4X4; - vp9_build_inter_predictors_sby(xd, mb_row << CONFIG_SB8X8, - mb_col << CONFIG_SB8X8, + vp9_build_inter_predictors_sby(xd, mb_row << 1, + mb_col << 1, BLOCK_SIZE_MB16X16); vp9_encode_sb(cm, x, BLOCK_SIZE_MB16X16); sum_mvr += mv.as_mv.row; |