Bug 1272562 - Don't check audio asserts when seeking video. r?jya draft
authorDan Glastonbury <dglastonbury@mozilla.com>
Fri, 13 May 2016 16:35:43 +1000
changeset 366698 c3d5cf63ebed00f4c279a3d3a49d8278828104f0
parent 366695 74fcb8f55064c67275f77e8d29a8a9d10383db05
child 520834 e83e255213ea0ef95b14b79cd9cc8a4e00be682c
push id18050
push userbmo:dglastonbury@mozilla.com
push dateFri, 13 May 2016 06:39:04 +0000
reviewersjya
bugs1272562
milestone49.0a1
Bug 1272562 - Don't check audio asserts when seeking video. r?jya MozReview-Commit-ID: 8njbfw7ni24
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -1485,20 +1485,20 @@ RefPtr<MediaDecoderReader::SeekPromise>
 MediaFormatReader::Seek(SeekTarget aTarget, int64_t aUnused)
 {
   MOZ_ASSERT(OnTaskQueue());
 
   LOG("aTarget=(%lld)", aTarget.GetTime().ToMicroseconds());
 
   MOZ_DIAGNOSTIC_ASSERT(mSeekPromise.IsEmpty());
   MOZ_DIAGNOSTIC_ASSERT(!mVideo.HasPromise());
-  MOZ_DIAGNOSTIC_ASSERT(!mAudio.HasPromise());
+  MOZ_DIAGNOSTIC_ASSERT(aTarget.IsVideoOnly() || !mAudio.HasPromise());
   MOZ_DIAGNOSTIC_ASSERT(mPendingSeekTime.isNothing());
   MOZ_DIAGNOSTIC_ASSERT(mVideo.mTimeThreshold.isNothing());
-  MOZ_DIAGNOSTIC_ASSERT(mAudio.mTimeThreshold.isNothing());
+  MOZ_DIAGNOSTIC_ASSERT(aTarget.IsVideoOnly() || mAudio.mTimeThreshold.isNothing());
 
   if (!mInfo.mMediaSeekable && !mInfo.mMediaSeekableOnlyInBufferedRanges) {
     LOG("Seek() END (Unseekable)");
     return SeekPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
   }
 
   if (mShutdown) {
     return SeekPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);