diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2011-06-02 13:46:41 -0400 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2011-06-02 13:46:41 -0400 |
| commit | 773768ae27bfe427f153c8e6fadb3912b8f94c1f (patch) | |
| tree | 96bc9e8a572b9e8ecf4d43fc7960a90f06551565 /vp8/encoder/encodeframe.c | |
| parent | 9e4f76c154a355bac2a3e005e47882219801bdae (diff) | |
| download | libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.tar libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.tar.gz libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.tar.bz2 libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.zip | |
Removed B_MODE_INFO
Declared the bmi in BLOCKD as a union instead of B_MODE_INFO.
Then removed B_MODE_INFO completely.
Change-Id: Ieb7469899e265892c66f7aeac87b7f2bf38e7a67
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 1bb026048..f72fccc7c 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; |