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

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

Issue 2695243005: Injectable audio encoders: BuiltinAudioEncoderFactory (Closed)
Patch Set: Fix build problems on Windows, Android and downstream. Created 3 years, 8 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/audio_codecs/audio_format.cc ('k') | webrtc/media/engine/webrtcvoiceengine.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 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "webrtc/api/statstypes.h" 84 #include "webrtc/api/statstypes.h"
85 #include "webrtc/api/umametrics.h" 85 #include "webrtc/api/umametrics.h"
86 #include "webrtc/base/fileutils.h" 86 #include "webrtc/base/fileutils.h"
87 #include "webrtc/base/network.h" 87 #include "webrtc/base/network.h"
88 #include "webrtc/base/rtccertificate.h" 88 #include "webrtc/base/rtccertificate.h"
89 #include "webrtc/base/rtccertificategenerator.h" 89 #include "webrtc/base/rtccertificategenerator.h"
90 #include "webrtc/base/socketaddress.h" 90 #include "webrtc/base/socketaddress.h"
91 #include "webrtc/base/sslstreamadapter.h" 91 #include "webrtc/base/sslstreamadapter.h"
92 #include "webrtc/media/base/mediachannel.h" 92 #include "webrtc/media/base/mediachannel.h"
93 #include "webrtc/media/base/videocapturer.h" 93 #include "webrtc/media/base/videocapturer.h"
94 #include "webrtc/modules/audio_coding/codecs/audio_encoder_factory.h"
95 // TODO(ossu): Remove this once downstream projects have been updated.
96 #include "webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h"
94 #include "webrtc/p2p/base/portallocator.h" 97 #include "webrtc/p2p/base/portallocator.h"
95 98
96 namespace rtc { 99 namespace rtc {
97 class SSLIdentity; 100 class SSLIdentity;
98 class Thread; 101 class Thread;
99 } 102 }
100 103
101 namespace cricket { 104 namespace cricket {
102 class WebRtcVideoDecoderFactory; 105 class WebRtcVideoDecoderFactory;
103 class WebRtcVideoEncoderFactory; 106 class WebRtcVideoEncoderFactory;
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 // TODO(ivoc) Remove after Chrome is updated. 982 // TODO(ivoc) Remove after Chrome is updated.
980 virtual void StopRtcEventLog() = 0; 983 virtual void StopRtcEventLog() = 0;
981 984
982 protected: 985 protected:
983 // Dtor and ctor protected as objects shouldn't be created or deleted via 986 // Dtor and ctor protected as objects shouldn't be created or deleted via
984 // this interface. 987 // this interface.
985 PeerConnectionFactoryInterface() {} 988 PeerConnectionFactoryInterface() {}
986 ~PeerConnectionFactoryInterface() {} // NOLINT 989 ~PeerConnectionFactoryInterface() {} // NOLINT
987 }; 990 };
988 991
989 // TODO(ossu): Remove these and define a real builtin audio encoder factory
990 // instead.
991 class AudioEncoderFactory : public rtc::RefCountInterface {};
992 inline rtc::scoped_refptr<AudioEncoderFactory>
993 CreateBuiltinAudioEncoderFactory() {
994 return nullptr;
995 }
996
997 // Create a new instance of PeerConnectionFactoryInterface. 992 // Create a new instance of PeerConnectionFactoryInterface.
998 // 993 //
999 // This method relies on the thread it's called on as the "signaling thread" 994 // This method relies on the thread it's called on as the "signaling thread"
1000 // for the PeerConnectionFactory it creates. 995 // for the PeerConnectionFactory it creates.
1001 // 996 //
1002 // As such, if the current thread is not already running an rtc::Thread message 997 // As such, if the current thread is not already running an rtc::Thread message
1003 // loop, an application using this method must eventually either call 998 // loop, an application using this method must eventually either call
1004 // rtc::Thread::Current()->Run(), or call 999 // rtc::Thread::Current()->Run(), or call
1005 // rtc::Thread::Current()->ProcessMessages() within the application's own 1000 // rtc::Thread::Current()->ProcessMessages() within the application's own
1006 // message loop. 1001 // message loop.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 cricket::WebRtcVideoEncoderFactory* encoder_factory, 1093 cricket::WebRtcVideoEncoderFactory* encoder_factory,
1099 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 1094 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
1100 return CreatePeerConnectionFactory( 1095 return CreatePeerConnectionFactory(
1101 worker_and_network_thread, worker_and_network_thread, signaling_thread, 1096 worker_and_network_thread, worker_and_network_thread, signaling_thread,
1102 default_adm, encoder_factory, decoder_factory); 1097 default_adm, encoder_factory, decoder_factory);
1103 } 1098 }
1104 1099
1105 } // namespace webrtc 1100 } // namespace webrtc
1106 1101
1107 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 1102 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/audio_codecs/audio_format.cc ('k') | webrtc/media/engine/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698