[tor-commits] [tor-browser/tor-browser-52.5.2esr-8.0-1] Bug 1403412 - disable VP9 estimizer on Mac; r=jya

[gk at torproject.org]

commit deaabb54809b2de56b2b5ce98a0f629c1455fcf5
Author: Kaku Kuo <kaku at mozilla.com>
Date:   Thu Sep 28 00:17:29 2017 +0800

    Bug 1403412 - disable VP9 estimizer on Mac; r=jya
    
    MozReview-Commit-ID: 8RTe7lVSRwl
    
    --HG--
    extra : rebase_source : 5e67fae9fa287c4188402d8956d90e4ce47e1f32
---
 dom/media/Benchmark.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp
index 2364ac2fa79c..af0f4a562da4 100644
--- a/dom/media/Benchmark.cpp
+++ b/dom/media/Benchmark.cpp
@@ -34,7 +34,8 @@ VP9Benchmark::IsVP9DecodeFast()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-#ifdef MOZ_WIDGET_ANDROID
+  // Disable VP9 estimizer on Mac, see bug 1400787.
+#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_APPLEMEDIA)
   return false;
 #else
   bool hasPref = Preferences::HasUserValue(sBenchmarkFpsPref);