Backed out changeset 6ef62825d79f (bug 1538474) for causing mda failures on test_playback.html. CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Mon, 25 Mar 2019 23:15:09 +0200
changeset 465996 d04ec06581a08f3b487f1becd6ef018424ef8139
parent 465995 d7fdd6fbd9cd6c019733f2b574c6ffb95ba81913
child 465997 b0b02f3c5203afa2323ca7a5900f3d3d53037ac9
push id81374
push usernbeleuzu@mozilla.com
push dateMon, 25 Mar 2019 21:20:53 +0000
treeherderautoland@b0b02f3c5203 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1538474
milestone68.0a1
backs out6ef62825d79f142b9aabd982d84f2e69e4eded06
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 6ef62825d79f (bug 1538474) for causing mda failures on test_playback.html. CLOSED TREE
dom/media/ipc/RemoteVideoDecoder.cpp
modules/libpref/init/StaticPrefList.h
--- a/dom/media/ipc/RemoteVideoDecoder.cpp
+++ b/dom/media/ipc/RemoteVideoDecoder.cpp
@@ -4,17 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "RemoteVideoDecoder.h"
 
 #include "mozilla/layers/ImageDataSerializer.h"
 
 #ifdef MOZ_AV1
 #  include "AOMDecoder.h"
-#  include "DAV1DDecoder.h"
 #endif
 #include "ImageContainer.h"  // for PlanarYCbCrData and BufferRecycleBin
 #include "RemoteDecoderManagerChild.h"
 
 namespace mozilla {
 
 using namespace layers;  // for PlanarYCbCrData and BufferRecycleBin
 
@@ -147,21 +146,17 @@ RemoteVideoDecoderParent::RemoteVideoDec
   params.mImageContainer = new layers::ImageContainer();
   params.mRate = CreateDecoderParams::VideoFrameRate(aFramerate);
   params.mOptions = aOptions;
   MediaResult error(NS_OK);
   params.mError = &error;
 
 #ifdef MOZ_AV1
   if (AOMDecoder::IsAV1(params.mConfig.mMimeType)) {
-    if (StaticPrefs::MediaAv1UseDav1d()) {
-      mDecoder = new DAV1DDecoder(params);
-    } else {
-      mDecoder = new AOMDecoder(params);
-    }
+    mDecoder = new AOMDecoder(params);
   }
 #endif
 
   if (NS_FAILED(error)) {
     MOZ_ASSERT(aErrorDescription);
     *aErrorDescription = error.Description();
   }
 
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -1652,40 +1652,31 @@ VARCACHE_PREF(
   RelaxedAtomicBool, true
 )
 
 // AV1
 #if defined(XP_WIN) && !defined(_ARM64_)
 # define PREF_VALUE true
 #elif defined(XP_MACOSX)
 # define PREF_VALUE true
-#elif defined(XP_UNIX) && !defined(Android)
+#elif defined(XP_UNIX)
 # define PREF_VALUE true
 #else
 # define PREF_VALUE false
 #endif
 VARCACHE_PREF(
   "media.av1.enabled",
    MediaAv1Enabled,
   RelaxedAtomicBool, PREF_VALUE
 )
 #undef PREF_VALUE
-
 VARCACHE_PREF(
   "media.av1.use-dav1d",
    MediaAv1UseDav1d,
-#if defined(XP_WIN) && !defined(_ARM64_)
-  RelaxedAtomicBool, true
-#elif defined(XP_MACOSX)
-  RelaxedAtomicBool, true
-#elif defined(XP_UNIX) && !defined(Android)
-  RelaxedAtomicBool, true
-#else
   RelaxedAtomicBool, false
-#endif
 )
 
 VARCACHE_PREF(
   "media.flac.enabled",
    MediaFlacEnabled,
   bool, true
 )