generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Dont pick encoder filter level when loopfilter is disabled."

Browse Source
This commit is contained in:
John Koleszar 2011-02-18 05:26:23 -08:00 committed by Code Review
commit 597d02b508
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vp8/encoder/onyx_if.c
View File

@ -4417,22 +4417,25 @@ static void encode_frame_to_data_rate
//#pragma omp section //#pragma omp section
{ {
struct vpx_usec_timer timer;
vpx_usec_timer_start(&timer);
if (cpi->sf.auto_filter == 0)
vp8cx_pick_filter_level_fast(cpi->Source, cpi);
else
vp8cx_pick_filter_level(cpi->Source, cpi);
vpx_usec_timer_mark(&timer);
cpi->time_pick_lpf += vpx_usec_timer_elapsed(&timer);
if (cm->no_lpf) if (cm->no_lpf)
{
cm->filter_level = 0; cm->filter_level = 0;
}
else
{
struct vpx_usec_timer timer;
vpx_usec_timer_start(&timer);
if (cpi->sf.auto_filter == 0)
vp8cx_pick_filter_level_fast(cpi->Source, cpi);
else
vp8cx_pick_filter_level(cpi->Source, cpi);
vpx_usec_timer_mark(&timer);
cpi->time_pick_lpf += vpx_usec_timer_elapsed(&timer);
}
if (cm->filter_level > 0) if (cm->filter_level > 0)
{ {
@ -4441,7 +4444,9 @@ static void encode_frame_to_data_rate
cm->last_filter_type = cm->filter_type; cm->last_filter_type = cm->filter_type;
cm->last_sharpness_level = cm->sharpness_level; 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 */
/* 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; cm->last_frame_type = cm->frame_type;
vp8_yv12_extend_frame_borders_ptr(cm->frame_to_show); vp8_yv12_extend_frame_borders_ptr(cm->frame_to_show);