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

Side by Side Diff: webrtc/api/peerconnection.cc

Issue 1770003002: Renamed VideoSourceInterface to VideoTrackSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased 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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 11 matching lines...) Expand all
22 #include "webrtc/api/mediaconstraintsinterface.h" 22 #include "webrtc/api/mediaconstraintsinterface.h"
23 #include "webrtc/api/mediastream.h" 23 #include "webrtc/api/mediastream.h"
24 #include "webrtc/api/mediastreamobserver.h" 24 #include "webrtc/api/mediastreamobserver.h"
25 #include "webrtc/api/mediastreamproxy.h" 25 #include "webrtc/api/mediastreamproxy.h"
26 #include "webrtc/api/mediastreamtrackproxy.h" 26 #include "webrtc/api/mediastreamtrackproxy.h"
27 #include "webrtc/api/remoteaudiosource.h" 27 #include "webrtc/api/remoteaudiosource.h"
28 #include "webrtc/api/remotevideocapturer.h" 28 #include "webrtc/api/remotevideocapturer.h"
29 #include "webrtc/api/rtpreceiver.h" 29 #include "webrtc/api/rtpreceiver.h"
30 #include "webrtc/api/rtpsender.h" 30 #include "webrtc/api/rtpsender.h"
31 #include "webrtc/api/streamcollection.h" 31 #include "webrtc/api/streamcollection.h"
32 #include "webrtc/api/videosource.h" 32 #include "webrtc/api/videocapturertracksource.h"
33 #include "webrtc/api/videotrack.h" 33 #include "webrtc/api/videotrack.h"
34 #include "webrtc/base/arraysize.h" 34 #include "webrtc/base/arraysize.h"
35 #include "webrtc/base/logging.h" 35 #include "webrtc/base/logging.h"
36 #include "webrtc/base/stringencode.h" 36 #include "webrtc/base/stringencode.h"
37 #include "webrtc/base/stringutils.h" 37 #include "webrtc/base/stringutils.h"
38 #include "webrtc/base/trace_event.h" 38 #include "webrtc/base/trace_event.h"
39 #include "webrtc/media/sctp/sctpdataengine.h" 39 #include "webrtc/media/sctp/sctpdataengine.h"
40 #include "webrtc/p2p/client/basicportallocator.h" 40 #include "webrtc/p2p/client/basicportallocator.h"
41 #include "webrtc/pc/channelmanager.h" 41 #include "webrtc/pc/channelmanager.h"
42 #include "webrtc/system_wrappers/include/field_trial.h" 42 #include "webrtc/system_wrappers/include/field_trial.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 webrtc::MediaStreamInterface* stream, 397 webrtc::MediaStreamInterface* stream,
398 const std::string& track_id) { 398 const std::string& track_id) {
399 return AddTrack<AudioTrackInterface, AudioTrack, AudioTrackProxy>( 399 return AddTrack<AudioTrackInterface, AudioTrack, AudioTrackProxy>(
400 stream, track_id, RemoteAudioSource::Create(ssrc, provider)); 400 stream, track_id, RemoteAudioSource::Create(ssrc, provider));
401 } 401 }
402 402
403 VideoTrackInterface* AddVideoTrack(webrtc::MediaStreamInterface* stream, 403 VideoTrackInterface* AddVideoTrack(webrtc::MediaStreamInterface* stream,
404 const std::string& track_id) { 404 const std::string& track_id) {
405 return AddTrack<VideoTrackInterface, VideoTrack, VideoTrackProxy>( 405 return AddTrack<VideoTrackInterface, VideoTrack, VideoTrackProxy>(
406 stream, track_id, 406 stream, track_id,
407 VideoSource::Create(worker_thread_, new RemoteVideoCapturer(), 407 VideoCapturerTrackSource::Create(
408 nullptr, true) 408 worker_thread_, new RemoteVideoCapturer(), nullptr, true)
409 .get()); 409 .get());
410 } 410 }
411 411
412 private: 412 private:
413 template <typename TI, typename T, typename TP, typename S> 413 template <typename TI, typename T, typename TP, typename S>
414 TI* AddTrack(MediaStreamInterface* stream, 414 TI* AddTrack(MediaStreamInterface* stream,
415 const std::string& track_id, 415 const std::string& track_id,
416 const S& source) { 416 const S& source) {
417 rtc::scoped_refptr<TI> track( 417 rtc::scoped_refptr<TI> track(
418 TP::Create(signaling_thread_, T::Create(track_id, source))); 418 TP::Create(signaling_thread_, T::Create(track_id, source)));
(...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after
2112 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const { 2112 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const {
2113 for (const auto& channel : sctp_data_channels_) { 2113 for (const auto& channel : sctp_data_channels_) {
2114 if (channel->id() == sid) { 2114 if (channel->id() == sid) {
2115 return channel; 2115 return channel;
2116 } 2116 }
2117 } 2117 }
2118 return nullptr; 2118 return nullptr;
2119 } 2119 }
2120 2120
2121 } // namespace webrtc 2121 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698