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

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: Rebase. Created 4 years, 8 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 1676 matching lines...) Expand 10 before | Expand all | Expand 10 after
1687 Deinit(); 1687 Deinit();
1688 } 1688 }
1689 1689
1690 bool VideoChannel::SetSink(uint32_t ssrc, 1690 bool VideoChannel::SetSink(uint32_t ssrc,
1691 rtc::VideoSinkInterface<VideoFrame>* sink) { 1691 rtc::VideoSinkInterface<VideoFrame>* sink) {
1692 worker_thread()->Invoke<void>( 1692 worker_thread()->Invoke<void>(
1693 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink)); 1693 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
1694 return true; 1694 return true;
1695 } 1695 }
1696 1696
1697 bool VideoChannel::SetCapturer(uint32_t ssrc, VideoCapturer* capturer) { 1697 void VideoChannel::SetSource(
1698 return InvokeOnWorker(Bind(&VideoMediaChannel::SetCapturer, 1698 uint32_t ssrc,
1699 media_channel(), ssrc, capturer)); 1699 rtc::VideoSourceInterface<cricket::VideoFrame>* source) {
1700 worker_thread()->Invoke<void>(
1701 Bind(&VideoMediaChannel::SetSource, media_channel(), ssrc, source));
1700 } 1702 }
1701 1703
1702 bool VideoChannel::SetVideoSend(uint32_t ssrc, 1704 bool VideoChannel::SetVideoSend(uint32_t ssrc,
1703 bool mute, 1705 bool mute,
1704 const VideoOptions* options) { 1706 const VideoOptions* options) {
1705 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(), 1707 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
1706 ssrc, mute, options)); 1708 ssrc, mute, options));
1707 } 1709 }
1708 1710
1709 webrtc::RtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) const { 1711 webrtc::RtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) const {
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
2205 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); 2207 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
2206 } 2208 }
2207 2209
2208 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2210 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2209 rtc::TypedMessageData<uint32_t>* message = 2211 rtc::TypedMessageData<uint32_t>* message =
2210 new rtc::TypedMessageData<uint32_t>(sid); 2212 new rtc::TypedMessageData<uint32_t>(sid);
2211 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2213 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2212 } 2214 }
2213 2215
2214 } // namespace cricket 2216 } // namespace cricket
OLDNEW
« webrtc/api/objc/RTCAVFoundationVideoSource.mm ('K') | « webrtc/pc/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698