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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine.h

Issue 1741933002: Prevent a voice channel from sending data before a renderer is set. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 bool MuteStream(uint32_t ssrc, bool mute); 219 bool MuteStream(uint32_t ssrc, bool mute);
220 220
221 WebRtcVoiceEngine* engine() { return engine_; } 221 WebRtcVoiceEngine* engine() { return engine_; }
222 int GetLastEngineError() { return engine()->GetLastEngineError(); } 222 int GetLastEngineError() { return engine()->GetLastEngineError(); }
223 int GetOutputLevel(int channel); 223 int GetOutputLevel(int channel);
224 bool SetPlayout(int channel, bool playout); 224 bool SetPlayout(int channel, bool playout);
225 void SetNack(int channel, bool nack_enabled); 225 void SetNack(int channel, bool nack_enabled);
226 bool SetSendCodec(int channel, const webrtc::CodecInst& send_codec); 226 bool SetSendCodec(int channel, const webrtc::CodecInst& send_codec);
227 bool ChangePlayout(bool playout); 227 bool ChangePlayout(bool playout);
228 bool ChangeSend(SendFlags send); 228 bool ChangeSend(SendFlags send);
229 bool ChangeSend(int channel, SendFlags send); 229 // Update the send state for the channel associated with |ssrc|,
230 // according to |send| and whether or not the send stream is rendering.
231 bool UpdateChannelSendState(uint32_t ssrc, SendFlags send);
230 int CreateVoEChannel(); 232 int CreateVoEChannel();
231 bool DeleteVoEChannel(int channel); 233 bool DeleteVoEChannel(int channel);
232 bool IsDefaultRecvStream(uint32_t ssrc) { 234 bool IsDefaultRecvStream(uint32_t ssrc) {
233 return default_recv_ssrc_ == static_cast<int64_t>(ssrc); 235 return default_recv_ssrc_ == static_cast<int64_t>(ssrc);
234 } 236 }
235 bool SetSendCodecs(int channel, const std::vector<AudioCodec>& codecs); 237 bool SetSendCodecs(int channel, const std::vector<AudioCodec>& codecs);
236 bool SetSendBitrateInternal(int bps); 238 bool SetSendBitrateInternal(int bps);
237 239
238 rtc::ThreadChecker worker_thread_checker_; 240 rtc::ThreadChecker worker_thread_checker_;
239 241
(...skipping 30 matching lines...) Expand all
270 272
271 class WebRtcAudioReceiveStream; 273 class WebRtcAudioReceiveStream;
272 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_; 274 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_;
273 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 275 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
274 276
275 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); 277 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel);
276 }; 278 };
277 } // namespace cricket 279 } // namespace cricket
278 280
279 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ 281 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvoiceengine.cc » ('j') | webrtc/media/engine/webrtcvoiceengine.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698