| Index: webrtc/media/engine/fakewebrtccall.h
|
| diff --git a/webrtc/media/engine/fakewebrtccall.h b/webrtc/media/engine/fakewebrtccall.h
|
| index d3af222489f60c4cd58fcf3883333b0d92769fb1..29142c18b777f3c6d3816cd8e22dc6bde8cf50e4 100644
|
| --- a/webrtc/media/engine/fakewebrtccall.h
|
| +++ b/webrtc/media/engine/fakewebrtccall.h
|
| @@ -99,11 +99,13 @@ class FakeAudioReceiveStream final : public webrtc::AudioReceiveStream {
|
| bool started_ = false;
|
| };
|
|
|
| -class FakeVideoSendStream final : public webrtc::VideoSendStream,
|
| - public webrtc::VideoCaptureInput {
|
| +class FakeVideoSendStream final
|
| + : public webrtc::VideoSendStream,
|
| + public rtc::VideoSinkInterface<webrtc::VideoFrame> {
|
| public:
|
| FakeVideoSendStream(webrtc::VideoSendStream::Config config,
|
| webrtc::VideoEncoderConfig encoder_config);
|
| + ~FakeVideoSendStream() override;
|
| const webrtc::VideoSendStream::Config& GetConfig() const;
|
| const webrtc::VideoEncoderConfig& GetEncoderConfig() const;
|
| std::vector<webrtc::VideoStream> GetVideoStreams();
|
| @@ -122,14 +124,16 @@ class FakeVideoSendStream final : public webrtc::VideoSendStream,
|
| }
|
|
|
| private:
|
| - void IncomingCapturedFrame(const webrtc::VideoFrame& frame) override;
|
| + // rtc::VideoSinkInterface<VideoFrame> implementation.
|
| + void OnFrame(const webrtc::VideoFrame& frame) override;
|
|
|
| // webrtc::VideoSendStream implementation.
|
| void Start() override;
|
| void Stop() override;
|
| + void SetSource(
|
| + rtc::VideoSourceInterface<webrtc::VideoFrame>* source) override;
|
| webrtc::VideoSendStream::Stats GetStats() override;
|
| void ReconfigureVideoEncoder(webrtc::VideoEncoderConfig config) override;
|
| - webrtc::VideoCaptureInput* Input() override;
|
|
|
| bool sending_;
|
| webrtc::VideoSendStream::Config config_;
|
| @@ -139,6 +143,7 @@ class FakeVideoSendStream final : public webrtc::VideoSendStream,
|
| webrtc::VideoCodecVP8 vp8;
|
| webrtc::VideoCodecVP9 vp9;
|
| } vpx_settings_;
|
| + rtc::VideoSourceInterface<webrtc::VideoFrame>* source_;
|
| int num_swapped_frames_;
|
| webrtc::VideoFrame last_frame_;
|
| webrtc::VideoSendStream::Stats stats_;
|
|
|