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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc

Issue 1348613003: Move AudioDecoderPcm* next to AudioEncoderPcm* (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@dmove-pcm16
Patch Set: rebase 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 #include <string.h> 11 #include <string.h>
12 #include <vector> 12 #include <vector>
13 13
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "webrtc/base/md5digest.h" 15 #include "webrtc/base/md5digest.h"
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/base/thread_annotations.h" 17 #include "webrtc/base/thread_annotations.h"
18 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" 18 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
19 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_decoder_pcm.h"
19 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h" 20 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
20 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_i sac.h" 21 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_i sac.h"
21 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h" 22 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
22 #include "webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h" 23 #include "webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h"
23 #include "webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h" 24 #include "webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h"
24 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" 25 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
25 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedef s.h" 26 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedef s.h"
26 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" 27 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
27 #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" 28 #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h"
28 #include "webrtc/modules/audio_coding/neteq/tools/audio_checksum.h" 29 #include "webrtc/modules/audio_coding/neteq/tools/audio_checksum.h"
(...skipping 1718 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 Run(16000, 8000, 1000); 1748 Run(16000, 8000, 1000);
1748 } 1749 }
1749 1750
1750 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) { 1751 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) {
1751 Run(8000, 16000, 1000); 1752 Run(8000, 16000, 1000);
1752 } 1753 }
1753 1754
1754 #endif 1755 #endif
1755 1756
1756 } // namespace webrtc 1757 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698