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

Side by Side Diff: webrtc/pc/channel.cc

Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting tweaks and TODO updates. Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 Deinit(); 1668 Deinit();
1669 } 1669 }
1670 1670
1671 bool VideoChannel::SetSink(uint32_t ssrc, 1671 bool VideoChannel::SetSink(uint32_t ssrc,
1672 rtc::VideoSinkInterface<VideoFrame>* sink) { 1672 rtc::VideoSinkInterface<VideoFrame>* sink) {
1673 worker_thread()->Invoke<void>( 1673 worker_thread()->Invoke<void>(
1674 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink)); 1674 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
1675 return true; 1675 return true;
1676 } 1676 }
1677 1677
1678 bool VideoChannel::SetCapturer(uint32_t ssrc, VideoCapturer* capturer) { 1678 void VideoChannel::SetSource(
1679 return InvokeOnWorker(Bind(&VideoMediaChannel::SetCapturer, 1679 uint32_t ssrc,
1680 media_channel(), ssrc, capturer)); 1680 rtc::VideoSourceInterface<cricket::VideoFrame>* source) {
1681 worker_thread()->Invoke<void>(
1682 Bind(&VideoMediaChannel::SetSource, media_channel(), ssrc, source));
1681 } 1683 }
1682 1684
1683 bool VideoChannel::SetVideoSend(uint32_t ssrc, 1685 bool VideoChannel::SetVideoSend(uint32_t ssrc,
1684 bool mute, 1686 bool mute,
1685 const VideoOptions* options) { 1687 const VideoOptions* options) {
1686 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(), 1688 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
1687 ssrc, mute, options)); 1689 ssrc, mute, options));
1688 } 1690 }
1689 1691
1690 webrtc::RtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) const { 1692 webrtc::RtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) const {
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
2186 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); 2188 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
2187 } 2189 }
2188 2190
2189 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2191 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2190 rtc::TypedMessageData<uint32_t>* message = 2192 rtc::TypedMessageData<uint32_t>* message =
2191 new rtc::TypedMessageData<uint32_t>(sid); 2193 new rtc::TypedMessageData<uint32_t>(sid);
2192 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2194 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2193 } 2195 }
2194 2196
2195 } // namespace cricket 2197 } // namespace cricket
OLDNEW
« webrtc/media/engine/webrtcvideoengine2.cc ('K') | « webrtc/pc/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698