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

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

Issue 2668523004: Move AudioDecoder and related stuff to the api/ directory (Closed)
Patch Set: more review fixes Created 3 years, 10 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 #include <memory> 11 #include <memory>
12 12
13 #include "webrtc/modules/audio_coding/neteq/include/neteq.h" 13 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
14 #include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
15
16 #include "webrtc/base/safe_conversions.h" 14 #include "webrtc/base/safe_conversions.h"
17 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
18 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h" 15 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
19 #include "webrtc/modules/audio_coding/neteq/accelerate.h" 16 #include "webrtc/modules/audio_coding/neteq/accelerate.h"
20 #include "webrtc/modules/audio_coding/neteq/expand.h" 17 #include "webrtc/modules/audio_coding/neteq/expand.h"
18 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
21 #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" 19 #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h"
22 #include "webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h" 20 #include "webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h"
23 #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" 21 #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
24 #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h" 22 #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h"
25 #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" 23 #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
26 #include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h" 24 #include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h"
27 #include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h" 25 #include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h"
28 #include "webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h" 26 #include "webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h"
29 #include "webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h" 27 #include "webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h"
28 #include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
30 #include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" 29 #include "webrtc/modules/audio_coding/neteq/preemptive_expand.h"
31 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" 30 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
32 #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" 31 #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
33 #include "webrtc/modules/include/module_common_types.h" 32 #include "webrtc/modules/include/module_common_types.h"
34 #include "webrtc/test/gmock.h" 33 #include "webrtc/test/gmock.h"
35 #include "webrtc/test/gtest.h" 34 #include "webrtc/test/gtest.h"
36 35
37 using ::testing::AtLeast; 36 using ::testing::AtLeast;
38 using ::testing::Return; 37 using ::testing::Return;
39 using ::testing::ReturnNull; 38 using ::testing::ReturnNull;
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1490 EXPECT_CALL(*mock_delay_manager_, BufferLimits(_, _)) 1489 EXPECT_CALL(*mock_delay_manager_, BufferLimits(_, _))
1491 .Times(1) 1490 .Times(1)
1492 .WillOnce(DoAll(SetArgPointee<0>(1), SetArgPointee<1>(2))); 1491 .WillOnce(DoAll(SetArgPointee<0>(1), SetArgPointee<1>(2)));
1493 1492
1494 bool muted; 1493 bool muted;
1495 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output_, &muted)); 1494 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output_, &muted));
1496 EXPECT_EQ(kAccelerate, neteq_->last_operation_for_test()); 1495 EXPECT_EQ(kAccelerate, neteq_->last_operation_for_test());
1497 } 1496 }
1498 1497
1499 }// namespace webrtc 1498 }// namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_impl.cc ('k') | webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698