Index: talk/media/webrtc/webrtcvideoengine2.h |
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h |
index c7c8bc0cf55b33272d4a9cd435bb41008dcc79cb..d65396d71a10b7e08ed5817dadf6f2e3048ad611 100644 |
--- a/talk/media/webrtc/webrtcvideoengine2.h |
+++ b/talk/media/webrtc/webrtcvideoengine2.h |
@@ -181,14 +181,12 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler, |
WebRtcVideoEncoderFactory* external_encoder_factory, |
WebRtcVideoDecoderFactory* external_decoder_factory); |
~WebRtcVideoChannel2(); |
- bool Init(); |
+ bool Init(const std::vector<VideoCodec>& recv_codecs); |
pthatcher1
2015/09/04 23:21:16
Why are recv codecs part of Init?
|
// VideoMediaChannel implementation |
void DetachVoiceChannel() override; |
bool SetSendParameters(const VideoSendParameters& params) override; |
bool SetRecvParameters(const VideoRecvParameters& params) override; |
- bool SetRecvCodecs(const std::vector<VideoCodec>& codecs) override; |
- bool SetSendCodecs(const std::vector<VideoCodec>& codecs) override; |
bool GetSendCodec(VideoCodec* send_codec) override; |
bool SetSendStreamFormat(uint32 ssrc, const VideoFormat& format) override; |
bool SetRender(bool render) override; |
@@ -210,16 +208,7 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler, |
void OnRtcpReceived(rtc::Buffer* packet, |
const rtc::PacketTime& packet_time) override; |
void OnReadyToSend(bool ready) override; |
- bool MuteStream(uint32 ssrc, bool mute) override; |
- |
- // Set send/receive RTP header extensions. This must be done before creating |
- // streams as it only has effect on future streams. |
- bool SetRecvRtpHeaderExtensions( |
- const std::vector<RtpHeaderExtension>& extensions) override; |
- bool SetSendRtpHeaderExtensions( |
- const std::vector<RtpHeaderExtension>& extensions) override; |
- bool SetMaxSendBandwidth(int bps) override; |
- bool SetOptions(const VideoOptions& options) override; |
+ bool MuteStream(uint32 ssrc, bool mute, const VideoOptions* options) override; |
bool GetOptions(VideoOptions* options) const override { |
*options = options_; |
return true; |
@@ -238,6 +227,16 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler, |
private: |
class WebRtcVideoReceiveStream; |
+ |
+ bool SetSendCodecs(const std::vector<VideoCodec>& codecs); |
+ bool SetSendRtpHeaderExtensions( |
+ const std::vector<RtpHeaderExtension>& extensions); |
+ bool SetMaxSendBandwidth(int bps); |
+ bool SetOptions(const VideoOptions& options); |
+ bool SetRecvCodecs(const std::vector<VideoCodec>& codecs); |
+ bool SetRecvRtpHeaderExtensions( |
+ const std::vector<RtpHeaderExtension>& extensions); |
+ |
void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config, |
const StreamParams& sp) const; |
bool CodecIsExternallySupported(const std::string& name) const; |