Fixing scenario where track is rejected and later un-rejected.

talk/app/webrtc/mediastreamhandler.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 33 matching lines @@
 
 namespace webrtc {
 
 // TrackHandler listen to events on a MediaStreamTrackInterface that is
 // connected to a certain PeerConnection.
 class TrackHandler : public ObserverInterface {
  public:
   TrackHandler(MediaStreamTrackInterface* track, uint32 ssrc);
   virtual ~TrackHandler();
   virtual void OnChanged();
+  // Associate |track_| with |_ssrc|. Can be called multiple times.

[pthatcher1, 2015/07/08 20:45:31]

ssrc_

[Taylor Brandstetter, 2015/07/08 23:04:03]

Fixed

+  virtual void Start() = 0;
   // Stop using |track_| on this PeerConnection.
   virtual void Stop() = 0;
 
   MediaStreamTrackInterface*  track() { return track_; }
   uint32 ssrc() const { return ssrc_; }
 
  protected:
   virtual void OnStateChanged() = 0;
   virtual void OnEnabledChanged() = 0;
 
@@ skipping 30 matching lines @@
 
 // LocalAudioTrackHandler listen to events on a local AudioTrack instance
 // connected to a PeerConnection and orders the |provider| to executes the
 // requested change.
 class LocalAudioTrackHandler : public TrackHandler {
  public:
   LocalAudioTrackHandler(AudioTrackInterface* track,
                          uint32 ssrc,
                          AudioProviderInterface* provider);
   virtual ~LocalAudioTrackHandler();
-
+  void Start() override;
   void Stop() override;
 
  protected:
   void OnStateChanged() override;
   void OnEnabledChanged() override;
 
  private:
   AudioTrackInterface* audio_track_;
   AudioProviderInterface* provider_;
 
   // Used to pass the data callback from the |audio_track_| to the other
   // end of cricket::AudioRenderer.
   rtc::scoped_ptr<LocalAudioSinkAdapter> sink_adapter_;
 };
 
 // RemoteAudioTrackHandler listen to events on a remote AudioTrack instance
 // connected to a PeerConnection and orders the |provider| to executes the
 // requested change.
 class RemoteAudioTrackHandler : public AudioSourceInterface::AudioObserver,
                                 public TrackHandler {
  public:
   RemoteAudioTrackHandler(AudioTrackInterface* track,
                           uint32 ssrc,
                           AudioProviderInterface* provider);
   virtual ~RemoteAudioTrackHandler();
+  void Start() override;
   void Stop() override;
 
  protected:
   void OnStateChanged() override;
   void OnEnabledChanged() override;
 
  private:
   // AudioSourceInterface::AudioObserver implementation.
   void OnSetVolume(double volume) override;
 
   AudioTrackInterface* audio_track_;
   AudioProviderInterface* provider_;
 };
 
 // LocalVideoTrackHandler listen to events on a local VideoTrack instance
 // connected to a PeerConnection and orders the |provider| to executes the
 // requested change.
 class LocalVideoTrackHandler : public TrackHandler {
  public:
   LocalVideoTrackHandler(VideoTrackInterface* track,
                          uint32 ssrc,
                          VideoProviderInterface* provider);
   virtual ~LocalVideoTrackHandler();
+  void Start() override;
   void Stop() override;
 
  protected:
   void OnStateChanged() override;
   void OnEnabledChanged() override;
 
  private:
   VideoTrackInterface* local_video_track_;
   VideoProviderInterface* provider_;
 };
 
 // RemoteVideoTrackHandler listen to events on a remote VideoTrack instance
 // connected to a PeerConnection and orders the |provider| to execute
 // requested changes.
 class RemoteVideoTrackHandler : public TrackHandler {
  public:
   RemoteVideoTrackHandler(VideoTrackInterface* track,
                           uint32 ssrc,
                           VideoProviderInterface* provider);
   virtual ~RemoteVideoTrackHandler();
+  void Start() override;
   void Stop() override;
 
  protected:
   void OnStateChanged() override;
   void OnEnabledChanged() override;
 
  private:
   VideoTrackInterface* remote_video_track_;
   VideoProviderInterface* provider_;
 };
 
 class MediaStreamHandler : public ObserverInterface {
  public:
   MediaStreamHandler(MediaStreamInterface* stream,
                      AudioProviderInterface* audio_provider,
                      VideoProviderInterface* video_provider);
   ~MediaStreamHandler();
   MediaStreamInterface* stream();
   void Stop();
 
   virtual void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) = 0;
   virtual void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) = 0;
+  virtual void RestartTracks() = 0;

[pthatcher1, 2015/07/08 20:45:31]

Maybe "RestartAllTracks" to make it doubly clear it's for audio and video.

[Taylor Brandstetter, 2015/07/08 23:04:03]

Done (also changed Restart[Local|Remote]Tracks for consistency)

 
   virtual void RemoveTrack(MediaStreamTrackInterface* track);
   void OnChanged() override;
 
  protected:
   TrackHandler* FindTrackHandler(MediaStreamTrackInterface* track);
   rtc::scoped_refptr<MediaStreamInterface> stream_;
   AudioProviderInterface* audio_provider_;
   VideoProviderInterface* video_provider_;
   typedef std::vector<TrackHandler*> TrackHandlers;
   TrackHandlers track_handlers_;
 };
 
 class LocalMediaStreamHandler : public MediaStreamHandler {
  public:
   LocalMediaStreamHandler(MediaStreamInterface* stream,
                           AudioProviderInterface* audio_provider,
                           VideoProviderInterface* video_provider);
   ~LocalMediaStreamHandler();
 
   void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) override;
   void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) override;
+  void RestartTracks() override;
 };
 
 class RemoteMediaStreamHandler : public MediaStreamHandler {
  public:
   RemoteMediaStreamHandler(MediaStreamInterface* stream,
                            AudioProviderInterface* audio_provider,
                            VideoProviderInterface* video_provider);
   ~RemoteMediaStreamHandler();
   void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) override;
   void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) override;
+  void RestartTracks() override;
 };
 
 // Container for MediaStreamHandlers of currently known local and remote
 // MediaStreams.
 class MediaStreamHandlerContainer {
  public:
   MediaStreamHandlerContainer(AudioProviderInterface* audio_provider,
                               VideoProviderInterface* video_provider);
   ~MediaStreamHandlerContainer();
 
@@ skipping 12 matching lines @@
                            AudioTrackInterface* audio_track,
                            uint32 ssrc);
   // Create a RemoteVideoTrackHandler and associate |video_track| with |ssrc|.
   void AddRemoteVideoTrack(MediaStreamInterface* stream,
                            VideoTrackInterface* video_track,
                            uint32 ssrc);
   // Remove the TrackHandler for |track|.
   void RemoveRemoteTrack(MediaStreamInterface* stream,
                          MediaStreamTrackInterface* track);
 
+  // Make all remote track handlers reassociate their corresponding tracks
+  // with their corresponding SSRCs.
+  void RestartRemoteTracks();
+
   // Remove all TrackHandlers for tracks in |stream| and make sure
   // the audio_provider and video_provider is notified that the tracks has been
   // removed.
   void RemoveLocalStream(MediaStreamInterface* stream);
 
   // Create a LocalAudioTrackHandler and associate |audio_track| with |ssrc|.
   void AddLocalAudioTrack(MediaStreamInterface* stream,
                           AudioTrackInterface* audio_track,
                           uint32 ssrc);
   // Create a LocalVideoTrackHandler and associate |video_track| with |ssrc|.
   void AddLocalVideoTrack(MediaStreamInterface* stream,
                           VideoTrackInterface* video_track,
                           uint32 ssrc);
   // Remove the TrackHandler for |track|.
   void RemoveLocalTrack(MediaStreamInterface* stream,
                         MediaStreamTrackInterface* track);
 
+  // Make all local track handlers reassociate their corresponding tracks
+  // with their corresponding SSRCs.
+  void RestartLocalTracks();
+
  private:
   typedef std::list<MediaStreamHandler*> StreamHandlerList;
   MediaStreamHandler* FindStreamHandler(const StreamHandlerList& handlers,
                                         MediaStreamInterface* stream);
   MediaStreamHandler* CreateRemoteStreamHandler(MediaStreamInterface* stream);
   MediaStreamHandler* CreateLocalStreamHandler(MediaStreamInterface* stream);
   void DeleteStreamHandler(StreamHandlerList* streamhandlers,
                            MediaStreamInterface* stream);
 
   StreamHandlerList local_streams_handlers_;
   StreamHandlerList remote_streams_handlers_;
   AudioProviderInterface* audio_provider_;
   VideoProviderInterface* video_provider_;
 };
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_MEDIASTREAMHANDLER_H_