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

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

Issue 1717583002: Non-constraint interfaces for all constrainable interfaces (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix an ambiguous function Created 4 years, 10 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 27 matching lines...) Expand all
38 options_ = options; 38 options_ = options;
39 } 39 }
40 40
41 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 41 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
42 const PeerConnectionInterface::RTCConfiguration& configuration, 42 const PeerConnectionInterface::RTCConfiguration& configuration,
43 const MediaConstraintsInterface* constraints, 43 const MediaConstraintsInterface* constraints,
44 rtc::scoped_ptr<cricket::PortAllocator> allocator, 44 rtc::scoped_ptr<cricket::PortAllocator> allocator,
45 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 45 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
46 PeerConnectionObserver* observer) override; 46 PeerConnectionObserver* observer) override;
47 47
48 virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
49 const PeerConnectionInterface::RTCConfiguration& configuration,
50 rtc::scoped_ptr<cricket::PortAllocator> allocator,
51 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
52 PeerConnectionObserver* observer) override;
53
48 bool Initialize(); 54 bool Initialize();
49 55
50 rtc::scoped_refptr<MediaStreamInterface> 56 rtc::scoped_refptr<MediaStreamInterface>
51 CreateLocalMediaStream(const std::string& label) override; 57 CreateLocalMediaStream(const std::string& label) override;
52 58
53 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 59 rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
54 const MediaConstraintsInterface* constraints) override; 60 const MediaConstraintsInterface* constraints) override;
61 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
62 const cricket::AudioOptions& options) override;
55 63
56 rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource( 64 rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource(
57 cricket::VideoCapturer* capturer, 65 cricket::VideoCapturer* capturer,
58 const MediaConstraintsInterface* constraints) override; 66 const MediaConstraintsInterface* constraints) override;
67 virtual rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource(
68 cricket::VideoCapturer* capturer) override;
59 69
60 rtc::scoped_refptr<VideoTrackInterface> 70 rtc::scoped_refptr<VideoTrackInterface>
61 CreateVideoTrack(const std::string& id, 71 CreateVideoTrack(const std::string& id,
62 VideoSourceInterface* video_source) override; 72 VideoSourceInterface* video_source) override;
63 73
64 rtc::scoped_refptr<AudioTrackInterface> 74 rtc::scoped_refptr<AudioTrackInterface>
65 CreateAudioTrack(const std::string& id, 75 CreateAudioTrack(const std::string& id,
66 AudioSourceInterface* audio_source) override; 76 AudioSourceInterface* audio_source) override;
67 77
68 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override; 78 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 video_decoder_factory_; 117 video_decoder_factory_;
108 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_; 118 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_;
109 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 119 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
110 120
111 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 121 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
112 }; 122 };
113 123
114 } // namespace webrtc 124 } // namespace webrtc
115 125
116 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 126 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698