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

Side by Side Diff: webrtc/api/peerconnectionfactory.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/peerconnection.cc ('k') | webrtc/api/peerconnectionfactory.cc » ('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 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack( 73 rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack(
74 const std::string& id, 74 const std::string& id,
75 VideoTrackSourceInterface* video_source) override; 75 VideoTrackSourceInterface* video_source) override;
76 76
77 rtc::scoped_refptr<AudioTrackInterface> 77 rtc::scoped_refptr<AudioTrackInterface>
78 CreateAudioTrack(const std::string& id, 78 CreateAudioTrack(const std::string& id,
79 AudioSourceInterface* audio_source) override; 79 AudioSourceInterface* audio_source) override;
80 80
81 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override; 81 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override;
82 void StopAecDump() override; 82 void StopAecDump() override;
83 // TODO(ivoc) Remove after Chrome is updated. 83 bool StartRtcEventLog(rtc::PlatformFile file) override {
84 bool StartRtcEventLog(rtc::PlatformFile file) override { return false; } 84 return StartRtcEventLog(file, -1);
85 // TODO(ivoc) Remove after Chrome is updated. 85 }
86 bool StartRtcEventLog(rtc::PlatformFile file, 86 bool StartRtcEventLog(rtc::PlatformFile file,
87 int64_t max_size_bytes) override { 87 int64_t max_size_bytes) override;
88 return false; 88 void StopRtcEventLog() override;
89 }
90 // TODO(ivoc) Remove after Chrome is updated.
91 void StopRtcEventLog() override {}
92 89
93 virtual webrtc::MediaControllerInterface* CreateMediaController( 90 virtual webrtc::MediaControllerInterface* CreateMediaController(
94 const cricket::MediaConfig& config) const; 91 const cricket::MediaConfig& config) const;
95 virtual rtc::Thread* signaling_thread(); 92 virtual rtc::Thread* signaling_thread();
96 virtual rtc::Thread* worker_thread(); 93 virtual rtc::Thread* worker_thread();
97 virtual rtc::Thread* network_thread(); 94 virtual rtc::Thread* network_thread();
98 const Options& options() const { return options_; } 95 const Options& options() const { return options_; }
99 96
100 protected: 97 protected:
101 PeerConnectionFactory(); 98 PeerConnectionFactory();
(...skipping 27 matching lines...) Expand all
129 // External Video decoder factory. This can be NULL if the client has not 126 // External Video decoder factory. This can be NULL if the client has not
130 // injected any. In that case, video engine will use the internal SW decoder. 127 // injected any. In that case, video engine will use the internal SW decoder.
131 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 128 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
132 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 129 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
133 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 130 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
134 }; 131 };
135 132
136 } // namespace webrtc 133 } // namespace webrtc
137 134
138 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 135 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698