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

Side by Side Diff: webrtc/pc/channel.h

Issue 2809613002: Revert of Implemented the GetSources() in native code. (Closed)
Patch Set: Created 3 years, 8 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 | « webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc ('k') | webrtc/pc/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 * 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
11 #ifndef WEBRTC_PC_CHANNEL_H_ 11 #ifndef WEBRTC_PC_CHANNEL_H_
12 #define WEBRTC_PC_CHANNEL_H_ 12 #define WEBRTC_PC_CHANNEL_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory> 15 #include <memory>
16 #include <set> 16 #include <set>
17 #include <string> 17 #include <string>
18 #include <utility> 18 #include <utility>
19 #include <vector> 19 #include <vector>
20 20
21 #include "webrtc/api/call/audio_sink.h" 21 #include "webrtc/api/call/audio_sink.h"
22 #include "webrtc/api/rtpreceiverinterface.h"
23 #include "webrtc/base/asyncinvoker.h" 22 #include "webrtc/base/asyncinvoker.h"
24 #include "webrtc/base/asyncudpsocket.h" 23 #include "webrtc/base/asyncudpsocket.h"
25 #include "webrtc/base/criticalsection.h" 24 #include "webrtc/base/criticalsection.h"
26 #include "webrtc/base/network.h" 25 #include "webrtc/base/network.h"
27 #include "webrtc/base/sigslot.h" 26 #include "webrtc/base/sigslot.h"
28 #include "webrtc/base/window.h" 27 #include "webrtc/base/window.h"
29 #include "webrtc/media/base/mediachannel.h" 28 #include "webrtc/media/base/mediachannel.h"
30 #include "webrtc/media/base/mediaengine.h" 29 #include "webrtc/media/base/mediaengine.h"
31 #include "webrtc/media/base/streamparams.h" 30 #include "webrtc/media/base/streamparams.h"
32 #include "webrtc/media/base/videosinkinterface.h" 31 #include "webrtc/media/base/videosinkinterface.h"
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const; 484 webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const;
486 bool SetRtpSendParameters(uint32_t ssrc, 485 bool SetRtpSendParameters(uint32_t ssrc,
487 const webrtc::RtpParameters& parameters); 486 const webrtc::RtpParameters& parameters);
488 webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const; 487 webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const;
489 bool SetRtpReceiveParameters(uint32_t ssrc, 488 bool SetRtpReceiveParameters(uint32_t ssrc,
490 const webrtc::RtpParameters& parameters); 489 const webrtc::RtpParameters& parameters);
491 490
492 // Get statistics about the current media session. 491 // Get statistics about the current media session.
493 bool GetStats(VoiceMediaInfo* stats); 492 bool GetStats(VoiceMediaInfo* stats);
494 493
495 std::vector<webrtc::RtpSource> GetSources(uint32_t ssrc) const;
496
497 // Monitoring functions 494 // Monitoring functions
498 sigslot::signal2<VoiceChannel*, const std::vector<ConnectionInfo>&> 495 sigslot::signal2<VoiceChannel*, const std::vector<ConnectionInfo>&>
499 SignalConnectionMonitor; 496 SignalConnectionMonitor;
500 497
501 void StartMediaMonitor(int cms); 498 void StartMediaMonitor(int cms);
502 void StopMediaMonitor(); 499 void StopMediaMonitor();
503 sigslot::signal2<VoiceChannel*, const VoiceMediaInfo&> SignalMediaMonitor; 500 sigslot::signal2<VoiceChannel*, const VoiceMediaInfo&> SignalMediaMonitor;
504 501
505 void StartAudioMonitor(int cms); 502 void StartAudioMonitor(int cms);
506 void StopAudioMonitor(); 503 void StopAudioMonitor();
(...skipping 21 matching lines...) Expand all
528 const ContentInfo* GetFirstContent(const SessionDescription* sdesc) override; 525 const ContentInfo* GetFirstContent(const SessionDescription* sdesc) override;
529 bool SetLocalContent_w(const MediaContentDescription* content, 526 bool SetLocalContent_w(const MediaContentDescription* content,
530 ContentAction action, 527 ContentAction action,
531 std::string* error_desc) override; 528 std::string* error_desc) override;
532 bool SetRemoteContent_w(const MediaContentDescription* content, 529 bool SetRemoteContent_w(const MediaContentDescription* content,
533 ContentAction action, 530 ContentAction action,
534 std::string* error_desc) override; 531 std::string* error_desc) override;
535 void HandleEarlyMediaTimeout(); 532 void HandleEarlyMediaTimeout();
536 bool InsertDtmf_w(uint32_t ssrc, int event, int duration); 533 bool InsertDtmf_w(uint32_t ssrc, int event, int duration);
537 bool SetOutputVolume_w(uint32_t ssrc, double volume); 534 bool SetOutputVolume_w(uint32_t ssrc, double volume);
535 bool GetStats_w(VoiceMediaInfo* stats);
538 536
539 void OnMessage(rtc::Message* pmsg) override; 537 void OnMessage(rtc::Message* pmsg) override;
540 void GetSrtpCryptoSuites_n(std::vector<int>* crypto_suites) const override; 538 void GetSrtpCryptoSuites_n(std::vector<int>* crypto_suites) const override;
541 void OnConnectionMonitorUpdate( 539 void OnConnectionMonitorUpdate(
542 ConnectionMonitor* monitor, 540 ConnectionMonitor* monitor,
543 const std::vector<ConnectionInfo>& infos) override; 541 const std::vector<ConnectionInfo>& infos) override;
544 void OnMediaMonitorUpdate(VoiceMediaChannel* media_channel, 542 void OnMediaMonitorUpdate(VoiceMediaChannel* media_channel,
545 const VoiceMediaInfo& info); 543 const VoiceMediaInfo& info);
546 void OnAudioMonitorUpdate(AudioMonitor* monitor, const AudioInfo& info); 544 void OnAudioMonitorUpdate(AudioMonitor* monitor, const AudioInfo& info);
547 545
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 // SetSendParameters. 745 // SetSendParameters.
748 DataSendParameters last_send_params_; 746 DataSendParameters last_send_params_;
749 // Last DataRecvParameters sent down to the media_channel() via 747 // Last DataRecvParameters sent down to the media_channel() via
750 // SetRecvParameters. 748 // SetRecvParameters.
751 DataRecvParameters last_recv_params_; 749 DataRecvParameters last_recv_params_;
752 }; 750 };
753 751
754 } // namespace cricket 752 } // namespace cricket
755 753
756 #endif // WEBRTC_PC_CHANNEL_H_ 754 #endif // WEBRTC_PC_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698