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

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

Issue 2069643002: Added backwards compatible version of WebRtcMediaEngineFactory::Create. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added tests. 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
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcmediaengine.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 (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 11 matching lines...) Expand all
22 } 22 }
23 namespace cricket { 23 namespace cricket {
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 // TODO(ossu): Backwards-compatible interface. Will be deprecated once the
33 // audio decoder factory is fully plumbed and used throughout WebRTC.
34 // See: crbug.com/webrtc/6000
35 static MediaEngineInterface* Create(
36 webrtc::AudioDeviceModule* adm,
37 WebRtcVideoEncoderFactory* video_encoder_factory,
38 WebRtcVideoDecoderFactory* video_decoder_factory);
39
32 static MediaEngineInterface* Create( 40 static MediaEngineInterface* Create(
33 webrtc::AudioDeviceModule* adm, 41 webrtc::AudioDeviceModule* adm,
34 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& 42 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
35 audio_decoder_factory, 43 audio_decoder_factory,
36 WebRtcVideoEncoderFactory* video_encoder_factory, 44 WebRtcVideoEncoderFactory* video_encoder_factory,
37 WebRtcVideoDecoderFactory* video_decoder_factory); 45 WebRtcVideoDecoderFactory* video_decoder_factory);
38 }; 46 };
39 47
40 // Verify that extension IDs are within 1-byte extension range and are not 48 // Verify that extension IDs are within 1-byte extension range and are not
41 // overlapping. 49 // overlapping.
42 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); 50 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
43 51
44 // Discard any extensions not validated by the 'supported' predicate. Duplicate 52 // Discard any extensions not validated by the 'supported' predicate. Duplicate
45 // 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
46 // mutually exclusive extensions (see implementation for details) are removed. 54 // mutually exclusive extensions (see implementation for details) are removed.
47 std::vector<webrtc::RtpExtension> FilterRtpExtensions( 55 std::vector<webrtc::RtpExtension> FilterRtpExtensions(
48 const std::vector<webrtc::RtpExtension>& extensions, 56 const std::vector<webrtc::RtpExtension>& extensions,
49 bool (*supported)(const std::string&), 57 bool (*supported)(const std::string&),
50 bool filter_redundant_extensions); 58 bool filter_redundant_extensions);
51 59
52 } // namespace cricket 60 } // namespace cricket
53 61
54 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ 62 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcmediaengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698