From a864678cdbf26e14a521f2a8a43cf534552c2740 Mon Sep 17 00:00:00 2001 From: Yunqing Wang Date: Wed, 29 Dec 2010 10:28:35 -0500 Subject: Always update last_frame_type Scott pointed out that last_frame_type only gets updated while loopfilter exists. Since last_frame_type is also needed in motion search now, it needs to be updated every frame. Change-Id: I9203532fd67361588d4024628d9ddb8e391ad912 --- vp8/encoder/onyx_if.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vp8/encoder') diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 05a1338dc..56f7ef6f8 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4340,10 +4340,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); -- cgit v1.2.3 From de4e8185e963c0b6c8d5a2bdc8068c01348790f1 Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Wed, 29 Dec 2010 16:28:24 -0500 Subject: Fixed encoder crash when mult-threading is enabled. Happens in real-time mode. Will happen in good quality, speed 1. Change-Id: I3e5b68827b1a5798d0431b088a709256d1ce2c95 --- vp8/encoder/ethreading.c | 1 + 1 file changed, 1 insertion(+) (limited to 'vp8/encoder') diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index 2cd24da67..7b5cfe0ee 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; -- cgit v1.2.3