OLD | NEW |
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 const PacketTime& packet_time); | 86 const PacketTime& packet_time); |
87 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length); | 87 virtual bool ReceivedRTCPPacket(const uint8_t* packet, size_t length); |
88 | 88 |
89 virtual const rtc::scoped_refptr<AudioDecoderFactory>& | 89 virtual const rtc::scoped_refptr<AudioDecoderFactory>& |
90 GetAudioDecoderFactory() const; | 90 GetAudioDecoderFactory() const; |
91 | 91 |
92 virtual void SetChannelOutputVolumeScaling(float scaling); | 92 virtual void SetChannelOutputVolumeScaling(float scaling); |
93 | 93 |
94 virtual void SetRtcEventLog(RtcEventLog* event_log); | 94 virtual void SetRtcEventLog(RtcEventLog* event_log); |
95 | 95 |
96 virtual AudioMixer::Source::AudioFrameWithInfo GetAudioFrameWithInfo( | 96 virtual AudioMixer::Source::AudioFrameInfo GetAudioFrameWithInfo( |
97 int sample_rate_hz); | 97 int sample_rate_hz, |
| 98 AudioFrame* audio_frame); |
98 | 99 |
99 private: | 100 private: |
100 Channel* channel() const; | 101 Channel* channel() const; |
101 | 102 |
102 rtc::ThreadChecker thread_checker_; | 103 rtc::ThreadChecker thread_checker_; |
103 rtc::RaceChecker race_checker_; | 104 rtc::RaceChecker race_checker_; |
104 ChannelOwner channel_owner_; | 105 ChannelOwner channel_owner_; |
105 | 106 |
106 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); | 107 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); |
107 }; | 108 }; |
108 } // namespace voe | 109 } // namespace voe |
109 } // namespace webrtc | 110 } // namespace webrtc |
110 | 111 |
111 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ | 112 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ |
OLD | NEW |