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

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

Issue 2111813002: Revert of Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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/api/peerconnectionfactory.cc ('k') | webrtc/api/peerconnectioninterface.h » ('j') | 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 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2014 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 CreateVideoSource, 63 CreateVideoSource,
64 cricket::VideoCapturer*) 64 cricket::VideoCapturer*)
65 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, 65 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
66 CreateVideoTrack, 66 CreateVideoTrack,
67 const std::string&, 67 const std::string&,
68 VideoTrackSourceInterface*) 68 VideoTrackSourceInterface*)
69 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, 69 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>,
70 CreateAudioTrack, const std::string&, AudioSourceInterface*) 70 CreateAudioTrack, const std::string&, AudioSourceInterface*)
71 PROXY_METHOD2(bool, StartAecDump, rtc::PlatformFile, int64_t) 71 PROXY_METHOD2(bool, StartAecDump, rtc::PlatformFile, int64_t)
72 PROXY_METHOD0(void, StopAecDump) 72 PROXY_METHOD0(void, StopAecDump)
73 // TODO(ivoc): Remove the StartRtcEventLog and StopRtcEventLog functions as
74 // soon as they are removed from PeerConnectionFactoryInterface.
75 PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile) 73 PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile)
76 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t) 74 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)
77 PROXY_METHOD0(void, StopRtcEventLog) 75 PROXY_METHOD0(void, StopRtcEventLog)
78 76
79 private: 77 private:
80 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( 78 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
81 const PeerConnectionInterface::RTCConfiguration& a1, 79 const PeerConnectionInterface::RTCConfiguration& a1,
82 const MediaConstraintsInterface* a2, 80 const MediaConstraintsInterface* a2,
83 cricket::PortAllocator* a3, 81 cricket::PortAllocator* a3,
84 rtc::RTCCertificateGeneratorInterface* a4, 82 rtc::RTCCertificateGeneratorInterface* a4,
(...skipping 12 matching lines...) Expand all
97 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); 95 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
98 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4); 96 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4);
99 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), 97 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4),
100 a5); 98 a5);
101 } 99 }
102 END_SIGNALING_PROXY() 100 END_SIGNALING_PROXY()
103 101
104 } // namespace webrtc 102 } // namespace webrtc
105 103
106 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ 104 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionfactory.cc ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698