Backed out changeset 3e74b1fb1b79 (bug 1223270)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 20 Jun 2017 09:41:36 +0200
changeset 364998 25d328d1bc168b63fddf9785417070b1c1f0aa64
parent 364997 35093d05505cf66538704e144aee902f2c1164f0
child 364999 5d2d884164ea2d6cc2cc36d682b3513ca4780672
push id91680
push userkwierso@gmail.com
push dateWed, 21 Jun 2017 01:32:01 +0000
treeherdermozilla-inbound@f7b9dc31956c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1223270
milestone56.0a1
backs out3e74b1fb1b799ce3e22de0c579c5de7604c571fd
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 3e74b1fb1b79 (bug 1223270)
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -2276,25 +2276,16 @@ MediaFormatReader::Update(TrackType aTra
               a.mStats.mInterKeyFrameMax_us = segment_us;
             }
           }
           mPreviousDecodedKeyframeTime_us = output->mTime.ToMicroseconds();
         }
         nsCString error;
         mVideo.mIsHardwareAccelerated =
           mVideo.mDecoder && mVideo.mDecoder->IsHardwareAccelerated(error);
-#ifdef XP_WIN
-        // D3D11_YCBCR_IMAGE images are GPU based, we try to limit the amount
-        // of GPU RAM used.
-        VideoData* videoData = static_cast<VideoData*>(output.get());
-        mVideo.mIsHardwareAccelerated =
-          mVideo.mIsHardwareAccelerated ||
-          (videoData->mImage &&
-           videoData->mImage->GetFormat() == ImageFormat::D3D11_YCBCR_IMAGE);
-#endif
       }
     } else if (decoder.HasFatalError()) {
       LOG("Rejecting %s promise: DECODE_ERROR", TrackTypeToStr(aTrack));
       decoder.RejectPromise(decoder.mError.ref(), __func__);
       return;
     } else if (decoder.HasCompletedDrain()) {
       if (decoder.mDemuxEOS) {
         LOG("Rejecting %s promise: EOS", TrackTypeToStr(aTrack));