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

Side by Side Diff: webrtc/media/engine/webrtcmediaengine.h

Issue 2151453002: Revert of WebRtcVoiceEngine: Use AudioDecoderFactory to generate recv codecs. (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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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
11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
12 #define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/config.h" 17 #include "webrtc/config.h"
18 #include "webrtc/media/base/mediaengine.h" 18 #include "webrtc/media/base/mediaengine.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 class AudioDecoderFactory;
22 class AudioDeviceModule; 21 class AudioDeviceModule;
23 } 22 }
24 namespace cricket { 23 namespace cricket {
25 class WebRtcVideoDecoderFactory; 24 class WebRtcVideoDecoderFactory;
26 class WebRtcVideoEncoderFactory; 25 class WebRtcVideoEncoderFactory;
27 } 26 }
28 27
29 namespace cricket { 28 namespace cricket {
30 29
31 class WebRtcMediaEngineFactory { 30 class WebRtcMediaEngineFactory {
(...skipping 22 matching lines...) Expand all
54 // extensions are removed if 'filter_redundant_extensions' is set, and also any 53 // extensions are removed if 'filter_redundant_extensions' is set, and also any
55 // mutually exclusive extensions (see implementation for details) are removed. 54 // mutually exclusive extensions (see implementation for details) are removed.
56 std::vector<webrtc::RtpExtension> FilterRtpExtensions( 55 std::vector<webrtc::RtpExtension> FilterRtpExtensions(
57 const std::vector<webrtc::RtpExtension>& extensions, 56 const std::vector<webrtc::RtpExtension>& extensions,
58 bool (*supported)(const std::string&), 57 bool (*supported)(const std::string&),
59 bool filter_redundant_extensions); 58 bool filter_redundant_extensions);
60 59
61 } // namespace cricket 60 } // namespace cricket
62 61
63 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ 62 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/payload_type_mapper_unittest.cc ('k') | webrtc/media/engine/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698