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

Side by Side Diff: webrtc/media/engine/webrtcmediaengine.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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 WebRtcVideoEncoderFactory* video_encoder_factory, 49 WebRtcVideoEncoderFactory* video_encoder_factory,
50 WebRtcVideoDecoderFactory* video_decoder_factory); 50 WebRtcVideoDecoderFactory* video_decoder_factory);
51 51
52 static MediaEngineInterface* Create( 52 static MediaEngineInterface* Create(
53 webrtc::AudioDeviceModule* adm, 53 webrtc::AudioDeviceModule* adm,
54 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& 54 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
55 audio_decoder_factory, 55 audio_decoder_factory,
56 WebRtcVideoEncoderFactory* video_encoder_factory, 56 WebRtcVideoEncoderFactory* video_encoder_factory,
57 WebRtcVideoDecoderFactory* video_decoder_factory, 57 WebRtcVideoDecoderFactory* video_decoder_factory,
58 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer); 58 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);
59
60 static MediaEngineInterface* Create(
61 webrtc::AudioDeviceModule* adm,
62 const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
63 audio_encoder_factory,
64 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
65 audio_decoder_factory,
66 WebRtcVideoEncoderFactory* video_encoder_factory,
67 WebRtcVideoDecoderFactory* video_decoder_factory);
68
69 static MediaEngineInterface* Create(
70 webrtc::AudioDeviceModule* adm,
71 const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
72 audio_encoder_factory,
73 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
74 audio_decoder_factory,
75 WebRtcVideoEncoderFactory* video_encoder_factory,
76 WebRtcVideoDecoderFactory* video_decoder_factory,
77 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);
59 }; 78 };
60 79
61 // Verify that extension IDs are within 1-byte extension range and are not 80 // Verify that extension IDs are within 1-byte extension range and are not
62 // overlapping. 81 // overlapping.
63 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); 82 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
64 83
65 // Discard any extensions not validated by the 'supported' predicate. Duplicate 84 // Discard any extensions not validated by the 'supported' predicate. Duplicate
66 // extensions are removed if 'filter_redundant_extensions' is set, and also any 85 // extensions are removed if 'filter_redundant_extensions' is set, and also any
67 // mutually exclusive extensions (see implementation for details) are removed. 86 // mutually exclusive extensions (see implementation for details) are removed.
68 std::vector<webrtc::RtpExtension> FilterRtpExtensions( 87 std::vector<webrtc::RtpExtension> FilterRtpExtensions(
69 const std::vector<webrtc::RtpExtension>& extensions, 88 const std::vector<webrtc::RtpExtension>& extensions,
70 bool (*supported)(const std::string&), 89 bool (*supported)(const std::string&),
71 bool filter_redundant_extensions); 90 bool filter_redundant_extensions);
72 91
73 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec( 92 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec(
74 const Codec& codec); 93 const Codec& codec);
75 94
76 } // namespace cricket 95 } // namespace cricket
77 96
78 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ 97 #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