diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-30 00:05:14 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-30 00:05:14 -0500 |
| commit | 4d98741c618db5c12b4d92ecda8ff0e1331a8868 (patch) | |
| tree | 01d312fc0d1d1e3fe844c51a6070301033b8c826 | |
| parent | 416484774830a5d2e6e63d413796b5330480cee2 (diff) | |
| parent | de4e8185e963c0b6c8d5a2bdc8068c01348790f1 (diff) | |
| download | libvpx-4d98741c618db5c12b4d92ecda8ff0e1331a8868.tar libvpx-4d98741c618db5c12b4d92ecda8ff0e1331a8868.tar.gz libvpx-4d98741c618db5c12b4d92ecda8ff0e1331a8868.tar.bz2 libvpx-4d98741c618db5c12b4d92ecda8ff0e1331a8868.zip | |
Merge remote branch 'internal/upstream' into HEAD
| -rw-r--r-- | vp8/common/onyxc_int.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/ethreading.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index f60b0f3f5..90d63e535 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -105,7 +105,7 @@ typedef struct VP8Common YV12_BUFFER_CONFIG post_proc_buffer; YV12_BUFFER_CONFIG temp_scale_frame; - FRAME_TYPE last_frame_type; /* Add to check if vp8_frame_init_loop_filter() can be skipped. */ + FRAME_TYPE last_frame_type; /* Save last frame's frame type for loopfilter init checking and motion search. */ FRAME_TYPE frame_type; int show_frame; diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index 7599568c8..bf03560e1 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -310,6 +310,7 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc) for (i = 0; i < 25; i++) { z->block[i].quant = x->block[i].quant; + z->block[i].quant_fast = x->block[i].quant_fast; z->block[i].quant_shift = x->block[i].quant_shift; z->block[i].zbin = x->block[i].zbin; z->block[i].zrun_zbin_boost = x->block[i].zrun_zbin_boost; diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index e483e0811..1bc0f5865 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4339,10 +4339,11 @@ static void encode_frame_to_data_rate { vp8cx_set_alt_lf_level(cpi, cm->filter_level); vp8_loop_filter_frame(cm, &cpi->mb.e_mbd, cm->filter_level); - cm->last_frame_type = cm->frame_type; cm->last_filter_type = cm->filter_type; cm->last_sharpness_level = cm->sharpness_level; } + /* Move storing frame_type out of the above loop since it is also needed in motion search besides loopfilter */ + cm->last_frame_type = cm->frame_type; vp8_yv12_extend_frame_borders_ptr(cm->frame_to_show); |