Bug 1175059: P3. Remove appendMode test assertion. r=kentuckyfriedtakahe
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 17 Jun 2015 19:41:35 +1000
changeset 267826 e261480f419270f7fd77f386a4b474f9617e3cbe
parent 267825 71e4b579b2ca07ebe98b6546b64165a8dbb6d489
child 267827 24a1a6c8cb855289ca4d5e4136218c3021063445
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-esr52@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskentuckyfriedtakahe
bugs1175059
milestone41.0a1
Bug 1175059: P3. Remove appendMode test assertion. r=kentuckyfriedtakahe SourceBuffer segment mode is now supported.
dom/media/mediasource/SourceBuffer.cpp
--- a/dom/media/mediasource/SourceBuffer.cpp
+++ b/dom/media/mediasource/SourceBuffer.cpp
@@ -436,17 +436,17 @@ SourceBuffer::AppendData(const uint8_t* 
   nsRefPtr<MediaByteBuffer> data = PrepareAppend(aData, aLength, aRv);
   if (!data) {
     return;
   }
   mContentManager->AppendData(data, mTimestampOffset);
 
   StartUpdating();
 
-  MOZ_ASSERT(mAppendMode == SourceBufferAppendMode::Segments,
+  MOZ_ASSERT(mIsUsingFormatReader || mAppendMode == SourceBufferAppendMode::Segments,
              "We don't handle timestampOffset for sequence mode yet");
   nsCOMPtr<nsIRunnable> task = new BufferAppendRunnable(this, mUpdateID);
   NS_DispatchToMainThread(task);
 }
 
 void
 SourceBuffer::BufferAppend(uint32_t aUpdateID)
 {