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

Side by Side Diff: webrtc/voice_engine/channel_proxy.h

Issue 2697833002: Replace AudioReceiveStream::DeliverRtp with OnRtpPacket. (Closed)
Patch Set: Another return value fix. Created 3 years, 10 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/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_proxy.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 (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 12 matching lines...) Expand all
23 #include <vector> 23 #include <vector>
24 24
25 namespace webrtc { 25 namespace webrtc {
26 26
27 class AudioSinkInterface; 27 class AudioSinkInterface;
28 class PacketRouter; 28 class PacketRouter;
29 class RtcEventLog; 29 class RtcEventLog;
30 class RtcpBandwidthObserver; 30 class RtcpBandwidthObserver;
31 class RtcpRttStats; 31 class RtcpRttStats;
32 class RtpPacketSender; 32 class RtpPacketSender;
33 class RtpPacketReceived;
33 class RtpReceiver; 34 class RtpReceiver;
34 class RtpRtcp; 35 class RtpRtcp;
35 class Transport; 36 class Transport;
36 class TransportFeedbackObserver; 37 class TransportFeedbackObserver;
37 38
38 namespace voe { 39 namespace voe {
39 40
40 class Channel; 41 class Channel;
41 42
42 // This class provides the "view" of a voe::Channel that we need to implement 43 // This class provides the "view" of a voe::Channel that we need to implement
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 virtual bool SetSendTelephoneEventPayloadType(int payload_type, 78 virtual bool SetSendTelephoneEventPayloadType(int payload_type,
78 int payload_frequency); 79 int payload_frequency);
79 virtual bool SendTelephoneEventOutband(int event, int duration_ms); 80 virtual bool SendTelephoneEventOutband(int event, int duration_ms);
80 virtual void SetBitrate(int bitrate_bps, int64_t probing_interval_ms); 81 virtual void SetBitrate(int bitrate_bps, int64_t probing_interval_ms);
81 virtual void SetRecPayloadType(int payload_type, 82 virtual void SetRecPayloadType(int payload_type,
82 const SdpAudioFormat& format); 83 const SdpAudioFormat& format);
83 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink); 84 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink);
84 virtual void SetInputMute(bool muted); 85 virtual void SetInputMute(bool muted);
85 virtual void RegisterExternalTransport(Transport* transport); 86 virtual void RegisterExternalTransport(Transport* transport);
86 virtual void DeRegisterExternalTransport(); 87 virtual void DeRegisterExternalTransport();
87 virtual bool ReceivedRTPPacket(const uint8_t* packet, 88 virtual void OnRtpPacket(const RtpPacketReceived& packet);
88 size_t length,
89 const PacketTime& packet_time);
90 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length); 89 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length);
91 virtual const rtc::scoped_refptr<AudioDecoderFactory>& 90 virtual const rtc::scoped_refptr<AudioDecoderFactory>&
92 GetAudioDecoderFactory() const; 91 GetAudioDecoderFactory() const;
93 virtual void SetChannelOutputVolumeScaling(float scaling); 92 virtual void SetChannelOutputVolumeScaling(float scaling);
94 virtual void SetRtcEventLog(RtcEventLog* event_log); 93 virtual void SetRtcEventLog(RtcEventLog* event_log);
95 virtual void EnableAudioNetworkAdaptor(const std::string& config_string); 94 virtual void EnableAudioNetworkAdaptor(const std::string& config_string);
96 virtual void DisableAudioNetworkAdaptor(); 95 virtual void DisableAudioNetworkAdaptor();
97 virtual void SetReceiverFrameLengthRange(int min_frame_length_ms, 96 virtual void SetReceiverFrameLengthRange(int min_frame_length_ms,
98 int max_frame_length_ms); 97 int max_frame_length_ms);
99 virtual AudioMixer::Source::AudioFrameInfo GetAudioFrameWithInfo( 98 virtual AudioMixer::Source::AudioFrameInfo GetAudioFrameWithInfo(
(...skipping 25 matching lines...) Expand all
125 rtc::ThreadChecker thread_checker_; 124 rtc::ThreadChecker thread_checker_;
126 rtc::RaceChecker race_checker_; 125 rtc::RaceChecker race_checker_;
127 ChannelOwner channel_owner_; 126 ChannelOwner channel_owner_;
128 127
129 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); 128 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
130 }; 129 };
131 } // namespace voe 130 } // namespace voe
132 } // namespace webrtc 131 } // namespace webrtc
133 132
134 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 133 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698