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

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

Issue 2799033006: Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/. (Closed)
Patch Set: More backwards-compatibility! Created 3 years, 7 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/builtin_audio_encoder_factory.cc ('k') | webrtc/audio/BUILD.gn » ('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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 67 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_
68 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 68 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_
69 69
70 #include <memory> 70 #include <memory>
71 #include <string> 71 #include <string>
72 #include <utility> 72 #include <utility>
73 #include <vector> 73 #include <vector>
74 74
75 #include "webrtc/api/audio_codecs/audio_decoder_factory.h" 75 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
76 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
77 // TODO(ossu): Remove this once downstream projects have been updated.
78 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
76 #include "webrtc/api/datachannelinterface.h" 79 #include "webrtc/api/datachannelinterface.h"
77 #include "webrtc/api/dtmfsenderinterface.h" 80 #include "webrtc/api/dtmfsenderinterface.h"
78 #include "webrtc/api/jsep.h" 81 #include "webrtc/api/jsep.h"
79 #include "webrtc/api/mediastreaminterface.h" 82 #include "webrtc/api/mediastreaminterface.h"
80 #include "webrtc/api/rtcerror.h" 83 #include "webrtc/api/rtcerror.h"
81 #include "webrtc/api/rtpreceiverinterface.h" 84 #include "webrtc/api/rtpreceiverinterface.h"
82 #include "webrtc/api/rtpsenderinterface.h" 85 #include "webrtc/api/rtpsenderinterface.h"
83 #include "webrtc/api/stats/rtcstatscollectorcallback.h" 86 #include "webrtc/api/stats/rtcstatscollectorcallback.h"
84 #include "webrtc/api/statstypes.h" 87 #include "webrtc/api/statstypes.h"
85 #include "webrtc/api/umametrics.h" 88 #include "webrtc/api/umametrics.h"
86 #include "webrtc/base/fileutils.h" 89 #include "webrtc/base/fileutils.h"
87 #include "webrtc/base/network.h" 90 #include "webrtc/base/network.h"
88 #include "webrtc/base/rtccertificate.h" 91 #include "webrtc/base/rtccertificate.h"
89 #include "webrtc/base/rtccertificategenerator.h" 92 #include "webrtc/base/rtccertificategenerator.h"
90 #include "webrtc/base/socketaddress.h" 93 #include "webrtc/base/socketaddress.h"
91 #include "webrtc/base/sslstreamadapter.h" 94 #include "webrtc/base/sslstreamadapter.h"
92 #include "webrtc/media/base/mediachannel.h" 95 #include "webrtc/media/base/mediachannel.h"
93 #include "webrtc/media/base/videocapturer.h" 96 #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"
97 #include "webrtc/p2p/base/portallocator.h" 97 #include "webrtc/p2p/base/portallocator.h"
98 98
99 namespace rtc { 99 namespace rtc {
100 class SSLIdentity; 100 class SSLIdentity;
101 class Thread; 101 class Thread;
102 } 102 }
103 103
104 namespace cricket { 104 namespace cricket {
105 class WebRtcVideoDecoderFactory; 105 class WebRtcVideoDecoderFactory;
106 class WebRtcVideoEncoderFactory; 106 class WebRtcVideoEncoderFactory;
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 cricket::WebRtcVideoEncoderFactory* encoder_factory, 1107 cricket::WebRtcVideoEncoderFactory* encoder_factory,
1108 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 1108 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
1109 return CreatePeerConnectionFactory( 1109 return CreatePeerConnectionFactory(
1110 worker_and_network_thread, worker_and_network_thread, signaling_thread, 1110 worker_and_network_thread, worker_and_network_thread, signaling_thread,
1111 default_adm, encoder_factory, decoder_factory); 1111 default_adm, encoder_factory, decoder_factory);
1112 } 1112 }
1113 1113
1114 } // namespace webrtc 1114 } // namespace webrtc
1115 1115
1116 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 1116 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/audio_codecs/builtin_audio_encoder_factory.cc ('k') | webrtc/audio/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698