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

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

Issue 2415943002: Revert of Add RtcpRttStats to AudioStream (Closed)
Patch Set: 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 | « no previous file | webrtc/audio/audio_send_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_SEND_STREAM_H_ 11 #ifndef WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
12 #define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ 12 #define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/call/audio_send_stream.h" 16 #include "webrtc/api/call/audio_send_stream.h"
17 #include "webrtc/api/call/audio_state.h" 17 #include "webrtc/api/call/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/call/bitrate_allocator.h" 20 #include "webrtc/call/bitrate_allocator.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 class CongestionController; 23 class CongestionController;
24 class VoiceEngine; 24 class VoiceEngine;
25 class RtcEventLog; 25 class RtcEventLog;
26 class RtcpRttStats;
27 26
28 namespace voe { 27 namespace voe {
29 class ChannelProxy; 28 class ChannelProxy;
30 } // namespace voe 29 } // namespace voe
31 30
32 namespace internal { 31 namespace internal {
33 class AudioSendStream final : public webrtc::AudioSendStream, 32 class AudioSendStream final : public webrtc::AudioSendStream,
34 public webrtc::BitrateAllocatorObserver { 33 public webrtc::BitrateAllocatorObserver {
35 public: 34 public:
36 AudioSendStream(const webrtc::AudioSendStream::Config& config, 35 AudioSendStream(const webrtc::AudioSendStream::Config& config,
37 const rtc::scoped_refptr<webrtc::AudioState>& audio_state, 36 const rtc::scoped_refptr<webrtc::AudioState>& audio_state,
38 rtc::TaskQueue* worker_queue, 37 rtc::TaskQueue* worker_queue,
39 CongestionController* congestion_controller, 38 CongestionController* congestion_controller,
40 BitrateAllocator* bitrate_allocator, 39 BitrateAllocator* bitrate_allocator,
41 RtcEventLog* event_log, 40 RtcEventLog* event_log);
42 RtcpRttStats* rtcp_rtt_stats);
43 ~AudioSendStream() override; 41 ~AudioSendStream() override;
44 42
45 // webrtc::AudioSendStream implementation. 43 // webrtc::AudioSendStream implementation.
46 void Start() override; 44 void Start() override;
47 void Stop() override; 45 void Stop() override;
48 bool SendTelephoneEvent(int payload_type, int event, 46 bool SendTelephoneEvent(int payload_type, int event,
49 int duration_ms) override; 47 int duration_ms) override;
50 void SetMuted(bool muted) override; 48 void SetMuted(bool muted) override;
51 webrtc::AudioSendStream::Stats GetStats() const override; 49 webrtc::AudioSendStream::Stats GetStats() const override;
52 50
(...skipping 17 matching lines...) Expand all
70 std::unique_ptr<voe::ChannelProxy> channel_proxy_; 68 std::unique_ptr<voe::ChannelProxy> channel_proxy_;
71 69
72 BitrateAllocator* const bitrate_allocator_; 70 BitrateAllocator* const bitrate_allocator_;
73 71
74 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); 72 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream);
75 }; 73 };
76 } // namespace internal 74 } // namespace internal
77 } // namespace webrtc 75 } // namespace webrtc
78 76
79 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ 77 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698