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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.h

Issue 1311533009: - Rename VoiceChannel::MuteStream() -> SetAudioSend() (incl. media channel) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@lj_remove_typingmonitor_files
Patch Set: typo in comment 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 unified diff | Download patch
« no previous file with comments | « talk/media/base/videoengine_unittest.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 // VideoMediaChannel implementation 186 // VideoMediaChannel implementation
187 void DetachVoiceChannel() override; 187 void DetachVoiceChannel() override;
188 bool SetSendParameters(const VideoSendParameters& params) override; 188 bool SetSendParameters(const VideoSendParameters& params) override;
189 bool SetRecvParameters(const VideoRecvParameters& params) override; 189 bool SetRecvParameters(const VideoRecvParameters& params) override;
190 bool SetRecvCodecs(const std::vector<VideoCodec>& codecs) override; 190 bool SetRecvCodecs(const std::vector<VideoCodec>& codecs) override;
191 bool SetSendCodecs(const std::vector<VideoCodec>& codecs) override; 191 bool SetSendCodecs(const std::vector<VideoCodec>& codecs) override;
192 bool GetSendCodec(VideoCodec* send_codec) override; 192 bool GetSendCodec(VideoCodec* send_codec) override;
193 bool SetSendStreamFormat(uint32 ssrc, const VideoFormat& format) override; 193 bool SetSendStreamFormat(uint32 ssrc, const VideoFormat& format) override;
194 bool SetRender(bool render) override; 194 bool SetRender(bool render) override;
195 bool SetSend(bool send) override; 195 bool SetSend(bool send) override;
196 196 bool SetVideoSend(uint32 ssrc, bool mute,
197 const VideoOptions* options) override;
197 bool AddSendStream(const StreamParams& sp) override; 198 bool AddSendStream(const StreamParams& sp) override;
198 bool RemoveSendStream(uint32 ssrc) override; 199 bool RemoveSendStream(uint32 ssrc) override;
199 bool AddRecvStream(const StreamParams& sp) override; 200 bool AddRecvStream(const StreamParams& sp) override;
200 bool AddRecvStream(const StreamParams& sp, bool default_stream); 201 bool AddRecvStream(const StreamParams& sp, bool default_stream);
201 bool RemoveRecvStream(uint32 ssrc) override; 202 bool RemoveRecvStream(uint32 ssrc) override;
202 bool SetRenderer(uint32 ssrc, VideoRenderer* renderer) override; 203 bool SetRenderer(uint32 ssrc, VideoRenderer* renderer) override;
203 bool GetStats(VideoMediaInfo* info) override; 204 bool GetStats(VideoMediaInfo* info) override;
204 bool SetCapturer(uint32 ssrc, VideoCapturer* capturer) override; 205 bool SetCapturer(uint32 ssrc, VideoCapturer* capturer) override;
205 bool SendIntraFrame() override; 206 bool SendIntraFrame() override;
206 bool RequestIntraFrame() override; 207 bool RequestIntraFrame() override;
207 208
208 void OnPacketReceived(rtc::Buffer* packet, 209 void OnPacketReceived(rtc::Buffer* packet,
209 const rtc::PacketTime& packet_time) override; 210 const rtc::PacketTime& packet_time) override;
210 void OnRtcpReceived(rtc::Buffer* packet, 211 void OnRtcpReceived(rtc::Buffer* packet,
211 const rtc::PacketTime& packet_time) override; 212 const rtc::PacketTime& packet_time) override;
212 void OnReadyToSend(bool ready) override; 213 void OnReadyToSend(bool ready) override;
213 bool MuteStream(uint32 ssrc, bool mute) override;
214 214
215 // Set send/receive RTP header extensions. This must be done before creating 215 // Set send/receive RTP header extensions. This must be done before creating
216 // streams as it only has effect on future streams. 216 // streams as it only has effect on future streams.
217 bool SetRecvRtpHeaderExtensions( 217 bool SetRecvRtpHeaderExtensions(
218 const std::vector<RtpHeaderExtension>& extensions) override; 218 const std::vector<RtpHeaderExtension>& extensions) override;
219 bool SetSendRtpHeaderExtensions( 219 bool SetSendRtpHeaderExtensions(
220 const std::vector<RtpHeaderExtension>& extensions) override; 220 const std::vector<RtpHeaderExtension>& extensions) override;
221 bool SetMaxSendBandwidth(int bps) override; 221 bool SetMaxSendBandwidth(int bps) override;
222 bool SetOptions(const VideoOptions& options) override; 222 bool SetOptions(const VideoOptions& options) override;
223 void SetInterface(NetworkInterface* iface) override; 223 void SetInterface(NetworkInterface* iface) override;
224 void UpdateAspectRatio(int ratio_w, int ratio_h) override; 224 void UpdateAspectRatio(int ratio_w, int ratio_h) override;
225 225
226 void OnMessage(rtc::Message* msg) override; 226 void OnMessage(rtc::Message* msg) override;
227 227
228 void OnLoadUpdate(Load load) override; 228 void OnLoadUpdate(Load load) override;
229 229
230 // Implemented for VideoMediaChannelTest. 230 // Implemented for VideoMediaChannelTest.
231 bool sending() const { return sending_; } 231 bool sending() const { return sending_; }
232 uint32 GetDefaultSendChannelSsrc() { return default_send_ssrc_; } 232 uint32 GetDefaultSendChannelSsrc() { return default_send_ssrc_; }
233 bool GetRenderer(uint32 ssrc, VideoRenderer** renderer); 233 bool GetRenderer(uint32 ssrc, VideoRenderer** renderer);
234 234
235 private: 235 private:
236 bool MuteStream(uint32 ssrc, bool mute);
236 class WebRtcVideoReceiveStream; 237 class WebRtcVideoReceiveStream;
237 void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config, 238 void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config,
238 const StreamParams& sp) const; 239 const StreamParams& sp) const;
239 bool CodecIsExternallySupported(const std::string& name) const; 240 bool CodecIsExternallySupported(const std::string& name) const;
240 bool ValidateSendSsrcAvailability(const StreamParams& sp) const 241 bool ValidateSendSsrcAvailability(const StreamParams& sp) const
241 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); 242 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_);
242 bool ValidateReceiveSsrcAvailability(const StreamParams& sp) const 243 bool ValidateReceiveSsrcAvailability(const StreamParams& sp) const
243 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); 244 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_);
244 void DeleteReceiveStream(WebRtcVideoReceiveStream* stream) 245 void DeleteReceiveStream(WebRtcVideoReceiveStream* stream)
245 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); 246 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_);
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 WebRtcVideoDecoderFactory* const external_decoder_factory_; 540 WebRtcVideoDecoderFactory* const external_decoder_factory_;
540 std::vector<VideoCodecSettings> recv_codecs_; 541 std::vector<VideoCodecSettings> recv_codecs_;
541 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 542 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
542 webrtc::Call::Config::BitrateConfig bitrate_config_; 543 webrtc::Call::Config::BitrateConfig bitrate_config_;
543 VideoOptions options_; 544 VideoOptions options_;
544 }; 545 };
545 546
546 } // namespace cricket 547 } // namespace cricket
547 548
548 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 549 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « talk/media/base/videoengine_unittest.h ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698