| Index: talk/app/webrtc/mediastreamhandler.h
|
| diff --git a/talk/app/webrtc/mediastreamhandler.h b/talk/app/webrtc/mediastreamhandler.h
|
| index f79eff367a8de5b2e09c83759b1c367b0a10ec57..801648dc047bf11720c4460cc7d8f6a6824fd425 100644
|
| --- a/talk/app/webrtc/mediastreamhandler.h
|
| +++ b/talk/app/webrtc/mediastreamhandler.h
|
| @@ -51,8 +51,6 @@
|
| TrackHandler(MediaStreamTrackInterface* track, uint32 ssrc);
|
| virtual ~TrackHandler();
|
| virtual void OnChanged();
|
| - // Associate |track_| with |ssrc_|. Can be called multiple times.
|
| - virtual void Start() = 0;
|
| // Stop using |track_| on this PeerConnection.
|
| virtual void Stop() = 0;
|
|
|
| @@ -103,7 +101,7 @@
|
| uint32 ssrc,
|
| AudioProviderInterface* provider);
|
| virtual ~LocalAudioTrackHandler();
|
| - void Start() override;
|
| +
|
| void Stop() override;
|
|
|
| protected:
|
| @@ -129,7 +127,6 @@
|
| uint32 ssrc,
|
| AudioProviderInterface* provider);
|
| virtual ~RemoteAudioTrackHandler();
|
| - void Start() override;
|
| void Stop() override;
|
|
|
| protected:
|
| @@ -153,7 +150,6 @@
|
| uint32 ssrc,
|
| VideoProviderInterface* provider);
|
| virtual ~LocalVideoTrackHandler();
|
| - void Start() override;
|
| void Stop() override;
|
|
|
| protected:
|
| @@ -174,7 +170,6 @@
|
| uint32 ssrc,
|
| VideoProviderInterface* provider);
|
| virtual ~RemoteVideoTrackHandler();
|
| - void Start() override;
|
| void Stop() override;
|
|
|
| protected:
|
| @@ -197,7 +192,6 @@
|
|
|
| virtual void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) = 0;
|
| virtual void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) = 0;
|
| - virtual void RestartAllTracks() = 0;
|
|
|
| virtual void RemoveTrack(MediaStreamTrackInterface* track);
|
| void OnChanged() override;
|
| @@ -220,7 +214,6 @@
|
|
|
| void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) override;
|
| void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) override;
|
| - void RestartAllTracks() override;
|
| };
|
|
|
| class RemoteMediaStreamHandler : public MediaStreamHandler {
|
| @@ -231,7 +224,6 @@
|
| ~RemoteMediaStreamHandler();
|
| void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) override;
|
| void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) override;
|
| - void RestartAllTracks() override;
|
| };
|
|
|
| // Container for MediaStreamHandlers of currently known local and remote
|
| @@ -264,10 +256,6 @@
|
| void RemoveRemoteTrack(MediaStreamInterface* stream,
|
| MediaStreamTrackInterface* track);
|
|
|
| - // Make all remote track handlers reassociate their corresponding tracks
|
| - // with their corresponding SSRCs.
|
| - void RestartAllRemoteTracks();
|
| -
|
| // Remove all TrackHandlers for tracks in |stream| and make sure
|
| // the audio_provider and video_provider is notified that the tracks has been
|
| // removed.
|
| @@ -285,10 +273,6 @@
|
| void RemoveLocalTrack(MediaStreamInterface* stream,
|
| MediaStreamTrackInterface* track);
|
|
|
| - // Make all local track handlers reassociate their corresponding tracks
|
| - // with their corresponding SSRCs.
|
| - void RestartAllLocalTracks();
|
| -
|
| private:
|
| typedef std::list<MediaStreamHandler*> StreamHandlerList;
|
| MediaStreamHandler* FindStreamHandler(const StreamHandlerList& handlers,
|
|
|