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

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

Issue 1588693002: Revert of Storing raw audio sink for default audio track. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 return channel()->SetSendTelephoneEventPayloadType(payload_type) == 0; 132 return channel()->SetSendTelephoneEventPayloadType(payload_type) == 0;
133 } 133 }
134 134
135 bool ChannelProxy::SendTelephoneEventOutband(uint8_t event, 135 bool ChannelProxy::SendTelephoneEventOutband(uint8_t event,
136 uint32_t duration_ms) { 136 uint32_t duration_ms) {
137 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 137 RTC_DCHECK(thread_checker_.CalledOnValidThread());
138 return 138 return
139 channel()->SendTelephoneEventOutband(event, duration_ms, 10, false) == 0; 139 channel()->SendTelephoneEventOutband(event, duration_ms, 10, false) == 0;
140 } 140 }
141 141
142 void ChannelProxy::SetSink(const rtc::scoped_refptr<AudioSinkInterface>& sink) { 142 void ChannelProxy::SetSink(rtc::scoped_ptr<AudioSinkInterface> sink) {
143 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 143 RTC_DCHECK(thread_checker_.CalledOnValidThread());
144 channel()->SetSink(sink); 144 channel()->SetSink(std::move(sink));
145 } 145 }
146 146
147 Channel* ChannelProxy::channel() const { 147 Channel* ChannelProxy::channel() const {
148 RTC_DCHECK(channel_owner_.channel()); 148 RTC_DCHECK(channel_owner_.channel());
149 return channel_owner_.channel(); 149 return channel_owner_.channel();
150 } 150 }
151 151
152 } // namespace voe 152 } // namespace voe
153 } // namespace webrtc 153 } // 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