diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-04 00:05:13 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-04 00:05:13 -0400 |
| commit | 2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e (patch) | |
| tree | aa05dfa619c1a080efde228efd5d021158d65aa7 /vp8/encoder/encodeframe.c | |
| parent | 480f0257540324b1ffa7579688924a881638cf8a (diff) | |
| parent | 8c5b73de2a3534b2ca964e33b33474c1fd6fb488 (diff) | |
| download | libvpx-2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e.tar libvpx-2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e.tar.gz libvpx-2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e.tar.bz2 libvpx-2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I81ac427cbaf3d0865df4acef3e0bfc2e95556c4b
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index f1cbf753b..540b2c630 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -272,6 +272,7 @@ static void build_activity_map( VP8_COMP *cpi ) // Activity masking based on Tim T's original code void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) { + unsigned int a; unsigned int b; unsigned int act = *(x->mb_activity_ptr); @@ -477,24 +478,9 @@ void encode_mb_row(VP8_COMP *cpi, x->mb_activity_ptr++; x->mb_norm_activity_ptr++; - if(cm->frame_type != INTRA_FRAME) - { - if (xd->mode_info_context->mbmi.mode != B_PRED) - { - for (i = 0; i < 16; i++) - xd->mode_info_context->bmi[i].mv.as_int = xd->block[i].bmi.mv.as_int; - }else - { - for (i = 0; i < 16; i++) - xd->mode_info_context->bmi[i].as_mode = xd->block[i].bmi.mode; - } - } - else - { - if(xd->mode_info_context->mbmi.mode != B_PRED) - for (i = 0; i < 16; i++) - xd->mode_info_context->bmi[i].as_mode = xd->block[i].bmi.mode; - } + /* save the block info */ + for (i = 0; i < 16; i++) + xd->mode_info_context->bmi[i] = xd->block[i].bmi; // adjust to the next column of macroblocks x->src.y_buffer += 16; |