Bug 1246310 - Let MediaPipelineReceive tracks start at 0. r=jesup
authorAndreas Pehrson <pehrsons@gmail.com>
Fri, 15 Apr 2016 15:59:31 +0200
changeset 331886 da9b8b7a0263ce4ac6ca83b6fe225dc5ebf39692
parent 331885 34d7c1009ea882388eb2b2cc62f6ac6dbbb3c9b1
child 331887 5743f4601d3f75ee3d77a5a0b4138821b1df7d8b
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1246310
milestone48.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 1246310 - Let MediaPipelineReceive tracks start at 0. r=jesup We create the tracks with a segment lasting from 0 to current time, so there's no need to offset them with the same amount again. MozReview-Commit-ID: DPPgxWM2oeR
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -1796,23 +1796,21 @@ static void AddTrackAndListener(MediaStr
         MOZ_MTLOG(ML_DEBUG, "added track @ " << current_end <<
                   " -> " << mStream->StreamTimeToSeconds(current_end));
       }
 
       // To avoid assertions, we need to insert a dummy segment that covers up
       // to the "start" time for the track
       segment_->AppendNullData(current_ticks);
       if (segment_->GetType() == MediaSegment::AUDIO) {
-        mStream->AsSourceStream()->AddAudioTrack(track_id_, track_rate_,
-                                                 current_ticks,
+        mStream->AsSourceStream()->AddAudioTrack(track_id_, track_rate_, 0,
                                                  static_cast<AudioSegment*>(segment_.forget()));
       } else {
         NS_ASSERTION(mStream->GraphRate() == track_rate_, "Rate mismatch");
-        mStream->AsSourceStream()->AddTrack(track_id_,
-                                            current_ticks, segment_.forget());
+        mStream->AsSourceStream()->AddTrack(track_id_, 0, segment_.forget());
       }
 
       // We need to know how much has been "inserted" because we're given absolute
       // times in NotifyPull.
       completed_->TrackAdded(current_ticks);
     }
    private:
     TrackID track_id_;