diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-14 00:05:04 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-14 00:05:05 -0500 |
| commit | 6a80032280305c41f20403b07698ca969ec7edb2 (patch) | |
| tree | fd06c759f687f3ac2f1dcad4f2f4926e07bb4b7f /vp8/encoder/ethreading.c | |
| parent | b6905e36d9a55589033723057b20a736844d1c17 (diff) | |
| parent | 3809d7bbd984a763cf7f288a51c9924667addf4a (diff) | |
| download | libvpx-6a80032280305c41f20403b07698ca969ec7edb2.tar libvpx-6a80032280305c41f20403b07698ca969ec7edb2.tar.gz libvpx-6a80032280305c41f20403b07698ca969ec7edb2.tar.bz2 libvpx-6a80032280305c41f20403b07698ca969ec7edb2.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: Ic88e9b2fcf1dcb2852a7205bcda3f181103f5612
Diffstat (limited to 'vp8/encoder/ethreading.c')
| -rw-r--r-- | vp8/encoder/ethreading.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index 3646375ed..3c768b24d 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -132,6 +132,7 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data) else xd->mode_info_context->mbmi.segment_id = 0; // Set to Segment 0 by default + x->active_ptr = cpi->active_map + seg_map_index + mb_col; if (cm->frame_type == KEY_FRAME) { @@ -163,8 +164,28 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data) if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)) cpi->inter_zz_count ++; - } + // Special case code for cyclic refresh + // If cyclic update enabled then copy xd->mbmi.segment_id; (which may have been updated based on mode + // during vp8cx_encode_inter_macroblock()) back into the global sgmentation map + if (cpi->cyclic_refresh_mode_enabled && xd->segmentation_enabled) + { + cpi->segmentation_map[seg_map_index+mb_col] = xd->mode_info_context->mbmi.segment_id; + + // If the block has been refreshed mark it as clean (the magnitude of the -ve influences how long it will be before we consider another refresh): + // Else if it was coded (last frame 0,0) and has not already been refreshed then mark it as a candidate for cleanup next time (marked 0) + // else mark it as dirty (1). + if (xd->mode_info_context->mbmi.segment_id) + cpi->cyclic_refresh_map[seg_map_index+mb_col] = -1; + else if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)) + { + if (cpi->cyclic_refresh_map[seg_map_index+mb_col] == 1) + cpi->cyclic_refresh_map[seg_map_index+mb_col] = 0; + } + else + cpi->cyclic_refresh_map[seg_map_index+mb_col] = 1; + } + } cpi->tplist[mb_row].stop = *tp; x->gf_active_ptr++; // Increment pointer into gf useage flags structure for next mb |