| Index: webrtc/media/engine/webrtcvideoengine2.h
|
| diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
|
| index 91a92bff5fc5a16ecbd8e92aa6d5addbeddb6bed..abbe0d5b0832eb4ce434cea2aa0695dacb33b6e6 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine2.h
|
| +++ b/webrtc/media/engine/webrtcvideoengine2.h
|
| @@ -201,7 +201,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
|
| // These optionals are unset if not changed.
|
| rtc::Optional<std::vector<VideoCodecSettings>> codec_settings;
|
| rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions;
|
| - rtc::Optional<webrtc::RtcpMode> rtcp_mode;
|
| };
|
|
|
| bool GetChangedSendParameters(const VideoSendParameters& params,
|
| @@ -392,7 +391,8 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
|
| void SetLocalSsrc(uint32_t local_ssrc);
|
| void SetFeedbackParameters(bool nack_enabled,
|
| bool remb_enabled,
|
| - bool transport_cc_enabled);
|
| + bool transport_cc_enabled,
|
| + webrtc::RtcpMode rtcp_mode);
|
| void SetRecvParameters(const ChangedRecvParameters& recv_params);
|
|
|
| void RenderFrame(const webrtc::VideoFrame& frame,
|
|
|