diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-28 00:05:04 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-28 00:05:04 -0400 |
| commit | d7c6c9472f6b36a6615e9225322a737169b73451 (patch) | |
| tree | 170fe747712fb8e0a04a622720cc2a4dcc89e00f /vp8/decoder/error_concealment.c | |
| parent | 3ce5adb15434556f15e6388b535c988515d40e56 (diff) | |
| parent | 7985e023ebd83351b670bf5b18060f4d391b3a64 (diff) | |
| download | libvpx-d7c6c9472f6b36a6615e9225322a737169b73451.tar libvpx-d7c6c9472f6b36a6615e9225322a737169b73451.tar.gz libvpx-d7c6c9472f6b36a6615e9225322a737169b73451.tar.bz2 libvpx-d7c6c9472f6b36a6615e9225322a737169b73451.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Diffstat (limited to 'vp8/decoder/error_concealment.c')
| -rw-r--r-- | vp8/decoder/error_concealment.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vp8/decoder/error_concealment.c b/vp8/decoder/error_concealment.c index c06bdcf07..4f8f1a66c 100644 --- a/vp8/decoder/error_concealment.c +++ b/vp8/decoder/error_concealment.c @@ -382,6 +382,7 @@ static void estimate_missing_mvs(MB_OVERLAP *overlaps, mi->mbmi.mode = SPLITMV; mi->mbmi.uv_mode = DC_PRED; mi->mbmi.partitioning = 3; + mi->mbmi.segment_id = 0; estimate_mb_mvs(block_overlaps, mi, mb_to_left_edge, @@ -563,6 +564,12 @@ static void interpolate_mvs(MACROBLOCKD *mb, mb->mb_to_top_edge, mb->mb_to_bottom_edge); } + else + { + mv->as_int = 0; + mi->bmi[row*4 + col].as_mode = NEW4X4; + mi->mbmi.need_to_clamp_mvs = 0; + } } } } @@ -597,6 +604,7 @@ void vp8_interpolate_motion(MACROBLOCKD *mb, mb->mode_info_context->mbmi.mode = SPLITMV; mb->mode_info_context->mbmi.uv_mode = DC_PRED; mb->mode_info_context->mbmi.partitioning = 3; + mb->mode_info_context->mbmi.segment_id = 0; } void vp8_conceal_corrupt_mb(MACROBLOCKD *xd) |