Fixing camera capture for video_loopback

webrtc/video/video_quality_test.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include <stdio.h>
@@ skipping 659 matching lines @@
         test::FrameGenerator::CreateScrollingInputFromYuvFiles(
             clock_, slides, kWidth, kHeight, params.common.width,
             params.common.height, params.screenshare.scroll_duration * 1000,
             kPauseDurationMs));
   }
 }
 
 void VideoQualityTest::CreateCapturer(const Params& params,
                                       VideoCaptureInput* input) {
   if (params.screenshare.enabled) {
-    frame_generator_capturer_.reset(new test::FrameGeneratorCapturer(
-        clock_, input, frame_generator_.release(), params.common.fps));
-    EXPECT_TRUE(frame_generator_capturer_->Init());
+    test::FrameGeneratorCapturer *frame_generator_capturer =
+        new test::FrameGeneratorCapturer(
+            clock_, input, frame_generator_.release(), params.common.fps);
+    EXPECT_TRUE(frame_generator_capturer->Init());
+    capturer_.reset(frame_generator_capturer);
   } else {
     if (params.video.clip_name.empty()) {
-      frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
+      capturer_.reset(test::VideoCapturer::Create(
           input, params.common.width, params.common.height, params.common.fps,
           clock_));
-      EXPECT_TRUE(frame_generator_capturer_->Init());
     } else {
-      frame_generator_capturer_.reset(
+    test::FrameGeneratorCapturer *frame_generator_capturer =
           test::FrameGeneratorCapturer::CreateFromYuvFile(
               input, test::ResourcePath(params.video.clip_name, "yuv"),
               params.common.width, params.common.height, params.common.fps,
-              clock_));
-      ASSERT_TRUE(frame_generator_capturer_.get() != nullptr)
+              clock_);
+      ASSERT_TRUE(frame_generator_capturer != nullptr)
           << "Could not create capturer for " << params.video.clip_name
           << ".yuv. Is this resource file present?";
+      capturer_.reset(frame_generator_capturer);

[pbos-webrtc, 2015/09/22 11:26:10]

Just do capturer_.reset(.. above and assert that capturer_.get() != nullptr

[ivica, 2015/09/22 11:35:59]

Done.

     }
   }
 }
 
 void VideoQualityTest::RunWithAnalyzer(const Params& params) {
   // TODO(ivica): Merge with RunWithRenderer and use a flag / argument to
   // differentiate between the analyzer and the renderer case.
   ValidateParams(params);
 
   FILE* graph_data_output_file = nullptr;
@@ skipping 30 matching lines @@
 
   if (params.screenshare.enabled)
     SetupScreenshare(params);
 
   CreateCapturer(params, &analyzer);
 
   CreateStreams();
   analyzer.input_ = send_stream_->Input();
   analyzer.send_stream_ = send_stream_;
 
-  Start();
+  send_stream_->Start();
+  for (size_t i = 0; i < receive_streams_.size(); ++i)
+    receive_streams_[i]->Start();
+  capturer_->Start();
 
   analyzer.Wait();
 
   send_transport.StopSending();
   recv_transport.StopSending();
 
-  Stop();
+  capturer_->Stop();
+  for (size_t i = 0; i < receive_streams_.size(); ++i)
+    receive_streams_[i]->Stop();
+  send_stream_->Stop();
 
   DestroyStreams();
 
   if (graph_data_output_file)
     fclose(graph_data_output_file);
 }
 
 void VideoQualityTest::RunWithVideoRenderer(const Params& params) {
   ValidateParams(params);
 
@@ skipping 26 matching lines @@
     SetupScreenshare(params);
 
   send_stream_ = call->CreateVideoSendStream(send_config_, encoder_config_);
   CreateCapturer(params, send_stream_->Input());
 
   VideoReceiveStream* receive_stream =
       call->CreateVideoReceiveStream(receive_configs_[0]);
 
   receive_stream->Start();
   send_stream_->Start();
-  frame_generator_capturer_->Start();
+  capturer_->Start();
 
   test::PressEnterToContinue();
 
-  frame_generator_capturer_->Stop();
+  capturer_->Stop();
   send_stream_->Stop();
   receive_stream->Stop();
 
   call->DestroyVideoReceiveStream(receive_stream);
   call->DestroyVideoSendStream(send_stream_);
 
   transport.StopSending();
 }
 
 }  // namespace webrtc