| Index: talk/media/webrtc/webrtcvideoengine2.h
|
| diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
|
| index 7096135cdd5bd33992a6cce5eece031165145802..17f56c4f9e12bf0ddd4c09c7a32bec672a3742ca 100644
|
| --- a/talk/media/webrtc/webrtcvideoengine2.h
|
| +++ b/talk/media/webrtc/webrtcvideoengine2.h
|
| @@ -251,13 +251,17 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
|
| const VideoOptions& options,
|
| int max_bitrate_bps,
|
| const Settable<VideoCodecSettings>& codec_settings,
|
| - const std::vector<webrtc::RtpExtension>& rtp_extensions);
|
| + const std::vector<webrtc::RtpExtension>& rtp_extensions,
|
| + const VideoSendParameters& send_params);
|
| ~WebRtcVideoSendStream();
|
|
|
| void SetOptions(const VideoOptions& options);
|
| void SetCodec(const VideoCodecSettings& codec);
|
| void SetRtpExtensions(
|
| const std::vector<webrtc::RtpExtension>& rtp_extensions);
|
| + // TODO(pbos): Move logic from SetCodec/SetRtpExtensions/etc.
|
| + // into this method. Currently this method only sets the RTCP mode.
|
| + void SetSendParameters(const VideoSendParameters& send_params);
|
|
|
| void InputFrame(VideoCapturer* capturer, const VideoFrame* frame);
|
| bool SetCapturer(VideoCapturer* capturer);
|
| @@ -404,6 +408,9 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
|
| void SetNackAndRemb(bool nack_enabled, bool remb_enabled);
|
| void SetRecvCodecs(const std::vector<VideoCodecSettings>& recv_codecs);
|
| void SetRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
|
| + // TODO(pbos): Move logic from SetRecvCodecs/SetRtpExtensions/etc.
|
| + // into this method. Currently this method only sets the RTCP mode.
|
| + void SetRecvParameters(const VideoRecvParameters& recv_params);
|
|
|
| void RenderFrame(const webrtc::VideoFrame& frame,
|
| int time_to_render_ms) override;
|
| @@ -521,6 +528,10 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
|
| std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
|
| webrtc::Call::Config::BitrateConfig bitrate_config_;
|
| VideoOptions options_;
|
| + // TODO(pbos): Don't duplicate information between
|
| + // send_params/recv_params, rtp_extensions, options, etc.
|
| + VideoSendParameters send_params_;
|
| + VideoRecvParameters recv_params_;
|
| };
|
|
|
| } // namespace cricket
|
|
|