Merge "Force realtime version 1 streams to only use simple loopfilter"

d7e09b6a · Yunqing Wang · Gerrit Code Review · 72f459c7 · 55fbdd58 · d7e09b6a
Commit d7e09b6a authored Dec 15, 2011 by Yunqing Wang Committed by Gerrit Code Review Dec 15, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

vp8/encoder/onyx_if.c vp8/encoder/onyx_if.c +9 -2

No files found.
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1196,10 +1196,17 @@ void vp8_set_speed_features(VP8_COMP *cpi)
            cpi->mode_check_freq[THR_NEW1 ] = 1 << (Tmp - 1);
        }

-        cm->filter_type = NORMAL_LOOPFILTER;
+        if(cm->version == 0)
+        {
+            cm->filter_type = NORMAL_LOOPFILTER;

-        if (Speed >= 14)
+            if (Speed >= 14)
+                cm->filter_type = SIMPLE_LOOPFILTER;
+        }
+        else
+        {
            cm->filter_type = SIMPLE_LOOPFILTER;
+        }

        if (Speed >= 15)
        {