commit c6ef75690fb71c801225c4884615834ab2b5d9cc
author Attila Nagy <attilanagy@google.com> Wed Feb 16 15:44:29 2011 +0200
committer Attila Nagy <attilanagy@google.com> Fri Feb 18 08:53:00 2011 +0200
tree 2eeb845eee308771adefc24a61519c5740d9b8ed
parent b2ae57f1b6cbbf018d356528bd8e816752dbbfb7

Dont pick encoder filter level when loopfilter is disabled.

Change-Id: I58154faf4f3ece24f9927a5c3ab7e830e0887fb6

vp8/encoder/onyx_if.c

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 6ab1b39..3e2752b 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -4410,22 +4410,25 @@
 
         //#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)
+            {
                 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)
             {
@@ -4434,7 +4437,9 @@
                 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);