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

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: Rebased, no longer any proxy object changes. 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
« no previous file with comments | « webrtc/pc/channel.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 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 1672 matching lines...) Expand 10 before | Expand all | Expand 10 after
1683 Deinit(); 1683 Deinit();
1684 } 1684 }
1685 1685
1686 bool VideoChannel::SetSink(uint32_t ssrc, 1686 bool VideoChannel::SetSink(uint32_t ssrc,
1687 rtc::VideoSinkInterface<VideoFrame>* sink) { 1687 rtc::VideoSinkInterface<VideoFrame>* sink) {
1688 worker_thread()->Invoke<void>( 1688 worker_thread()->Invoke<void>(
1689 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink)); 1689 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
1690 return true; 1690 return true;
1691 } 1691 }
1692 1692
1693 bool VideoChannel::SetCapturer(uint32_t ssrc, VideoCapturer* capturer) { 1693 void VideoChannel::SetSource(
1694 return InvokeOnWorker(Bind(&VideoMediaChannel::SetCapturer, 1694 uint32_t ssrc,
1695 media_channel(), ssrc, capturer)); 1695 rtc::VideoSourceInterface<cricket::VideoFrame>* source) {
1696 worker_thread()->Invoke<void>(
1697 Bind(&VideoMediaChannel::SetSource, media_channel(), ssrc, source));
1696 } 1698 }
1697 1699
1698 bool VideoChannel::SetVideoSend(uint32_t ssrc, 1700 bool VideoChannel::SetVideoSend(uint32_t ssrc,
1699 bool mute, 1701 bool mute,
1700 const VideoOptions* options) { 1702 const VideoOptions* options) {
1701 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(), 1703 return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
1702 ssrc, mute, options)); 1704 ssrc, mute, options));
1703 } 1705 }
1704 1706
1705 webrtc::RtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) const { 1707 webrtc::RtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) const {
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
2201 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); 2203 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
2202 } 2204 }
2203 2205
2204 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2206 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2205 rtc::TypedMessageData<uint32_t>* message = 2207 rtc::TypedMessageData<uint32_t>* message =
2206 new rtc::TypedMessageData<uint32_t>(sid); 2208 new rtc::TypedMessageData<uint32_t>(sid);
2207 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2209 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2208 } 2210 }
2209 2211
2210 } // namespace cricket 2212 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698