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

Side by Side Diff: webrtc/audio/audio_receive_stream.h

Issue 2420913002: Move audio frame memory handling inside AudioMixer. (Closed)
Patch Set: Updated interface usages (I landed another CL in the wrong order...). Created 4 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 | « webrtc/api/audio/audio_mixer.h ('k') | webrtc/audio/audio_receive_stream.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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void SetGain(float gain) override; 48 void SetGain(float gain) override;
49 49
50 void SignalNetworkState(NetworkState state); 50 void SignalNetworkState(NetworkState state);
51 bool DeliverRtcp(const uint8_t* packet, size_t length); 51 bool DeliverRtcp(const uint8_t* packet, size_t length);
52 bool DeliverRtp(const uint8_t* packet, 52 bool DeliverRtp(const uint8_t* packet,
53 size_t length, 53 size_t length,
54 const PacketTime& packet_time); 54 const PacketTime& packet_time);
55 const webrtc::AudioReceiveStream::Config& config() const; 55 const webrtc::AudioReceiveStream::Config& config() const;
56 56
57 // AudioMixer::Source 57 // AudioMixer::Source
58 AudioFrameWithInfo GetAudioFrameWithInfo(int sample_rate_hz) override; 58 AudioFrameInfo GetAudioFrameWithInfo(int sample_rate_hz,
59 AudioFrame* audio_frame) override;
59 int Ssrc() override; 60 int Ssrc() override;
60 61
61 private: 62 private:
62 VoiceEngine* voice_engine() const; 63 VoiceEngine* voice_engine() const;
63 64
64 rtc::ThreadChecker thread_checker_; 65 rtc::ThreadChecker thread_checker_;
65 RemoteBitrateEstimator* remote_bitrate_estimator_ = nullptr; 66 RemoteBitrateEstimator* remote_bitrate_estimator_ = nullptr;
66 const webrtc::AudioReceiveStream::Config config_; 67 const webrtc::AudioReceiveStream::Config config_;
67 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 68 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
68 std::unique_ptr<RtpHeaderParser> rtp_header_parser_; 69 std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
69 std::unique_ptr<voe::ChannelProxy> channel_proxy_; 70 std::unique_ptr<voe::ChannelProxy> channel_proxy_;
70 71
71 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream); 72 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream);
72 }; 73 };
73 } // namespace internal 74 } // namespace internal
74 } // namespace webrtc 75 } // namespace webrtc
75 76
76 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 77 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/api/audio/audio_mixer.h ('k') | webrtc/audio/audio_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698