Bug 1081819 - Handle InMutedCycle() in TrackUnionStream::ProcessInput. r=roc,padenot
☠☠ backed out by 803e783be389 ☠ ☠
authorAndreas Pehrson <pehrsons@gmail.com>
Thu, 05 Mar 2015 12:27:16 +0800
changeset 232394 b78fd38002f50344d6fc3a2fcba1f3a2f784fad9
parent 232393 ff063b9a1ea2ad4a1f232f7320ee56d3afa593b3
child 232395 4a5a4eafd2ce83a096001a4e1546f218d80dd9ad
push id56537
push userrjesup@wgate.com
push dateSat, 07 Mar 2015 15:33:47 +0000
treeherdermozilla-inbound@b78fd38002f5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, padenot
bugs1081819
milestone39.0a1
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
Bug 1081819 - Handle InMutedCycle() in TrackUnionStream::ProcessInput. r=roc,padenot
dom/media/TrackUnionStream.cpp
--- a/dom/media/TrackUnionStream.cpp
+++ b/dom/media/TrackUnionStream.cpp
@@ -267,16 +267,18 @@ TrackUnionStream::TrackUnionStream(DOMMe
 
       StreamTime outputStart = outputTrack->GetEnd();
 
       if (interval.mInputIsBlocked) {
         // Maybe the input track ended?
         segment->AppendNullData(ticks);
         STREAM_LOG(PR_LOG_DEBUG+1, ("TrackUnionStream %p appending %lld ticks of null data to track %d",
                    this, (long long)ticks, outputTrack->GetID()));
+      } else if (InMutedCycle()) {
+        segment->AppendNullData(ticks);
       } else {
         MOZ_ASSERT(outputTrack->GetEnd() == GraphTimeToStreamTime(interval.mStart),
                    "Samples missing");
         StreamTime inputStart = source->GraphTimeToStreamTime(interval.mStart);
         segment->AppendSlice(*aInputTrack->GetSegment(),
                              std::min(inputTrackEndPoint, inputStart),
                              std::min(inputTrackEndPoint, inputEnd));
       }