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

Side by Side Diff: webrtc/api/peerconnectionfactory.h

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 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 rtc::scoped_refptr<MediaStreamInterface> 57 rtc::scoped_refptr<MediaStreamInterface>
58 CreateLocalMediaStream(const std::string& label) override; 58 CreateLocalMediaStream(const std::string& label) override;
59 59
60 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 60 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
61 const cricket::AudioOptions& options) override; 61 const cricket::AudioOptions& options) override;
62 // Deprecated, use version without constraints. 62 // Deprecated, use version without constraints.
63 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 63 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
64 const MediaConstraintsInterface* constraints) override; 64 const MediaConstraintsInterface* constraints) override;
65 65
66 virtual rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource( 66 virtual rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
67 cricket::VideoCapturer* capturer) override; 67 cricket::VideoCapturer* capturer) override;
68 // This version supports filtering on width, height and frame rate. 68 // This version supports filtering on width, height and frame rate.
69 // For the "constraints=null" case, use the version without constraints. 69 // For the "constraints=null" case, use the version without constraints.
70 // TODO(hta): Design a version without MediaConstraintsInterface. 70 // TODO(hta): Design a version without MediaConstraintsInterface.
71 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5617 71 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5617
72 rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource( 72 rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
73 cricket::VideoCapturer* capturer, 73 cricket::VideoCapturer* capturer,
74 const MediaConstraintsInterface* constraints) override; 74 const MediaConstraintsInterface* constraints) override;
75 75
76 rtc::scoped_refptr<VideoTrackInterface> 76 rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack(
77 CreateVideoTrack(const std::string& id, 77 const std::string& id,
78 VideoSourceInterface* video_source) override; 78 VideoTrackSourceInterface* video_source) override;
79 79
80 rtc::scoped_refptr<AudioTrackInterface> 80 rtc::scoped_refptr<AudioTrackInterface>
81 CreateAudioTrack(const std::string& id, 81 CreateAudioTrack(const std::string& id,
82 AudioSourceInterface* audio_source) override; 82 AudioSourceInterface* audio_source) override;
83 83
84 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override; 84 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override;
85 void StopAecDump() override; 85 void StopAecDump() override;
86 bool StartRtcEventLog(rtc::PlatformFile file) override; 86 bool StartRtcEventLog(rtc::PlatformFile file) override;
87 void StopRtcEventLog() override; 87 void StopRtcEventLog() override;
88 88
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 video_decoder_factory_; 123 video_decoder_factory_;
124 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_; 124 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_;
125 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 125 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
126 126
127 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 127 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
128 }; 128 };
129 129
130 } // namespace webrtc 130 } // namespace webrtc
131 131
132 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 132 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698