diff options
author | Attila Nagy <attilanagy@google.com> | 2011-02-16 15:44:29 +0200 |
---|---|---|
committer | Attila Nagy <attilanagy@google.com> | 2011-02-18 08:53:00 +0200 |
commit | c6ef75690fb71c801225c4884615834ab2b5d9cc (patch) | |
tree | 2eeb845eee308771adefc24a61519c5740d9b8ed /vp8/encoder | |
parent | b2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff) | |
download | libvpx-c6ef75690fb71c801225c4884615834ab2b5d9cc.tar libvpx-c6ef75690fb71c801225c4884615834ab2b5d9cc.tar.gz libvpx-c6ef75690fb71c801225c4884615834ab2b5d9cc.tar.bz2 libvpx-c6ef75690fb71c801225c4884615834ab2b5d9cc.zip |
Dont pick encoder filter level when loopfilter is disabled.
Change-Id: I58154faf4f3ece24f9927a5c3ab7e830e0887fb6
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/onyx_if.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 6ab1b39f7..3e2752bb9 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4410,22 +4410,25 @@ static void encode_frame_to_data_rate //#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); + if (cm->no_lpf) + { + cm->filter_level = 0; + } else - vp8cx_pick_filter_level(cpi->Source, cpi); + { + struct vpx_usec_timer timer; - vpx_usec_timer_mark(&timer); + vpx_usec_timer_start(&timer); - cpi->time_pick_lpf += vpx_usec_timer_elapsed(&timer); + if (cpi->sf.auto_filter == 0) + vp8cx_pick_filter_level_fast(cpi->Source, cpi); + else + vp8cx_pick_filter_level(cpi->Source, cpi); - if (cm->no_lpf) - cm->filter_level = 0; + vpx_usec_timer_mark(&timer); + + cpi->time_pick_lpf += vpx_usec_timer_elapsed(&timer); + } if (cm->filter_level > 0) { @@ -4434,7 +4437,9 @@ static void encode_frame_to_data_rate 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 */ + + /* 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); |