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

Side by Side Diff: talk/session/media/channel.h

Issue 1378513003: Change 'mute' parameter of MediaChannel::SetAudioSend()/SetVideoSend() to 'enable'. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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/webrtc/webrtcvoiceengine.cc ('k') | talk/session/media/channel.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 2004 Google Inc. 3 * Copyright 2004 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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 TransportController* transport_controller, 336 TransportController* transport_controller,
337 const std::string& content_name, 337 const std::string& content_name,
338 bool rtcp); 338 bool rtcp);
339 ~VoiceChannel(); 339 ~VoiceChannel();
340 bool Init(); 340 bool Init();
341 bool SetRemoteRenderer(uint32 ssrc, AudioRenderer* renderer); 341 bool SetRemoteRenderer(uint32 ssrc, AudioRenderer* renderer);
342 342
343 // Configure sending media on the stream with SSRC |ssrc| 343 // Configure sending media on the stream with SSRC |ssrc|
344 // If there is only one sending stream SSRC 0 can be used. 344 // If there is only one sending stream SSRC 0 can be used.
345 bool SetAudioSend(uint32 ssrc, 345 bool SetAudioSend(uint32 ssrc,
346 bool mute, 346 bool enable,
347 const AudioOptions* options, 347 const AudioOptions* options,
348 AudioRenderer* renderer); 348 AudioRenderer* renderer);
349 349
350 // downcasts a MediaChannel 350 // downcasts a MediaChannel
351 virtual VoiceMediaChannel* media_channel() const { 351 virtual VoiceMediaChannel* media_channel() const {
352 return static_cast<VoiceMediaChannel*>(BaseChannel::media_channel()); 352 return static_cast<VoiceMediaChannel*>(BaseChannel::media_channel());
353 } 353 }
354 354
355 void SetEarlyMedia(bool enable); 355 void SetEarlyMedia(bool enable);
356 // This signal is emitted when we have gone a period of time without 356 // This signal is emitted when we have gone a period of time without
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor; 479 sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor;
480 sigslot::signal2<uint32, rtc::WindowEvent> SignalScreencastWindowEvent; 480 sigslot::signal2<uint32, rtc::WindowEvent> SignalScreencastWindowEvent;
481 481
482 bool SendIntraFrame(); 482 bool SendIntraFrame();
483 bool RequestIntraFrame(); 483 bool RequestIntraFrame();
484 sigslot::signal3<VideoChannel*, uint32, VideoMediaChannel::Error> 484 sigslot::signal3<VideoChannel*, uint32, VideoMediaChannel::Error>
485 SignalMediaError; 485 SignalMediaError;
486 486
487 // Configure sending media on the stream with SSRC |ssrc| 487 // Configure sending media on the stream with SSRC |ssrc|
488 // If there is only one sending stream SSRC 0 can be used. 488 // If there is only one sending stream SSRC 0 can be used.
489 bool SetVideoSend(uint32 ssrc, bool mute, const VideoOptions* options); 489 bool SetVideoSend(uint32 ssrc, bool enable, const VideoOptions* options);
490 490
491 private: 491 private:
492 typedef std::map<uint32, VideoCapturer*> ScreencastMap; 492 typedef std::map<uint32, VideoCapturer*> ScreencastMap;
493 struct ScreencastDetailsData; 493 struct ScreencastDetailsData;
494 494
495 // overrides from BaseChannel 495 // overrides from BaseChannel
496 virtual void ChangeState(); 496 virtual void ChangeState();
497 virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc); 497 virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc);
498 virtual bool SetLocalContent_w(const MediaContentDescription* content, 498 virtual bool SetLocalContent_w(const MediaContentDescription* content,
499 ContentAction action, 499 ContentAction action,
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 // SetSendParameters. 659 // SetSendParameters.
660 DataSendParameters last_send_params_; 660 DataSendParameters last_send_params_;
661 // Last DataRecvParameters sent down to the media_channel() via 661 // Last DataRecvParameters sent down to the media_channel() via
662 // SetRecvParameters. 662 // SetRecvParameters.
663 DataRecvParameters last_recv_params_; 663 DataRecvParameters last_recv_params_;
664 }; 664 };
665 665
666 } // namespace cricket 666 } // namespace cricket
667 667
668 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 668 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | talk/session/media/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698