Backed out changeset 0a7ec92071a5 (bug 1190379) for Android bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 07 Aug 2015 11:14:05 -0400
changeset 288496 c95476e9b53bd42a0fd1242746d46d99af39ba86
parent 288495 d907c75bca6aff13b7da5ed566ad8063788d0825
child 288497 ebbd4386dbd3bfb23dc118fe1a6a63c3f51cf4c3
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1190379
milestone42.0a1
backs out0a7ec92071a5f547c3b13f4abca6aa9d2e848f15
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 0a7ec92071a5 (bug 1190379) for Android bustage. CLOSED TREE
dom/media/platforms/android/AndroidDecoderModule.cpp
--- a/dom/media/platforms/android/AndroidDecoderModule.cpp
+++ b/dom/media/platforms/android/AndroidDecoderModule.cpp
@@ -32,23 +32,17 @@ namespace mozilla {
     mCallback->Func(__VA_ARGS__); \
   } else { \
     NS_WARNING("callback not set"); \
   }
 
 static MediaCodec::LocalRef CreateDecoder(const nsACString& aMimeType)
 {
   MediaCodec::LocalRef codec;
-  nsACString type = *aMimeType;
-  if (aMimeType.EqualsLiteral("video/webm; codecs=vp8")) {
-      type = "video/x-vnd.on2.vp8";
-  } else if (aMimeType.EqualsLiteral("video/webm; codecs=vp9")) {
-      type = "video/x-vnd.on2.vp9";
-  }
-  NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(PromiseFlatCString(type).get(), &codec), nullptr);
+  NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(PromiseFlatCString(aMimeType).get(), &codec), nullptr);
   return codec;
 }
 
 class VideoDataDecoder : public MediaCodecDataDecoder {
 public:
   VideoDataDecoder(const VideoInfo& aConfig,
                    MediaFormat::Param aFormat, MediaDataDecoderCallback* aCallback,
                    layers::ImageContainer* aImageContainer)