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

Side by Side Diff: webrtc/voice_engine/channel_proxy.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/voice_engine/channel_manager.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
11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
13 13
14 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/base/thread_checker.h" 15 #include "webrtc/base/thread_checker.h"
16 #include "webrtc/voice_engine/channel_manager.h" 16 #include "webrtc/voice_engine/channel_manager.h"
17 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 17 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
18 18
19 #include <memory> 19 #include <memory>
20 #include <string> 20 #include <string>
21 #include <vector> 21 #include <vector>
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 class AudioSinkInterface; 25 class AudioSinkInterface;
26 class PacketRouter; 26 class PacketRouter;
27 class RtcEventLog;
28 class RtpPacketSender; 27 class RtpPacketSender;
29 class Transport; 28 class Transport;
30 class TransportFeedbackObserver; 29 class TransportFeedbackObserver;
31 30
32 namespace voe { 31 namespace voe {
33 32
34 class Channel; 33 class Channel;
35 34
36 // This class provides the "view" of a voe::Channel that we need to implement 35 // This class provides the "view" of a voe::Channel that we need to implement
37 // webrtc::AudioSendStream and webrtc::AudioReceiveStream. It serves two 36 // webrtc::AudioSendStream and webrtc::AudioReceiveStream. It serves two
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 virtual bool ReceivedRTPPacket(const uint8_t* packet, 80 virtual bool ReceivedRTPPacket(const uint8_t* packet,
82 size_t length, 81 size_t length,
83 const PacketTime& packet_time); 82 const PacketTime& packet_time);
84 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length); 83 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length);
85 84
86 virtual const rtc::scoped_refptr<AudioDecoderFactory>& 85 virtual const rtc::scoped_refptr<AudioDecoderFactory>&
87 GetAudioDecoderFactory() const; 86 GetAudioDecoderFactory() const;
88 87
89 virtual void SetChannelOutputVolumeScaling(float scaling); 88 virtual void SetChannelOutputVolumeScaling(float scaling);
90 89
91 virtual void SetRtcEventLog(RtcEventLog* event_log);
92
93 private: 90 private:
94 Channel* channel() const; 91 Channel* channel() const;
95 92
96 rtc::ThreadChecker thread_checker_; 93 rtc::ThreadChecker thread_checker_;
97 ChannelOwner channel_owner_; 94 ChannelOwner channel_owner_;
98 95
99 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); 96 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
100 }; 97 };
101 } // namespace voe 98 } // namespace voe
102 } // namespace webrtc 99 } // namespace webrtc
103 100
104 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 101 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_manager.cc ('k') | webrtc/voice_engine/channel_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698