Bug 1247138: [MSE] P1. Allow change of audio format. r?gerald draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Thu, 14 Apr 2016 19:12:44 +1000
changeset 352427 7de5473a85426b96b28b9889eb340d81069aa777
parent 352418 70f7cdd1fc10a84132806798161376fa1e7bd0f5
child 352428 950e50a886e5c56d93631d3e10a113f4ac27e78f
push id15706
push userbmo:jyavenard@mozilla.com
push dateMon, 18 Apr 2016 08:05:30 +0000
reviewersgerald
bugs1247138
milestone48.0a1
Bug 1247138: [MSE] P1. Allow change of audio format. r?gerald MozReview-Commit-ID: 9fktsFVXtdt
dom/media/mediasource/TrackBuffersManager.cpp
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -1089,24 +1089,16 @@ TrackBuffersManager::OnDemuxerInitDone(n
     // This is handled by SourceBuffer once the promise is resolved.
     if (activeTrack) {
       mActiveTrack = true;
     }
 
     // 6. Set first initialization segment received flag to true.
     mFirstInitializationSegmentReceived = true;
   } else {
-    // Check that audio configuration hasn't changed as this is something
-    // we do not support yet (bug 1185827).
-    if (mAudioTracks.mNumTracks &&
-        (info.mAudio.mChannels != mAudioTracks.mInfo->GetAsAudioInfo()->mChannels ||
-         info.mAudio.mRate != mAudioTracks.mInfo->GetAsAudioInfo()->mRate)) {
-      RejectAppend(NS_ERROR_FAILURE, __func__);
-      return;
-    }
     mAudioTracks.mLastInfo = new SharedTrackInfo(info.mAudio, streamID);
     mVideoTracks.mLastInfo = new SharedTrackInfo(info.mVideo, streamID);
   }
 
   UniquePtr<EncryptionInfo> crypto = mInputDemuxer->GetCrypto();
   if (crypto && crypto->IsEncrypted()) {
 #ifdef MOZ_EME
     // Try and dispatch 'encrypted'. Won't go if ready state still HAVE_NOTHING.