Fixing camera capture for video_loopback

webrtc/video/video_quality_test.h

 /*
  *  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.
  */
 #ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
@@ skipping 49 matching lines @@
 
   VideoQualityTest();
   void RunWithAnalyzer(const Params& params);
   void RunWithVideoRenderer(const Params& params);
 
  protected:
   // No-op implementation to be able to instantiate this class from non-TEST_F
   // locations.
   void TestBody() override;
 
+  // Own variants that use capturer_ instead of frame_generator_capturer_.

[pbos-webrtc, 2015/09/21 16:09:10]

Should frame_generator_capturer_ in test::CallTest just be a
webrtc::VideoCapturer? Or do we not have access to start/stop there?

[ivica, 2015/09/21 16:17:53]

There is some code that uses CallTest and assumes capturer is
FrameGeneratorCapturer, so I cannot just change CallTest.

+  void Start();

[pbos-webrtc, 2015/09/21 16:09:10]

Are these overriding anything? Where are they called?

[ivica, 2015/09/21 16:17:53]

CallTest has Start(), Stop(), but non-virtual.
They are called in video/video_quality_test.cc in RunWithAnalyzer.
Now when I think of it, I could've had just copied that directly into the
RunwithAnalyzer, without introducing Start and Stop.
RunWithRenderer anyway has its own code to start and stop the call.

+  void Stop();
+
   void CreateCapturer(const Params& params, VideoCaptureInput* input);
   void ValidateParams(const Params& params);
   void SetupFullStack(const Params& params,
                       newapi::Transport* send_transport,
                       newapi::Transport* recv_transport);
   void SetupScreenshare(const Params& params);
 
+  // We need a more general capturer than the FrameGeneratorCapturer.
+  rtc::scoped_ptr<test::VideoCapturer> capturer_;
   rtc::scoped_ptr<test::TraceToStderr> trace_to_stderr_;
   rtc::scoped_ptr<test::FrameGenerator> frame_generator_;
   rtc::scoped_ptr<VideoEncoder> encoder_;
   VideoCodecUnion codec_settings_;
   Clock* const clock_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_