diff options
| author | Jingning Han <jingning@google.com> | 2013-04-23 17:16:16 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-23 17:16:16 -0700 |
| commit | adbbd26517d57c9d8ab439ee5f17a1c1155fec74 (patch) | |
| tree | 78d34065557db9a5ac80d88e929d4693d28fd650 /vp9/encoder/vp9_encodeframe.c | |
| parent | 4f35e3e1c1543f204fb5edac97e53bc467ec56ab (diff) | |
| parent | a26c1edbb40fc9f77bd163aa7b4d292d9fb6c8f8 (diff) | |
| download | libvpx-adbbd26517d57c9d8ab439ee5f17a1c1155fec74.tar libvpx-adbbd26517d57c9d8ab439ee5f17a1c1155fec74.tar.gz libvpx-adbbd26517d57c9d8ab439ee5f17a1c1155fec74.tar.bz2 libvpx-adbbd26517d57c9d8ab439ee5f17a1c1155fec74.zip | |
Merge "Enable rectangular support for comp inter-intra" into experimental
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 646d2c4c6..a3f49c339 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1972,12 +1972,13 @@ static void encode_macroblock(VP9_COMP *cpi, TOKENEXTRA **t, vp9_build_inter_predictors_sb(xd, mb_row, mb_col, BLOCK_SIZE_MB16X16); #if CONFIG_COMP_INTERINTRA_PRED if (xd->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) { - vp9_build_interintra_16x16_predictors_mb(xd, - xd->plane[0].dst.buf, - xd->plane[1].dst.buf, - xd->plane[2].dst.buf, - xd->plane[0].dst.stride, - xd->plane[1].dst.stride); + vp9_build_interintra_predictors(xd, + xd->plane[0].dst.buf, + xd->plane[1].dst.buf, + xd->plane[2].dst.buf, + xd->plane[0].dst.stride, + xd->plane[1].dst.stride, + BLOCK_SIZE_MB16X16); } #endif } |