diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-08-14 09:12:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-14 09:12:31 -0700 |
| commit | 3fda7a665d432fdf2650ec8a455a3d0aeec919e6 (patch) | |
| tree | 78990975e8b0eb7140a3e6635748711a70c46d49 /vp8/encoder/tokenize.c | |
| parent | 39892cceadc48aac8ffca69f9700c854b0bd2441 (diff) | |
| parent | e52e8b70250b0f897e6947b5c24db365e489ba07 (diff) | |
| download | libvpx-3fda7a665d432fdf2650ec8a455a3d0aeec919e6.tar libvpx-3fda7a665d432fdf2650ec8a455a3d0aeec919e6.tar.gz libvpx-3fda7a665d432fdf2650ec8a455a3d0aeec919e6.tar.bz2 libvpx-3fda7a665d432fdf2650ec8a455a3d0aeec919e6.zip | |
Merge "Changed to use reference mv as nearest mv" into experimental
Diffstat (limited to 'vp8/encoder/tokenize.c')
| -rw-r--r-- | vp8/encoder/tokenize.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index a8b6436ef..9b848f3d5 100644 --- a/vp8/encoder/tokenize.c +++ b/vp8/encoder/tokenize.c @@ -1311,6 +1311,7 @@ void vp8_stuff_mb_8x8(VP8_COMP *cpi, ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)x->left_context; int plane_type; int b; + TOKENEXTRA *t_backup = *t; stuff2nd_order_b_8x8(x->block + 24, t, 1, x->frame_type, A + vp8_block2above_8x8[24], @@ -1334,6 +1335,8 @@ void vp8_stuff_mb_8x8(VP8_COMP *cpi, *(A + vp8_block2above_8x8[b] + 1) = *(A + vp8_block2above_8x8[b]); *(L + vp8_block2left_8x8[b] + 1) = *(L + vp8_block2left_8x8[b]); } + if (dry_run) + *t = t_backup; } @@ -1370,6 +1373,7 @@ void vp8_stuff_mb_16x16(VP8_COMP *cpi, ENTROPY_CONTEXT * A = (ENTROPY_CONTEXT *)x->above_context; ENTROPY_CONTEXT * L = (ENTROPY_CONTEXT *)x->left_context; int b, i; + TOKENEXTRA *t_backup = *t; stuff1st_order_b_16x16(x->block, t, x->frame_type, A, L, cpi, dry_run); for (i = 1; i < 16; i++) { @@ -1386,6 +1390,8 @@ void vp8_stuff_mb_16x16(VP8_COMP *cpi, } vpx_memset(&A[8], 0, sizeof(A[8])); vpx_memset(&L[8], 0, sizeof(L[8])); + if (dry_run) + *t = t_backup; } #endif @@ -1456,7 +1462,8 @@ void stuff1st_order_buv *a = *l = pt; } -void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t, int dry_run) { +void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, + TOKENEXTRA **t, int dry_run) { ENTROPY_CONTEXT *A = (ENTROPY_CONTEXT *)x->above_context; ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)x->left_context; int plane_type; |