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

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: Make SetSource tolerate unknown ssrc and source == NULL. 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
« webrtc/pc/channel.h ('K') | « 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 1655 matching lines...) Expand 10 before | Expand all | Expand 10 after
1666 worker_thread()->Invoke<void>( 1666 worker_thread()->Invoke<void>(
1667 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink)); 1667 Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
1668 return true; 1668 return true;
1669 } 1669 }
1670 1670
1671 bool VideoChannel::AddScreencast(uint32_t ssrc, VideoCapturer* capturer) { 1671 bool VideoChannel::AddScreencast(uint32_t ssrc, VideoCapturer* capturer) {
1672 return worker_thread()->Invoke<bool>(Bind( 1672 return worker_thread()->Invoke<bool>(Bind(
1673 &VideoChannel::AddScreencast_w, this, ssrc, capturer)); 1673 &VideoChannel::AddScreencast_w, this, ssrc, capturer));
1674 } 1674 }
1675 1675
1676 bool VideoChannel::SetCapturer(uint32_t ssrc, VideoCapturer* capturer) { 1676 void VideoChannel::SetSource(
1677 return InvokeOnWorker(Bind(&VideoMediaChannel::SetCapturer, 1677 uint32_t ssrc,
1678 media_channel(), ssrc, capturer)); 1678 rtc::VideoSourceInterface<cricket::VideoFrame>* source) {
1679 worker_thread()->Invoke<void>(Bind(&VideoMediaChannel::SetSource,
1680 media_channel(), ssrc, source));
1679 } 1681 }
1680 1682
1681 bool VideoChannel::RemoveScreencast(uint32_t ssrc) { 1683 bool VideoChannel::RemoveScreencast(uint32_t ssrc) {
1682 return InvokeOnWorker(Bind(&VideoChannel::RemoveScreencast_w, this, ssrc)); 1684 return InvokeOnWorker(Bind(&VideoChannel::RemoveScreencast_w, this, ssrc));
1683 } 1685 }
1684 1686
1685 bool VideoChannel::IsScreencasting() { 1687 bool VideoChannel::IsScreencasting() {
1686 return InvokeOnWorker(Bind(&VideoChannel::IsScreencasting_w, this)); 1688 return InvokeOnWorker(Bind(&VideoChannel::IsScreencasting_w, this));
1687 } 1689 }
1688 1690
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
2248 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); 2250 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
2249 } 2251 }
2250 2252
2251 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2253 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2252 rtc::TypedMessageData<uint32_t>* message = 2254 rtc::TypedMessageData<uint32_t>* message =
2253 new rtc::TypedMessageData<uint32_t>(sid); 2255 new rtc::TypedMessageData<uint32_t>(sid);
2254 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2256 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2255 } 2257 }
2256 2258
2257 } // namespace cricket 2259 } // namespace cricket
OLDNEW
« webrtc/pc/channel.h ('K') | « webrtc/pc/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698