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

Side by Side Diff: webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

Issue 1368933002: Revert of Don't link with audio codecs that we don't use (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@dmove-clean
Patch Set: Created 5 years, 2 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
13 13
14 #include <assert.h> 14 #include <assert.h>
15 15
16 #ifndef AUDIO_DECODER_UNITTEST
17 // If this is compiled as a part of the audio_deoder_unittest, the codec
18 // selection is made in the gypi file instead of in engine_configurations.h.
16 #include "webrtc/engine_configurations.h" 19 #include "webrtc/engine_configurations.h"
20 #endif
17 #include "webrtc/base/constructormagic.h" 21 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" 22 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
19 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" 23 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
20 #ifdef WEBRTC_CODEC_G722 24 #ifdef WEBRTC_CODEC_G722
21 #include "webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h" 25 #include "webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h"
22 #endif 26 #endif
23 #include "webrtc/typedefs.h" 27 #include "webrtc/typedefs.h"
24 28
25 namespace webrtc { 29 namespace webrtc {
26 30
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // Returns the sample rate for |codec_type|. 97 // Returns the sample rate for |codec_type|.
94 int CodecSampleRateHz(NetEqDecoder codec_type); 98 int CodecSampleRateHz(NetEqDecoder codec_type);
95 99
96 // Creates an AudioDecoder object of type |codec_type|. Returns NULL for for 100 // Creates an AudioDecoder object of type |codec_type|. Returns NULL for for
97 // unsupported codecs, and when creating an AudioDecoder is not applicable 101 // unsupported codecs, and when creating an AudioDecoder is not applicable
98 // (e.g., for RED and DTMF/AVT types). 102 // (e.g., for RED and DTMF/AVT types).
99 AudioDecoder* CreateAudioDecoder(NetEqDecoder codec_type); 103 AudioDecoder* CreateAudioDecoder(NetEqDecoder codec_type);
100 104
101 } // namespace webrtc 105 } // namespace webrtc
102 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ 106 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/audio_coding_module.gypi ('k') | webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698