commit be9d2a45499d87f3b04e644fc173b0d997a9eeea
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jun 30 13:19:09 2014
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jun 30 13:19:09 2014
tree 33cc28dd7ba297d371bfd6dbebf4541535035f0b
parent cd9b90ab539859034f0ffcac63b65e5939fb883e

Reserve RTP/RTCP modules in SetSSRC.

Allows setting SSRCs for future simulcast layers even though no set send
codec uses them.

Also re-enabling CanSwitchToUseAllSsrcs as an end-to-end test, required
for bitrate ramp-up, instead of send-side only (resolving issue 3078).
This test was used to verify reserved modules' SSRCs are preserved
correctly.

To enable a multiple-stream end-to-end test test::CallTest was modified
to work on a vector of receive streams instead of just one.

BUG=3078
R=kjellander@webrtc.org, stefan@webrtc.org

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

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

webrtc/test/call_test.h

diff --git a/webrtc/test/call_test.h b/webrtc/test/call_test.h
index 94ac2fa..37a883d 100644
--- a/webrtc/test/call_test.h
+++ b/webrtc/test/call_test.h
@@ -64,8 +64,8 @@
   VideoSendStream* send_stream_;
 
   scoped_ptr<Call> receiver_call_;
-  VideoReceiveStream::Config receive_config_;
-  VideoReceiveStream* receive_stream_;
+  std::vector<VideoReceiveStream::Config> receive_configs_;
+  std::vector<VideoReceiveStream*> receive_streams_;
 
   scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_;
   test::FakeEncoder fake_encoder_;
@@ -87,11 +87,13 @@
   virtual Call::Config GetReceiverCallConfig();
   virtual void OnCallsCreated(Call* sender_call, Call* receiver_call);
 
-  virtual void ModifyConfigs(VideoSendStream::Config* send_config,
-                             VideoReceiveStream::Config* receive_config,
-                             std::vector<VideoStream>* video_streams);
-  virtual void OnStreamsCreated(VideoSendStream* send_stream,
-                                VideoReceiveStream* receive_stream);
+  virtual void ModifyConfigs(
+      VideoSendStream::Config* send_config,
+      std::vector<VideoReceiveStream::Config>* receive_configs,
+      std::vector<VideoStream>* video_streams);
+  virtual void OnStreamsCreated(
+      VideoSendStream* send_stream,
+      const std::vector<VideoReceiveStream*>& receive_streams);
 
   virtual void OnFrameGeneratorCapturerCreated(
       FrameGeneratorCapturer* frame_generator_capturer);