generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop video capturers in multi-stream test.

Browse Source 
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@5238 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-12-06 15:48:17 +00:00
parent 758db4baea
commit 0f3d0bb601
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/video/call_tests.cc
View File

@ -783,19 +783,26 @@ TEST_F(CallTest, SendsAndReceivesMultipleStreams) {
class VideoOutputObserver : public VideoRenderer { class VideoOutputObserver : public VideoRenderer {
public: public:
VideoOutputObserver(int width, int height) VideoOutputObserver(test::FrameGeneratorCapturer** capturer,
: width_(width), height_(height), done_(EventWrapper::Create()) {} int width,
int height)
: capturer_(capturer),
width_(width),
height_(height),
done_(EventWrapper::Create()) {}
virtual void RenderFrame(const I420VideoFrame& video_frame, virtual void RenderFrame(const I420VideoFrame& video_frame,
int time_to_render_ms) OVERRIDE { int time_to_render_ms) OVERRIDE {
EXPECT_EQ(width_, video_frame.width()); EXPECT_EQ(width_, video_frame.width());
EXPECT_EQ(height_, video_frame.height()); EXPECT_EQ(height_, video_frame.height());
(*capturer_)->Stop();
done_->Set(); done_->Set();
} }
void Wait() { done_->Wait(kDefaultTimeoutMs); } void Wait() { done_->Wait(kDefaultTimeoutMs); }
private: private:
test::FrameGeneratorCapturer** capturer_;
int width_; int width_;
int height_; int height_;
scoped_ptr<EventWrapper> done_; scoped_ptr<EventWrapper> done_;
@ -824,7 +831,7 @@ TEST_F(CallTest, SendsAndReceivesMultipleStreams) {
uint32_t ssrc = codec_settings[i].ssrc; uint32_t ssrc = codec_settings[i].ssrc;
int width = codec_settings[i].width; int width = codec_settings[i].width;
int height = codec_settings[i].height; 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 = VideoReceiveStream::Config receive_config =
receiver_call->GetDefaultReceiveConfig(); receiver_call->GetDefaultReceiveConfig();