diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-10-17 15:15:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-17 15:15:10 -0700 |
| commit | c6f13f32784330350f176f453c8a4c2a9f6b90a6 (patch) | |
| tree | 98b17d6bfc0fcbc980a41b6f68375c667f118184 /vp8/encoder/encodeframe.c | |
| parent | eab804558bb7ff3fb503a1f9ccaf641d0dbc0120 (diff) | |
| parent | 47a2154c0e1130a247b7920b0a0c57ada212abc1 (diff) | |
| download | libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar.gz libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar.bz2 libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.zip | |
Merge changes Ic711a378,I43a46c36,If19ee74a into experimental
* changes:
Move remaining per-frame data into partition 0
Interleave modes/residual per macroblock
Force interleaved decoding
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index f784cf434..9f7e81d0a 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1051,9 +1051,6 @@ static void encode_sb(VP8_COMP *cpi, cpi->inter_zz_count++; } - // TODO Partitioning is broken! - cpi->tplist[mb_row].stop = *tp; - #if CONFIG_SUPERBLOCKS if (xd->mode_info_context->mbmi.encoded_as_sb) { x->src.y_buffer += 32; @@ -1065,6 +1062,9 @@ static void encode_sb(VP8_COMP *cpi, xd->mode_info_context += 2; xd->prev_mode_info_context += 2; + (*tp)->Token = EOSB_TOKEN; + (*tp)++; + cpi->tplist[mb_row].stop = *tp; break; } #endif @@ -1086,6 +1086,9 @@ static void encode_sb(VP8_COMP *cpi, assert((xd->prev_mode_info_context - cpi->common.prev_mip) == (xd->mode_info_context - cpi->common.mip)); #endif + (*tp)->Token = EOSB_TOKEN; + (*tp)++; + cpi->tplist[mb_row].stop = *tp; } // debug output |