Bug 1055694 - Disable mac mp4 hardware acceleration. r=ajones, a=lmandel
authorRalph Giles <giles@mozilla.com>
Tue, 02 Sep 2014 12:56:00 -0700
changeset 224705 85e53c93a76fbbc0db4e667aa0303890834ed4b7
parent 224704 60e0c4dac4b179f987cf7ffca112a3136c70f87c
child 224706 13250f674911e3443217ccea7230c231796a8ffa
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersajones, lmandel
bugs1055694
milestone34.0a2
Bug 1055694 - Disable mac mp4 hardware acceleration. r=ajones, a=lmandel Works around crashes initializing multiple sessions.
content/media/fmp4/apple/AppleVTDecoder.cpp
--- a/content/media/fmp4/apple/AppleVTDecoder.cpp
+++ b/content/media/fmp4/apple/AppleVTDecoder.cpp
@@ -444,25 +444,29 @@ AppleVTDecoder::InitializeSession()
     return NS_ERROR_FAILURE;
   }
 
   // Contruct video decoder selection spec.
   AutoCFRelease<CFMutableDictionaryRef> spec =
     CFDictionaryCreateMutable(NULL, 0,
                               &kCFTypeDictionaryKeyCallBacks,
                               &kCFTypeDictionaryValueCallBacks);
+// FIXME: Enabling hardware acceleration causes crashes in
+// VTDecompressionSessionCreate() with multiple videos. Bug 1055694
+#if 0
   // This key is supported (or ignored) but not declared prior to OSX 10.9.
   AutoCFRelease<CFStringRef>
         kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder =
         CFStringCreateWithCString(NULL, "EnableHardwareAcceleratedVideoDecoder",
             kCFStringEncodingUTF8);
 
   CFDictionarySetValue(spec,
       kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder,
       kCFBooleanTrue);
+#endif
 
   VTDecompressionOutputCallbackRecord cb = { PlatformCallback, this };
   rv = VTDecompressionSessionCreate(NULL, // Allocator.
                                     mFormat,
                                     spec, // Video decoder selection.
                                     NULL, // Output video format.
                                     &cb,
                                     &mSession);