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

Side by Side Diff: webrtc/modules/audio_coding/main/test/opus_test.h

Issue 1342933005: Move AudioDecoderOpus next to AudioEncoderOpus (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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_MAIN_TEST_OPUS_TEST_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_OPUS_TEST_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_OPUS_TEST_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_OPUS_TEST_H_
13 13
14 #include <math.h> 14 #include <math.h>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h"
17 #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" 18 #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
18 #include "webrtc/modules/audio_coding/main/test/ACMTest.h" 19 #include "webrtc/modules/audio_coding/main/test/ACMTest.h"
19 #include "webrtc/modules/audio_coding/main/test/Channel.h" 20 #include "webrtc/modules/audio_coding/main/test/Channel.h"
20 #include "webrtc/modules/audio_coding/main/test/PCMFile.h" 21 #include "webrtc/modules/audio_coding/main/test/PCMFile.h"
21 #include "webrtc/modules/audio_coding/main/test/TestStereo.h" 22 #include "webrtc/modules/audio_coding/main/test/TestStereo.h"
22 23
23 namespace webrtc { 24 namespace webrtc {
24 25
25 class OpusTest : public ACMTest { 26 class OpusTest : public ACMTest {
26 public: 27 public:
(...skipping 20 matching lines...) Expand all
47 acm2::ACMResampler resampler_; 48 acm2::ACMResampler resampler_;
48 WebRtcOpusEncInst* opus_mono_encoder_; 49 WebRtcOpusEncInst* opus_mono_encoder_;
49 WebRtcOpusEncInst* opus_stereo_encoder_; 50 WebRtcOpusEncInst* opus_stereo_encoder_;
50 WebRtcOpusDecInst* opus_mono_decoder_; 51 WebRtcOpusDecInst* opus_mono_decoder_;
51 WebRtcOpusDecInst* opus_stereo_decoder_; 52 WebRtcOpusDecInst* opus_stereo_decoder_;
52 }; 53 };
53 54
54 } // namespace webrtc 55 } // namespace webrtc
55 56
56 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_OPUS_TEST_H_ 57 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_OPUS_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698