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

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

Issue 2111813002: Revert of Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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/audio/DEPS ('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
11 #ifndef WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 11 #ifndef WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/audio_receive_stream.h" 16 #include "webrtc/audio_receive_stream.h"
17 #include "webrtc/audio_state.h" 17 #include "webrtc/audio_state.h"
18 #include "webrtc/base/constructormagic.h" 18 #include "webrtc/base/constructormagic.h"
19 #include "webrtc/base/thread_checker.h" 19 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" 20 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 class CongestionController; 23 class CongestionController;
24 class RemoteBitrateEstimator; 24 class RemoteBitrateEstimator;
25 class RtcEventLog;
26 25
27 namespace voe { 26 namespace voe {
28 class ChannelProxy; 27 class ChannelProxy;
29 } // namespace voe 28 } // namespace voe
30 29
31 namespace internal { 30 namespace internal {
32 31
33 class AudioReceiveStream final : public webrtc::AudioReceiveStream { 32 class AudioReceiveStream final : public webrtc::AudioReceiveStream {
34 public: 33 public:
35 AudioReceiveStream(CongestionController* congestion_controller, 34 AudioReceiveStream(CongestionController* congestion_controller,
36 const webrtc::AudioReceiveStream::Config& config, 35 const webrtc::AudioReceiveStream::Config& config,
37 const rtc::scoped_refptr<webrtc::AudioState>& audio_state, 36 const rtc::scoped_refptr<webrtc::AudioState>& audio_state);
38 webrtc::RtcEventLog* event_log);
39 ~AudioReceiveStream() override; 37 ~AudioReceiveStream() override;
40 38
41 // webrtc::AudioReceiveStream implementation. 39 // webrtc::AudioReceiveStream implementation.
42 void Start() override; 40 void Start() override;
43 void Stop() override; 41 void Stop() override;
44 webrtc::AudioReceiveStream::Stats GetStats() const override; 42 webrtc::AudioReceiveStream::Stats GetStats() const override;
45 void SetSink(std::unique_ptr<AudioSinkInterface> sink) override; 43 void SetSink(std::unique_ptr<AudioSinkInterface> sink) override;
46 void SetGain(float gain) override; 44 void SetGain(float gain) override;
47 45
48 void SignalNetworkState(NetworkState state); 46 void SignalNetworkState(NetworkState state);
(...skipping 12 matching lines...) Expand all
61 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 59 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
62 std::unique_ptr<RtpHeaderParser> rtp_header_parser_; 60 std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
63 std::unique_ptr<voe::ChannelProxy> channel_proxy_; 61 std::unique_ptr<voe::ChannelProxy> channel_proxy_;
64 62
65 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream); 63 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream);
66 }; 64 };
67 } // namespace internal 65 } // namespace internal
68 } // namespace webrtc 66 } // namespace webrtc
69 67
70 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 68 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/audio/DEPS ('k') | webrtc/audio/audio_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698