| Index: webrtc/media/engine/webrtcvideoengine2.h
|
| diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
|
| index 794b313da5d6f9180334e0ea5b55bfe41d64d0e0..b5e4ce032f5b9f50f3aa71523dab33b666340f1e 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine2.h
|
| +++ b/webrtc/media/engine/webrtcvideoengine2.h
|
| @@ -243,6 +243,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
|
| // frames are then converted from cricket frames to webrtc frames.
|
| class WebRtcVideoSendStream
|
| : public rtc::VideoSinkInterface<cricket::VideoFrame>,
|
| + public rtc::VideoSourceInterface<webrtc::VideoFrame>,
|
| public webrtc::LoadObserver {
|
| public:
|
| WebRtcVideoSendStream(
|
| @@ -262,6 +263,11 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
|
| bool SetRtpParameters(const webrtc::RtpParameters& parameters);
|
| webrtc::RtpParameters GetRtpParameters() const;
|
|
|
| + // Implements rtc::VideoSourceInterface<webrtc::VideoFrame>
|
| + void AddOrUpdateSink(VideoSinkInterface<webrtc::VideoFrame>* sink,
|
| + const rtc::VideoSinkWants& wants) override;
|
| + void RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) override;
|
| +
|
| void OnFrame(const cricket::VideoFrame& frame) override;
|
| bool SetVideoSend(bool mute,
|
| const VideoOptions* options,
|
| @@ -383,6 +389,8 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
|
|
|
| rtc::CriticalSection lock_;
|
| webrtc::VideoSendStream* stream_ GUARDED_BY(lock_);
|
| + rtc::VideoSinkInterface<webrtc::VideoFrame>* encoder_sink_
|
| + GUARDED_BY(lock_);
|
| // Contains settings that are the same for all streams in the MediaChannel,
|
| // such as codecs, header extensions, and the global bitrate limit for the
|
| // entire channel.
|
|
|