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

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

Issue 1171033002: Ensures that modules_unittests runs on iOS (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebased Created 5 years, 6 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
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 rtc::scoped_ptr<ThreadWrapper> pull_audio_thread_; 588 rtc::scoped_ptr<ThreadWrapper> pull_audio_thread_;
589 const rtc::scoped_ptr<EventWrapper> test_complete_; 589 const rtc::scoped_ptr<EventWrapper> test_complete_;
590 int send_count_; 590 int send_count_;
591 int insert_packet_count_; 591 int insert_packet_count_;
592 int pull_audio_count_ GUARDED_BY(crit_sect_); 592 int pull_audio_count_ GUARDED_BY(crit_sect_);
593 const rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_; 593 const rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
594 int64_t next_insert_packet_time_ms_ GUARDED_BY(crit_sect_); 594 int64_t next_insert_packet_time_ms_ GUARDED_BY(crit_sect_);
595 rtc::scoped_ptr<SimulatedClock> fake_clock_; 595 rtc::scoped_ptr<SimulatedClock> fake_clock_;
596 }; 596 };
597 597
598 TEST_F(AudioCodingModuleMtTestOldApi, DoTest) { 598 TEST_F(AudioCodingModuleMtTestOldApi, DISABLED_ON_IOS(DoTest)) {
599 EXPECT_EQ(kEventSignaled, RunTest()); 599 EXPECT_EQ(kEventSignaled, RunTest());
600 } 600 }
601 601
602 // This is a multi-threaded ACM test using iSAC. The test encodes audio 602 // This is a multi-threaded ACM test using iSAC. The test encodes audio
603 // from a PCM file. The most recent encoded frame is used as input to the 603 // from a PCM file. The most recent encoded frame is used as input to the
604 // receiving part. Depending on timing, it may happen that the same RTP packet 604 // receiving part. Depending on timing, it may happen that the same RTP packet
605 // is inserted into the receiver multiple times, but this is a valid use-case, 605 // is inserted into the receiver multiple times, but this is a valid use-case,
606 // and simplifies the test code a lot. 606 // and simplifies the test code a lot.
607 class AcmIsacMtTestOldApi : public AudioCodingModuleMtTestOldApi { 607 class AcmIsacMtTestOldApi : public AudioCodingModuleMtTestOldApi {
608 protected: 608 protected:
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 } 688 }
689 } 689 }
690 return false; 690 return false;
691 } 691 }
692 692
693 int last_packet_number_; 693 int last_packet_number_;
694 std::vector<uint8_t> last_payload_vec_; 694 std::vector<uint8_t> last_payload_vec_;
695 test::AudioLoop audio_loop_; 695 test::AudioLoop audio_loop_;
696 }; 696 };
697 697
698 TEST_F(AcmIsacMtTestOldApi, DoTest) { 698 TEST_F(AcmIsacMtTestOldApi, DISABLED_ON_IOS(DoTest)) {
699 EXPECT_EQ(kEventSignaled, RunTest()); 699 EXPECT_EQ(kEventSignaled, RunTest());
700 } 700 }
701 701
702 // Disabling all of these tests on iOS until file support has been added.
703 // See https://code.google.com/p/webrtc/issues/detail?id=4752 for details.
704 #if !defined(WEBRTC_IOS)
705
702 class AcmReceiverBitExactnessOldApi : public ::testing::Test { 706 class AcmReceiverBitExactnessOldApi : public ::testing::Test {
703 public: 707 public:
704 static std::string PlatformChecksum(std::string win64, 708 static std::string PlatformChecksum(std::string win64,
705 std::string android, 709 std::string android,
706 std::string others) { 710 std::string others) {
707 #if defined(_WIN32) && defined(WEBRTC_ARCH_64_BITS) 711 #if defined(_WIN32) && defined(WEBRTC_ARCH_64_BITS)
708 return win64; 712 return win64;
709 #elif defined(WEBRTC_ANDROID) 713 #elif defined(WEBRTC_ANDROID)
710 return android; 714 return android;
711 #else 715 #else
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 Run(32000, 16000, 1000); 1521 Run(32000, 16000, 1000);
1518 } 1522 }
1519 1523
1520 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle16KhzTo8Khz) { 1524 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle16KhzTo8Khz) {
1521 Run(16000, 8000, 1000); 1525 Run(16000, 8000, 1000);
1522 } 1526 }
1523 1527
1524 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) { 1528 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) {
1525 Run(8000, 16000, 1000); 1529 Run(8000, 16000, 1000);
1526 } 1530 }
1531
1532 #endif
1533
1527 } // namespace webrtc 1534 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698