Backed out changeset ff724e355b2d (bug 1345342) per jya's request.
authorCameron McCormack <cam@mcc.id.au>
Mon, 05 Jun 2017 15:58:41 +0800
changeset 410404 50075548c1ef7d1c6f42e38ddeeb24bb767d4d11
parent 410403 ff724e355b2df0048c3799289f300f567464b718
child 410405 6e9e40efea3995e0472fd64507b2ee2b4f76d481
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1345342
milestone55.0a1
backs outff724e355b2df0048c3799289f300f567464b718
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 ff724e355b2d (bug 1345342) per jya's request.
dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
dom/media/platforms/wrappers/H264Converter.cpp
--- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -27,22 +27,22 @@ static FFmpegLibWrapper sLibAV;
 static const char* sLibs[] = {
 #if defined(XP_DARWIN)
   "libavcodec.57.dylib",
   "libavcodec.56.dylib",
   "libavcodec.55.dylib",
   "libavcodec.54.dylib",
   "libavcodec.53.dylib",
 #else
-  //"libavcodec-ffmpeg.so.57",
-  //"libavcodec-ffmpeg.so.56",
-  //"libavcodec.so.57",
-  //"libavcodec.so.56",
-  //"libavcodec.so.55",
-  //"libavcodec.so.54",
+  "libavcodec-ffmpeg.so.57",
+  "libavcodec-ffmpeg.so.56",
+  "libavcodec.so.57",
+  "libavcodec.so.56",
+  "libavcodec.so.55",
+  "libavcodec.so.54",
   "libavcodec.so.53",
 #endif
 };
 
 /* static */ bool
 FFmpegRuntimeLinker::Init()
 {
   if (sLinkStatus != LinkStatus_INIT) {
--- a/dom/media/platforms/wrappers/H264Converter.cpp
+++ b/dom/media/platforms/wrappers/H264Converter.cpp
@@ -126,19 +126,16 @@ H264Converter::Decode(MediaRawData* aSam
   aSample->mExtraData = mCurrentConfig.mExtraData;
 
   return mDecoder->Decode(aSample);
 }
 
 RefPtr<MediaDataDecoder::FlushPromise>
 H264Converter::Flush()
 {
-  mDecodePromiseRequest.DisconnectIfExists();
-  mFlushRequest.DisconnectIfExists();
-  mDecodePromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
   mNeedKeyframe = true;
   if (mDecoder) {
     return mDecoder->Flush();
   }
   return FlushPromise::CreateAndResolve(true, __func__);
 }
 
 RefPtr<MediaDataDecoder::DecodePromise>