Bug 1446929 - Support audio files in media Benchmark class. r?jya draft
authorChristian Holler <choller@mozilla.com>
Tue, 27 Mar 2018 14:07:12 +0200
changeset 773142 ea61d0b6de5e918a158967fe93b7785278f9ea3c
parent 773108 267a6fa83b7346da511e107fb2c7b426c956dfba
push id104137
push usercholler@mozilla.com
push dateTue, 27 Mar 2018 12:08:14 +0000
reviewersjya
bugs1446929
milestone61.0a1
Bug 1446929 - Support audio files in media Benchmark class. r?jya MozReview-Commit-ID: 3EWNM1F4loN
dom/media/Benchmark.cpp
--- a/dom/media/Benchmark.cpp
+++ b/dom/media/Benchmark.cpp
@@ -171,18 +171,23 @@ BenchmarkPlayback::DemuxSamples()
 {
   MOZ_ASSERT(OnThread());
 
   RefPtr<Benchmark> ref(mMainThreadState);
   mDemuxer->Init()->Then(
     Thread(), __func__,
     [this, ref](nsresult aResult) {
       MOZ_ASSERT(OnThread());
-      mTrackDemuxer =
-        mDemuxer->GetTrackDemuxer(TrackInfo::kVideoTrack, 0);
+      if (mDemuxer->GetNumberTracks(TrackInfo::kVideoTrack)) {
+        mTrackDemuxer =
+          mDemuxer->GetTrackDemuxer(TrackInfo::kVideoTrack, 0);
+      } else if (mDemuxer->GetNumberTracks(TrackInfo::kAudioTrack)) {
+        mTrackDemuxer =
+          mDemuxer->GetTrackDemuxer(TrackInfo::kAudioTrack, 0);
+      }
       if (!mTrackDemuxer) {
         MainThreadShutdown();
         return;
       }
       DemuxNextSample();
     },
     [this, ref](const MediaResult& aError) { MainThreadShutdown(); });
 }