Implement VideoSendStream::SetCodec().

Removing assertion that SSRC count should be the same as the number of
streams in the codec. It makes sense that you don't always use the same
number of streams under one call. Dropping resolution due to CPU overuse
for instance can require less streams, but the SSRCs should stay
allocated so that operations can resume when not overusing any more.

This change also means we can get rid of the ugly SendStreamState whose
content wasn't defined. Instead we use SetCodec to change resolution
etc. on the fly. Should something else have to be replaced on the fly
then that functionality simply has to be implemented.

BUG=
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/3499005

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5123 4adac7df-926f-26a2-2b94-8c16560cd09d

1 files changed, 2 insertions, 12 deletions

diff --git a/video_send_stream.h b/video_send_stream.h
index af33b7ca..2df282b4 100644
--- a/video_send_stream.h
+++ b/video_send_stream.h
@@ -23,8 +23,6 @@ namespace webrtc {
 
 class VideoEncoder;
 
-struct SendStreamState;
-
 // Class to deliver captured frame to the video send stream.
 class VideoSendStreamInput {
  public:
@@ -81,7 +79,6 @@ class VideoSendStream {
           target_delay_ms(0),
           pacing(false),
           stats_callback(NULL),
-          start_state(NULL),
           auto_mute(false) {}
     VideoCodec codec;
 
@@ -145,9 +142,6 @@ class VideoSendStream {
     // Callback for periodically receiving send stats.
     StatsCallback* stats_callback;
 
-    // Set to resume a previously destroyed send stream.
-    SendStreamState* start_state;
-
     // True if video should be muted when video goes under the minimum video
     // bitrate. Unless muted, video will be sent at a bitrate higher than
     // estimated available.
@@ -161,12 +155,8 @@ class VideoSendStream {
   virtual void StartSend() = 0;
   virtual void StopSend() = 0;
 
-  // TODO(mflodman) Change VideoCodec struct and use here.
-  virtual bool SetTargetBitrate(
-      int min_bitrate, int max_bitrate,
-      const std::vector<SimulcastStream>& streams) = 0;
-
-  virtual void GetSendCodec(VideoCodec* send_codec) = 0;
+  virtual bool SetCodec(const VideoCodec& codec) = 0;
+  virtual VideoCodec GetCodec() = 0;
 
  protected:
   virtual ~VideoSendStream() {}