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

Side by Side Diff: webrtc/voice_engine/channel_proxy.cc

Issue 1991233004: Moved creation of AudioDecoderFactory to inside PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-3
Patch Set: Parental Advisory: Explicit Content Created 4 years, 6 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_proxy.h ('k') | no next file » | 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 const PacketTime& packet_time) { 174 const PacketTime& packet_time) {
175 // May be called on either worker thread or network thread. 175 // May be called on either worker thread or network thread.
176 return channel()->ReceivedRTPPacket(packet, length, packet_time) == 0; 176 return channel()->ReceivedRTPPacket(packet, length, packet_time) == 0;
177 } 177 }
178 178
179 bool ChannelProxy::ReceivedRTCPPacket(const uint8_t* packet, size_t length) { 179 bool ChannelProxy::ReceivedRTCPPacket(const uint8_t* packet, size_t length) {
180 // May be called on either worker thread or network thread. 180 // May be called on either worker thread or network thread.
181 return channel()->ReceivedRTCPPacket(packet, length) == 0; 181 return channel()->ReceivedRTCPPacket(packet, length) == 0;
182 } 182 }
183 183
184 const rtc::scoped_refptr<AudioDecoderFactory>&
185 ChannelProxy::GetAudioDecoderFactory() const {
186 return channel()->GetAudioDecoderFactory();
187 }
188
184 Channel* ChannelProxy::channel() const { 189 Channel* ChannelProxy::channel() const {
185 RTC_DCHECK(channel_owner_.channel()); 190 RTC_DCHECK(channel_owner_.channel());
186 return channel_owner_.channel(); 191 return channel_owner_.channel();
187 } 192 }
188 193
189 } // namespace voe 194 } // namespace voe
190 } // namespace webrtc 195 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698