commit 4383539b27ae877337679901c1cc9120f3a83fef
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Dec 06 15:48:17 2013
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Dec 06 15:48:17 2013
tree f10a171ae437f4c923db4412ffdb8f7c83671990
parent 539670c2c3fbf8485cc87376739cfd576a69b62f

Stop video capturers in multi-stream test.

Expected to reduce runtime and flakiness in
CallTest.SendsAndReceivesMultipleStreams on linux_memcheck which is
presumed to be due to contention between the threads.

BUG=
R=stefan@webrtc.org

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

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

video/call_tests.cc

diff --git a/video/call_tests.cc b/video/call_tests.cc
index 5649ad6..6c247e6 100644
--- a/video/call_tests.cc
+++ b/video/call_tests.cc
@@ -783,19 +783,26 @@
 
   class VideoOutputObserver : public VideoRenderer {
    public:
-    VideoOutputObserver(int width, int height)
-        : width_(width), height_(height), done_(EventWrapper::Create()) {}
+    VideoOutputObserver(test::FrameGeneratorCapturer** capturer,
+                        int width,
+                        int height)
+        : capturer_(capturer),
+          width_(width),
+          height_(height),
+          done_(EventWrapper::Create()) {}
 
     virtual void RenderFrame(const I420VideoFrame& video_frame,
                              int time_to_render_ms) OVERRIDE {
       EXPECT_EQ(width_, video_frame.width());
       EXPECT_EQ(height_, video_frame.height());
+      (*capturer_)->Stop();
       done_->Set();
     }
 
     void Wait() { done_->Wait(kDefaultTimeoutMs); }
 
    private:
+    test::FrameGeneratorCapturer** capturer_;
     int width_;
     int height_;
     scoped_ptr<EventWrapper> done_;
@@ -824,7 +831,7 @@
     uint32_t ssrc = codec_settings[i].ssrc;
     int width = codec_settings[i].width;
     int height = codec_settings[i].height;
-    observers[i] = new VideoOutputObserver(width, height);
+    observers[i] = new VideoOutputObserver(&frame_generators[i], width, height);
 
     VideoReceiveStream::Config receive_config =
         receiver_call->GetDefaultReceiveConfig();