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

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

Issue 1178843002: Adds support for webrtc::test::ResourcePath on iOS (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: nits 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 } 496 }
497 } 497 }
498 return false; 498 return false;
499 } 499 }
500 500
501 int last_packet_number_; 501 int last_packet_number_;
502 std::vector<uint8_t> last_payload_vec_; 502 std::vector<uint8_t> last_payload_vec_;
503 test::AudioLoop audio_loop_; 503 test::AudioLoop audio_loop_;
504 }; 504 };
505 505
506 #if defined(WEBRTC_IOS) 506 TEST_F(AcmIsacMtTest, DoTest) {
507 // See https://code.google.com/p/webrtc/issues/detail?id=4752 for details.
508 #define MAYBE_DoTest DISABLED_DoTest
509 #else
510 #define MAYBE_DoTest DoTest
511 #endif
512 TEST_F(AcmIsacMtTest, MAYBE_DoTest) {
513 EXPECT_EQ(kEventSignaled, RunTest()); 507 EXPECT_EQ(kEventSignaled, RunTest());
514 } 508 }
515 509
516 // Disabling all of these tests on iOS until file support has been added. 510 // Disabling all of these tests on iOS for now.
517 // See https://code.google.com/p/webrtc/issues/detail?id=4752 for details. 511 // See https://code.google.com/p/webrtc/issues/detail?id=4768 for details.
518 #if !defined(WEBRTC_IOS) 512 #if !defined(WEBRTC_IOS)
519 513
520 class AcmReceiverBitExactness : public ::testing::Test { 514 class AcmReceiverBitExactness : public ::testing::Test {
521 public: 515 public:
522 static std::string PlatformChecksum(std::string win64, 516 static std::string PlatformChecksum(std::string win64,
523 std::string android, 517 std::string android,
524 std::string others) { 518 std::string others) {
525 #if defined(_WIN32) && defined(WEBRTC_ARCH_64_BITS) 519 #if defined(_WIN32) && defined(WEBRTC_ARCH_64_BITS)
526 return win64; 520 return win64;
527 #elif defined(WEBRTC_ANDROID) 521 #elif defined(WEBRTC_ANDROID)
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
969 "d781cce1ab986b618d0da87226cdde30", 963 "d781cce1ab986b618d0da87226cdde30",
970 "1a1fe04dd12e755949987c8d729fb3e0", 964 "1a1fe04dd12e755949987c8d729fb3e0",
971 "d781cce1ab986b618d0da87226cdde30"), 965 "d781cce1ab986b618d0da87226cdde30"),
972 50, 966 50,
973 test::AcmReceiveTest::kStereoOutput); 967 test::AcmReceiveTest::kStereoOutput);
974 } 968 }
975 969
976 #endif 970 #endif
977 971
978 } // namespace webrtc 972 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698