Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: talk/media/webrtc/webrtcvideoengine2.h

Issue 1327933002: Full impl of NnChannel::SetSendParameters and NnChannel::SetRecvParameters (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/media/webrtc/webrtcvideoengine2.h
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
index f27099bf973f50b52ba2134f6b105aeb24fdafc1..0bb14e7cfd62be8ae981ef3eab599b2e2752575f 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/talk/media/webrtc/webrtcvideoengine2.h
@@ -178,17 +178,15 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
WebRtcVoiceEngine* voice_engine,
WebRtcVoiceMediaChannel* voice_channel,
const VideoOptions& options,
+ const std::vector<VideoCodec>& recv_codecs,
WebRtcVideoEncoderFactory* external_encoder_factory,
WebRtcVideoDecoderFactory* external_decoder_factory);
~WebRtcVideoChannel2();
- bool 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;
@@ -211,15 +209,6 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
void OnRtcpReceived(rtc::Buffer* packet,
const rtc::PacketTime& packet_time) override;
void OnReadyToSend(bool ready) 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;
void SetInterface(NetworkInterface* iface) override;
void UpdateAspectRatio(int ratio_w, int ratio_h) override;
@@ -235,6 +224,16 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
private:
bool MuteStream(uint32 ssrc, bool mute);
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;

Powered by Google App Engine
This is Rietveld 408576698