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

Side by Side Diff: webrtc/pc/channel.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: Adding a TODO and returning a const pointer. 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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 const std::string& content_name, 329 const std::string& content_name,
330 bool rtcp); 330 bool rtcp);
331 ~VoiceChannel(); 331 ~VoiceChannel();
332 bool Init(); 332 bool Init();
333 333
334 // Configure sending media on the stream with SSRC |ssrc| 334 // Configure sending media on the stream with SSRC |ssrc|
335 // If there is only one sending stream SSRC 0 can be used. 335 // If there is only one sending stream SSRC 0 can be used.
336 bool SetAudioSend(uint32_t ssrc, 336 bool SetAudioSend(uint32_t ssrc,
337 bool enable, 337 bool enable,
338 const AudioOptions* options, 338 const AudioOptions* options,
339 AudioRenderer* renderer); 339 AudioSource* source);
340 340
341 // downcasts a MediaChannel 341 // downcasts a MediaChannel
342 virtual VoiceMediaChannel* media_channel() const { 342 virtual VoiceMediaChannel* media_channel() const {
343 return static_cast<VoiceMediaChannel*>(BaseChannel::media_channel()); 343 return static_cast<VoiceMediaChannel*>(BaseChannel::media_channel());
344 } 344 }
345 345
346 void SetEarlyMedia(bool enable); 346 void SetEarlyMedia(bool enable);
347 // This signal is emitted when we have gone a period of time without 347 // This signal is emitted when we have gone a period of time without
348 // receiving early media. When received, a UI should start playing its 348 // receiving early media. When received, a UI should start playing its
349 // own ringing sound 349 // own ringing sound
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 // SetSendParameters. 620 // SetSendParameters.
621 DataSendParameters last_send_params_; 621 DataSendParameters last_send_params_;
622 // Last DataRecvParameters sent down to the media_channel() via 622 // Last DataRecvParameters sent down to the media_channel() via
623 // SetRecvParameters. 623 // SetRecvParameters.
624 DataRecvParameters last_recv_params_; 624 DataRecvParameters last_recv_params_;
625 }; 625 };
626 626
627 } // namespace cricket 627 } // namespace cricket
628 628
629 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 629 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698