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

Side by Side Diff: webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc

Issue 2723253005: Fix cyclic deps: rent_a_codec<->audio_coding and rent_a_codec<->neteq (Closed)
Patch Set: Created 3 years, 9 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 "webrtc/modules/audio_coding/acm2/acm_receiver.h" 11 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
12 12
13 #include <algorithm> // std::min 13 #include <algorithm> // std::min
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" 16 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
17 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/safe_conversions.h" 18 #include "webrtc/base/safe_conversions.h"
19 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
19 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 20 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
20 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" 21 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
21 #include "webrtc/system_wrappers/include/clock.h" 22 #include "webrtc/system_wrappers/include/clock.h"
22 #include "webrtc/test/gtest.h" 23 #include "webrtc/test/gtest.h"
23 #include "webrtc/test/testsupport/fileutils.h" 24 #include "webrtc/test/testsupport/fileutils.h"
24 25
25 namespace webrtc { 26 namespace webrtc {
26 27
27 namespace acm2 { 28 namespace acm2 {
28 namespace { 29 namespace {
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 receiver_->last_packet_sample_rate_hz()); 500 receiver_->last_packet_sample_rate_hz());
500 EXPECT_EQ(0, receiver_->LastAudioCodec(&codec)); 501 EXPECT_EQ(0, receiver_->LastAudioCodec(&codec));
501 EXPECT_TRUE(CodecsEqual(c.inst, codec)); 502 EXPECT_TRUE(CodecsEqual(c.inst, codec));
502 } 503 }
503 } 504 }
504 #endif 505 #endif
505 506
506 } // namespace acm2 507 } // namespace acm2
507 508
508 } // namespace webrtc 509 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_receiver.cc ('k') | webrtc/modules/audio_coding/acm2/rent_a_codec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698