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

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

Issue 2697833002: Replace AudioReceiveStream::DeliverRtp with OnRtpPacket. (Closed)
Patch Set: Fixed gmock issue. 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 class FileWrapper; 46 class FileWrapper;
47 class PacketRouter; 47 class PacketRouter;
48 class ProcessThread; 48 class ProcessThread;
49 class RateLimiter; 49 class RateLimiter;
50 class ReceiveStatistics; 50 class ReceiveStatistics;
51 class RemoteNtpTimeEstimator; 51 class RemoteNtpTimeEstimator;
52 class RtcEventLog; 52 class RtcEventLog;
53 class RTPPayloadRegistry; 53 class RTPPayloadRegistry;
54 class RtpReceiver; 54 class RtpReceiver;
55 class RTPReceiverAudio; 55 class RTPReceiverAudio;
56 class RtpPacketReceived;
56 class RtpRtcp; 57 class RtpRtcp;
57 class TelephoneEventHandler; 58 class TelephoneEventHandler;
58 class VoERTPObserver; 59 class VoERTPObserver;
59 class VoiceEngineObserver; 60 class VoiceEngineObserver;
60 61
61 struct CallStatistics; 62 struct CallStatistics;
62 struct ReportBlock; 63 struct ReportBlock;
63 struct SenderInfo; 64 struct SenderInfo;
64 65
65 namespace voe { 66 namespace voe {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 int SetOpusDtx(bool enable_dtx); 195 int SetOpusDtx(bool enable_dtx);
195 int GetOpusDtx(bool* enabled); 196 int GetOpusDtx(bool* enabled);
196 bool EnableAudioNetworkAdaptor(const std::string& config_string); 197 bool EnableAudioNetworkAdaptor(const std::string& config_string);
197 void DisableAudioNetworkAdaptor(); 198 void DisableAudioNetworkAdaptor();
198 void SetReceiverFrameLengthRange(int min_frame_length_ms, 199 void SetReceiverFrameLengthRange(int min_frame_length_ms,
199 int max_frame_length_ms); 200 int max_frame_length_ms);
200 201
201 // VoENetwork 202 // VoENetwork
202 int32_t RegisterExternalTransport(Transport* transport); 203 int32_t RegisterExternalTransport(Transport* transport);
203 int32_t DeRegisterExternalTransport(); 204 int32_t DeRegisterExternalTransport();
204 int32_t ReceivedRTPPacket(const uint8_t* received_packet, 205 void OnRtpPacket(const RtpPacketReceived& packet);
205 size_t length,
206 const PacketTime& packet_time);
207 int32_t ReceivedRTCPPacket(const uint8_t* data, size_t length); 206 int32_t ReceivedRTCPPacket(const uint8_t* data, size_t length);
208 207
209 // VoEFile 208 // VoEFile
210 int StartPlayingFileLocally(const char* fileName, 209 int StartPlayingFileLocally(const char* fileName,
211 bool loop, 210 bool loop,
212 FileFormats format, 211 FileFormats format,
213 int startPosition, 212 int startPosition,
214 float volumeScaling, 213 float volumeScaling,
215 int stopPosition, 214 int stopPosition,
216 const CodecInst* codecInst); 215 const CodecInst* codecInst);
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 519 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
521 520
522 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 521 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
523 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 522 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
524 }; 523 };
525 524
526 } // namespace voe 525 } // namespace voe
527 } // namespace webrtc 526 } // namespace webrtc
528 527
529 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 528 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698