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

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

Issue 1991233004: Moved creation of AudioDecoderFactory to inside PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-3
Patch Set: Parental Advisory: Explicit Content Created 4 years, 6 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
(...skipping 13 matching lines...) Expand all
24 class WebRtcVideoDecoderFactory; 24 class WebRtcVideoDecoderFactory;
25 class WebRtcVideoEncoderFactory; 25 class WebRtcVideoEncoderFactory;
26 } 26 }
27 27
28 namespace cricket { 28 namespace cricket {
29 29
30 class WebRtcMediaEngineFactory { 30 class WebRtcMediaEngineFactory {
31 public: 31 public:
32 static MediaEngineInterface* Create( 32 static MediaEngineInterface* Create(
33 webrtc::AudioDeviceModule* adm, 33 webrtc::AudioDeviceModule* adm,
34 WebRtcVideoEncoderFactory* encoder_factory, 34 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
35 WebRtcVideoDecoderFactory* decoder_factory); 35 audio_decoder_factory,
36 WebRtcVideoEncoderFactory* video_encoder_factory,
37 WebRtcVideoDecoderFactory* video_decoder_factory);
36 }; 38 };
37 39
38 // Verify that extension IDs are within 1-byte extension range and are not 40 // Verify that extension IDs are within 1-byte extension range and are not
39 // overlapping. 41 // overlapping.
40 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); 42 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
41 43
42 // Discard any extensions not validated by the 'supported' predicate. Duplicate 44 // Discard any extensions not validated by the 'supported' predicate. Duplicate
43 // extensions are removed if 'filter_redundant_extensions' is set, and also any 45 // extensions are removed if 'filter_redundant_extensions' is set, and also any
44 // mutually exclusive extensions (see implementation for details) are removed. 46 // mutually exclusive extensions (see implementation for details) are removed.
45 std::vector<webrtc::RtpExtension> FilterRtpExtensions( 47 std::vector<webrtc::RtpExtension> FilterRtpExtensions(
46 const std::vector<webrtc::RtpExtension>& extensions, 48 const std::vector<webrtc::RtpExtension>& extensions,
47 bool (*supported)(const std::string&), 49 bool (*supported)(const std::string&),
48 bool filter_redundant_extensions); 50 bool filter_redundant_extensions);
49 51
50 } // namespace cricket 52 } // namespace cricket
51 53
52 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ 54 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/nullwebrtcvideoengine_unittest.cc ('k') | webrtc/media/engine/webrtcmediaengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698