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

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

Issue 1368843003: Don't link with audio codecs that we don't use (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add comment Created 5 years, 2 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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 for (int i = 0; i < kLoops; ++i) { 335 for (int i = 0; i < kLoops; ++i) {
336 EXPECT_EQ(i / k10MsBlocksPerPacket, packet_cb_.num_calls()); 336 EXPECT_EQ(i / k10MsBlocksPerPacket, packet_cb_.num_calls());
337 if (packet_cb_.num_calls() > 0) 337 if (packet_cb_.num_calls() > 0)
338 EXPECT_EQ(kAudioFrameSpeech, packet_cb_.last_frame_type()); 338 EXPECT_EQ(kAudioFrameSpeech, packet_cb_.last_frame_type());
339 InsertAudioAndVerifyEncoding(); 339 InsertAudioAndVerifyEncoding();
340 } 340 }
341 EXPECT_EQ(kLoops / k10MsBlocksPerPacket, packet_cb_.num_calls()); 341 EXPECT_EQ(kLoops / k10MsBlocksPerPacket, packet_cb_.num_calls());
342 EXPECT_EQ(kAudioFrameSpeech, packet_cb_.last_frame_type()); 342 EXPECT_EQ(kAudioFrameSpeech, packet_cb_.last_frame_type());
343 } 343 }
344 344
345 #if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)
346 #define IF_ISAC(x) x
347 #else
348 #define IF_ISAC(x) DISABLED_##x
349 #endif
350
345 // Verifies that the RTP timestamp series is not reset when the codec is 351 // Verifies that the RTP timestamp series is not reset when the codec is
346 // changed. 352 // changed.
347 TEST_F(AudioCodingModuleTestOldApi, TimestampSeriesContinuesWhenCodecChanges) { 353 TEST_F(AudioCodingModuleTestOldApi,
354 IF_ISAC(TimestampSeriesContinuesWhenCodecChanges)) {
348 RegisterCodec(); // This registers the default codec. 355 RegisterCodec(); // This registers the default codec.
349 uint32_t expected_ts = input_frame_.timestamp_; 356 uint32_t expected_ts = input_frame_.timestamp_;
350 int blocks_per_packet = codec_.pacsize / (kSampleRateHz / 100); 357 int blocks_per_packet = codec_.pacsize / (kSampleRateHz / 100);
351 // Encode 5 packets of the first codec type. 358 // Encode 5 packets of the first codec type.
352 const int kNumPackets1 = 5; 359 const int kNumPackets1 = 5;
353 for (int j = 0; j < kNumPackets1; ++j) { 360 for (int j = 0; j < kNumPackets1; ++j) {
354 for (int i = 0; i < blocks_per_packet; ++i) { 361 for (int i = 0; i < blocks_per_packet; ++i) {
355 EXPECT_EQ(j, packet_cb_.num_calls()); 362 EXPECT_EQ(j, packet_cb_.num_calls());
356 InsertAudio(); 363 InsertAudio();
357 } 364 }
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 } 700 }
694 } 701 }
695 return false; 702 return false;
696 } 703 }
697 704
698 int last_packet_number_; 705 int last_packet_number_;
699 std::vector<uint8_t> last_payload_vec_; 706 std::vector<uint8_t> last_payload_vec_;
700 test::AudioLoop audio_loop_; 707 test::AudioLoop audio_loop_;
701 }; 708 };
702 709
703 TEST_F(AcmIsacMtTestOldApi, DISABLED_ON_IOS(DoTest)) { 710 TEST_F(AcmIsacMtTestOldApi, DISABLED_ON_IOS(IF_ISAC(DoTest))) {
704 EXPECT_EQ(kEventSignaled, RunTest()); 711 EXPECT_EQ(kEventSignaled, RunTest());
705 } 712 }
706 713
707 class AcmReRegisterIsacMtTestOldApi : public AudioCodingModuleTestOldApi { 714 class AcmReRegisterIsacMtTestOldApi : public AudioCodingModuleTestOldApi {
708 protected: 715 protected:
709 static const int kRegisterAfterNumPackets = 5; 716 static const int kRegisterAfterNumPackets = 5;
710 static const int kNumPackets = 10; 717 static const int kNumPackets = 10;
711 static const int kPacketSizeMs = 30; 718 static const int kPacketSizeMs = 30;
712 static const int kPacketSizeSamples = kPacketSizeMs * 16; 719 static const int kPacketSizeSamples = kPacketSizeMs * 16;
713 720
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 const rtc::scoped_ptr<EventWrapper> test_complete_; 854 const rtc::scoped_ptr<EventWrapper> test_complete_;
848 const rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_; 855 const rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
849 bool codec_registered_ GUARDED_BY(crit_sect_); 856 bool codec_registered_ GUARDED_BY(crit_sect_);
850 int receive_packet_count_ GUARDED_BY(crit_sect_); 857 int receive_packet_count_ GUARDED_BY(crit_sect_);
851 int64_t next_insert_packet_time_ms_ GUARDED_BY(crit_sect_); 858 int64_t next_insert_packet_time_ms_ GUARDED_BY(crit_sect_);
852 rtc::scoped_ptr<AudioEncoderIsac> isac_encoder_; 859 rtc::scoped_ptr<AudioEncoderIsac> isac_encoder_;
853 rtc::scoped_ptr<SimulatedClock> fake_clock_; 860 rtc::scoped_ptr<SimulatedClock> fake_clock_;
854 test::AudioLoop audio_loop_; 861 test::AudioLoop audio_loop_;
855 }; 862 };
856 863
857 TEST_F(AcmReRegisterIsacMtTestOldApi, DISABLED_ON_IOS(DoTest)) { 864 TEST_F(AcmReRegisterIsacMtTestOldApi, DISABLED_ON_IOS(IF_ISAC(DoTest))) {
858 EXPECT_EQ(kEventSignaled, RunTest()); 865 EXPECT_EQ(kEventSignaled, RunTest());
859 } 866 }
860 867
861 // Disabling all of these tests on iOS until file support has been added. 868 // Disabling all of these tests on iOS until file support has been added.
862 // See https://code.google.com/p/webrtc/issues/detail?id=4752 for details. 869 // See https://code.google.com/p/webrtc/issues/detail?id=4752 for details.
863 #if !defined(WEBRTC_IOS) 870 #if !defined(WEBRTC_IOS)
864 871
865 class AcmReceiverBitExactnessOldApi : public ::testing::Test { 872 class AcmReceiverBitExactnessOldApi : public ::testing::Test {
866 public: 873 public:
867 static std::string PlatformChecksum(std::string win64, 874 static std::string PlatformChecksum(std::string win64,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 ed.rtp_payload_type, ed.external_decoder, 926 ed.rtp_payload_type, ed.external_decoder,
920 ed.sample_rate_hz, ed.num_channels)); 927 ed.sample_rate_hz, ed.num_channels));
921 } 928 }
922 test.Run(); 929 test.Run();
923 930
924 std::string checksum_string = checksum.Finish(); 931 std::string checksum_string = checksum.Finish();
925 EXPECT_EQ(checksum_ref, checksum_string); 932 EXPECT_EQ(checksum_ref, checksum_string);
926 } 933 }
927 }; 934 };
928 935
936 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISAC)) && \
937 defined(WEBRTC_CODEC_ILBC) && defined(WEBRTC_CODEC_G722)
938 #define IF_ALL_CODECS(x) x
939 #else
940 #define IF_ALL_CODECS(x) DISABLED_##x
941 #endif
942
929 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 943 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199
930 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64) 944 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64)
931 #define MAYBE_8kHzOutput DISABLED_8kHzOutput 945 #define MAYBE_8kHzOutput DISABLED_8kHzOutput
932 #else 946 #else
933 #define MAYBE_8kHzOutput 8kHzOutput 947 #define MAYBE_8kHzOutput 8kHzOutput
934 #endif 948 #endif
935 TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_8kHzOutput) { 949 TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_8kHzOutput)) {
936 Run(8000, PlatformChecksum("dcee98c623b147ebe1b40dd30efa896e", 950 Run(8000, PlatformChecksum("dcee98c623b147ebe1b40dd30efa896e",
937 "adc92e173f908f93b96ba5844209815a", 951 "adc92e173f908f93b96ba5844209815a",
938 "908002dc01fc4eb1d2be24eb1d3f354b"), 952 "908002dc01fc4eb1d2be24eb1d3f354b"),
939 std::vector<ExternalDecoder>()); 953 std::vector<ExternalDecoder>());
940 } 954 }
941 955
942 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 956 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199
943 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64) 957 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64)
944 #define MAYBE_16kHzOutput DISABLED_16kHzOutput 958 #define MAYBE_16kHzOutput DISABLED_16kHzOutput
945 #else 959 #else
946 #define MAYBE_16kHzOutput 16kHzOutput 960 #define MAYBE_16kHzOutput 16kHzOutput
947 #endif 961 #endif
948 TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_16kHzOutput) { 962 TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_16kHzOutput)) {
949 Run(16000, PlatformChecksum("f790e7a8cce4e2c8b7bb5e0e4c5dac0d", 963 Run(16000, PlatformChecksum("f790e7a8cce4e2c8b7bb5e0e4c5dac0d",
950 "8cffa6abcb3e18e33b9d857666dff66a", 964 "8cffa6abcb3e18e33b9d857666dff66a",
951 "a909560b5ca49fa472b17b7b277195e9"), 965 "a909560b5ca49fa472b17b7b277195e9"),
952 std::vector<ExternalDecoder>()); 966 std::vector<ExternalDecoder>());
953 } 967 }
954 968
955 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 969 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199
956 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64) 970 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64)
957 #define MAYBE_32kHzOutput DISABLED_32kHzOutput 971 #define MAYBE_32kHzOutput DISABLED_32kHzOutput
958 #else 972 #else
959 #define MAYBE_32kHzOutput 32kHzOutput 973 #define MAYBE_32kHzOutput 32kHzOutput
960 #endif 974 #endif
961 TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_32kHzOutput) { 975 TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_32kHzOutput)) {
962 Run(32000, PlatformChecksum("306e0d990ee6e92de3fbecc0123ece37", 976 Run(32000, PlatformChecksum("306e0d990ee6e92de3fbecc0123ece37",
963 "3e126fe894720c3f85edadcc91964ba5", 977 "3e126fe894720c3f85edadcc91964ba5",
964 "441aab4b347fb3db4e9244337aca8d8e"), 978 "441aab4b347fb3db4e9244337aca8d8e"),
965 std::vector<ExternalDecoder>()); 979 std::vector<ExternalDecoder>());
966 } 980 }
967 981
968 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 982 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199
969 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64) 983 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64)
970 #define MAYBE_48kHzOutput DISABLED_48kHzOutput 984 #define MAYBE_48kHzOutput DISABLED_48kHzOutput
971 #else 985 #else
972 #define MAYBE_48kHzOutput 48kHzOutput 986 #define MAYBE_48kHzOutput 48kHzOutput
973 #endif 987 #endif
974 TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_48kHzOutput) { 988 TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_48kHzOutput)) {
975 Run(48000, PlatformChecksum("aa7c232f63a67b2a72703593bdd172e0", 989 Run(48000, PlatformChecksum("aa7c232f63a67b2a72703593bdd172e0",
976 "0155665e93067c4e89256b944dd11999", 990 "0155665e93067c4e89256b944dd11999",
977 "4ee2730fa1daae755e8a8fd3abd779ec"), 991 "4ee2730fa1daae755e8a8fd3abd779ec"),
978 std::vector<ExternalDecoder>()); 992 std::vector<ExternalDecoder>());
979 } 993 }
980 994
981 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 995 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199
982 #if defined(WEBRTC_ANDROID) && defined(__aarch64__) 996 #if defined(WEBRTC_ANDROID) && defined(__aarch64__)
983 #define MAYBE_48kHzOutputExternalDecoder DISABLED_48kHzOutputExternalDecoder 997 #define MAYBE_48kHzOutputExternalDecoder DISABLED_48kHzOutputExternalDecoder
984 #else 998 #else
985 #define MAYBE_48kHzOutputExternalDecoder 48kHzOutputExternalDecoder 999 #define MAYBE_48kHzOutputExternalDecoder 48kHzOutputExternalDecoder
986 #endif 1000 #endif
987 TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_48kHzOutputExternalDecoder) { 1001 TEST_F(AcmReceiverBitExactnessOldApi,
1002 IF_ALL_CODECS(MAYBE_48kHzOutputExternalDecoder)) {
988 AudioDecoderPcmU decoder(1); 1003 AudioDecoderPcmU decoder(1);
989 MockAudioDecoder mock_decoder; 1004 MockAudioDecoder mock_decoder;
990 // Set expectations on the mock decoder and also delegate the calls to the 1005 // Set expectations on the mock decoder and also delegate the calls to the
991 // real decoder. 1006 // real decoder.
992 EXPECT_CALL(mock_decoder, IncomingPacket(_, _, _, _, _)) 1007 EXPECT_CALL(mock_decoder, IncomingPacket(_, _, _, _, _))
993 .Times(AtLeast(1)) 1008 .Times(AtLeast(1))
994 .WillRepeatedly(Invoke(&decoder, &AudioDecoderPcmU::IncomingPacket)); 1009 .WillRepeatedly(Invoke(&decoder, &AudioDecoderPcmU::IncomingPacket));
995 EXPECT_CALL(mock_decoder, Channels()) 1010 EXPECT_CALL(mock_decoder, Channels())
996 .Times(AtLeast(1)) 1011 .Times(AtLeast(1))
997 .WillRepeatedly(Invoke(&decoder, &AudioDecoderPcmU::Channels)); 1012 .WillRepeatedly(Invoke(&decoder, &AudioDecoderPcmU::Channels));
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1193 uint32_t last_timestamp_; 1208 uint32_t last_timestamp_;
1194 rtc::Md5Digest payload_checksum_; 1209 rtc::Md5Digest payload_checksum_;
1195 }; 1210 };
1196 1211
1197 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 1212 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199
1198 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64) 1213 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64)
1199 #define MAYBE_IsacWb30ms DISABLED_IsacWb30ms 1214 #define MAYBE_IsacWb30ms DISABLED_IsacWb30ms
1200 #else 1215 #else
1201 #define MAYBE_IsacWb30ms IsacWb30ms 1216 #define MAYBE_IsacWb30ms IsacWb30ms
1202 #endif 1217 #endif
1203 TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacWb30ms) { 1218 TEST_F(AcmSenderBitExactnessOldApi, IF_ISAC(MAYBE_IsacWb30ms)) {
1204 ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 480, 480)); 1219 ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 480, 480));
1205 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( 1220 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
1206 "c7e5bdadfa2871df95639fcc297cf23d", 1221 "c7e5bdadfa2871df95639fcc297cf23d",
1207 "0499ca260390769b3172136faad925b9", 1222 "0499ca260390769b3172136faad925b9",
1208 "0b58f9eeee43d5891f5f6c75e77984a3"), 1223 "0b58f9eeee43d5891f5f6c75e77984a3"),
1209 AcmReceiverBitExactnessOldApi::PlatformChecksum( 1224 AcmReceiverBitExactnessOldApi::PlatformChecksum(
1210 "d42cb5195463da26c8129bbfe73a22e6", 1225 "d42cb5195463da26c8129bbfe73a22e6",
1211 "83de248aea9c3c2bd680b6952401b4ca", 1226 "83de248aea9c3c2bd680b6952401b4ca",
1212 "3c79f16f34218271f3dca4e2b1dfe1bb"), 1227 "3c79f16f34218271f3dca4e2b1dfe1bb"),
1213 33, 1228 33,
1214 test::AcmReceiveTestOldApi::kMonoOutput); 1229 test::AcmReceiveTestOldApi::kMonoOutput);
1215 } 1230 }
1216 1231
1217 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 1232 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199
1218 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64) 1233 #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64)
1219 #define MAYBE_IsacWb60ms DISABLED_IsacWb60ms 1234 #define MAYBE_IsacWb60ms DISABLED_IsacWb60ms
1220 #else 1235 #else
1221 #define MAYBE_IsacWb60ms IsacWb60ms 1236 #define MAYBE_IsacWb60ms IsacWb60ms
1222 #endif 1237 #endif
1223 TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacWb60ms) { 1238 TEST_F(AcmSenderBitExactnessOldApi, IF_ISAC(MAYBE_IsacWb60ms)) {
1224 ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 960, 960)); 1239 ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 960, 960));
1225 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( 1240 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
1226 "14d63c5f08127d280e722e3191b73bdd", 1241 "14d63c5f08127d280e722e3191b73bdd",
1227 "8da003e16c5371af2dc2be79a50f9076", 1242 "8da003e16c5371af2dc2be79a50f9076",
1228 "1ad29139a04782a33daad8c2b9b35875"), 1243 "1ad29139a04782a33daad8c2b9b35875"),
1229 AcmReceiverBitExactnessOldApi::PlatformChecksum( 1244 AcmReceiverBitExactnessOldApi::PlatformChecksum(
1230 "ebe04a819d3a9d83a83a17f271e1139a", 1245 "ebe04a819d3a9d83a83a17f271e1139a",
1231 "97aeef98553b5a4b5a68f8b716e8eaf0", 1246 "97aeef98553b5a4b5a68f8b716e8eaf0",
1232 "9e0a0ab743ad987b55b8e14802769c56"), 1247 "9e0a0ab743ad987b55b8e14802769c56"),
1233 16, 1248 16,
1234 test::AcmReceiveTestOldApi::kMonoOutput); 1249 test::AcmReceiveTestOldApi::kMonoOutput);
1235 } 1250 }
1236 1251
1237 TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(IsacSwb30ms)) { 1252 #ifdef WEBRTC_CODEC_ISAC
1253 #define IF_ISAC_FLOAT(x) x
1254 #else
1255 #define IF_ISAC_FLOAT(x) DISABLED_##x
1256 #endif
1257
1258 TEST_F(AcmSenderBitExactnessOldApi,
1259 DISABLED_ON_ANDROID(IF_ISAC_FLOAT(IsacSwb30ms))) {
1238 ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 32000, 1, 104, 960, 960)); 1260 ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 32000, 1, 104, 960, 960));
1239 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( 1261 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
1240 "2b3c387d06f00b7b7aad4c9be56fb83d", 1262 "2b3c387d06f00b7b7aad4c9be56fb83d",
1241 "", 1263 "",
1242 "5683b58da0fbf2063c7adc2e6bfb3fb8"), 1264 "5683b58da0fbf2063c7adc2e6bfb3fb8"),
1243 AcmReceiverBitExactnessOldApi::PlatformChecksum( 1265 AcmReceiverBitExactnessOldApi::PlatformChecksum(
1244 "bcc2041e7744c7ebd9f701866856849c", 1266 "bcc2041e7744c7ebd9f701866856849c",
1245 "", 1267 "",
1246 "ce86106a93419aefb063097108ec94ab"), 1268 "ce86106a93419aefb063097108ec94ab"),
1247 33, test::AcmReceiveTestOldApi::kMonoOutput); 1269 33, test::AcmReceiveTestOldApi::kMonoOutput);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
1320 } 1342 }
1321 1343
1322 TEST_F(AcmSenderBitExactnessOldApi, Pcma_stereo_20ms) { 1344 TEST_F(AcmSenderBitExactnessOldApi, Pcma_stereo_20ms) {
1323 ASSERT_NO_FATAL_FAILURE(SetUpTest("PCMA", 8000, 2, 118, 160, 160)); 1345 ASSERT_NO_FATAL_FAILURE(SetUpTest("PCMA", 8000, 2, 118, 160, 160));
1324 Run("a5c6d83c5b7cedbeff734238220a4b0c", 1346 Run("a5c6d83c5b7cedbeff734238220a4b0c",
1325 "92b282c83efd20e7eeef52ba40842cf7", 1347 "92b282c83efd20e7eeef52ba40842cf7",
1326 50, 1348 50,
1327 test::AcmReceiveTestOldApi::kStereoOutput); 1349 test::AcmReceiveTestOldApi::kStereoOutput);
1328 } 1350 }
1329 1351
1330 TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(Ilbc_30ms)) { 1352 #ifdef WEBRTC_CODEC_ILBC
1353 #define IF_ILBC(x) x
1354 #else
1355 #define IF_ILBC(x) DISABLED_##x
1356 #endif
1357
1358 TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(IF_ILBC(Ilbc_30ms))) {
1331 ASSERT_NO_FATAL_FAILURE(SetUpTest("ILBC", 8000, 1, 102, 240, 240)); 1359 ASSERT_NO_FATAL_FAILURE(SetUpTest("ILBC", 8000, 1, 102, 240, 240));
1332 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( 1360 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
1333 "7b6ec10910debd9af08011d3ed5249f7", 1361 "7b6ec10910debd9af08011d3ed5249f7",
1334 "android_audio", 1362 "android_audio",
1335 "7b6ec10910debd9af08011d3ed5249f7"), 1363 "7b6ec10910debd9af08011d3ed5249f7"),
1336 AcmReceiverBitExactnessOldApi::PlatformChecksum( 1364 AcmReceiverBitExactnessOldApi::PlatformChecksum(
1337 "cfae2e9f6aba96e145f2bcdd5050ce78", 1365 "cfae2e9f6aba96e145f2bcdd5050ce78",
1338 "android_payload", 1366 "android_payload",
1339 "cfae2e9f6aba96e145f2bcdd5050ce78"), 1367 "cfae2e9f6aba96e145f2bcdd5050ce78"),
1340 33, 1368 33,
1341 test::AcmReceiveTestOldApi::kMonoOutput); 1369 test::AcmReceiveTestOldApi::kMonoOutput);
1342 } 1370 }
1343 1371
1344 TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(G722_20ms)) { 1372 #ifdef WEBRTC_CODEC_G722
1373 #define IF_G722(x) x
1374 #else
1375 #define IF_G722(x) DISABLED_##x
1376 #endif
1377
1378 TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(IF_G722(G722_20ms))) {
1345 ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 1, 9, 320, 160)); 1379 ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 1, 9, 320, 160));
1346 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( 1380 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
1347 "7d759436f2533582950d148b5161a36c", 1381 "7d759436f2533582950d148b5161a36c",
1348 "android_audio", 1382 "android_audio",
1349 "7d759436f2533582950d148b5161a36c"), 1383 "7d759436f2533582950d148b5161a36c"),
1350 AcmReceiverBitExactnessOldApi::PlatformChecksum( 1384 AcmReceiverBitExactnessOldApi::PlatformChecksum(
1351 "fc68a87e1380614e658087cb35d5ca10", 1385 "fc68a87e1380614e658087cb35d5ca10",
1352 "android_payload", 1386 "android_payload",
1353 "fc68a87e1380614e658087cb35d5ca10"), 1387 "fc68a87e1380614e658087cb35d5ca10"),
1354 50, 1388 50,
1355 test::AcmReceiveTestOldApi::kMonoOutput); 1389 test::AcmReceiveTestOldApi::kMonoOutput);
1356 } 1390 }
1357 1391
1358 TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(G722_stereo_20ms)) { 1392 TEST_F(AcmSenderBitExactnessOldApi,
1393 DISABLED_ON_ANDROID(IF_G722(G722_stereo_20ms))) {
1359 ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 2, 119, 320, 160)); 1394 ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 2, 119, 320, 160));
1360 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( 1395 Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
1361 "7190ee718ab3d80eca181e5f7140c210", 1396 "7190ee718ab3d80eca181e5f7140c210",
1362 "android_audio", 1397 "android_audio",
1363 "7190ee718ab3d80eca181e5f7140c210"), 1398 "7190ee718ab3d80eca181e5f7140c210"),
1364 AcmReceiverBitExactnessOldApi::PlatformChecksum( 1399 AcmReceiverBitExactnessOldApi::PlatformChecksum(
1365 "66516152eeaa1e650ad94ff85f668dac", 1400 "66516152eeaa1e650ad94ff85f668dac",
1366 "android_payload", 1401 "android_payload",
1367 "66516152eeaa1e650ad94ff85f668dac"), 1402 "66516152eeaa1e650ad94ff85f668dac"),
1368 50, 1403 50,
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 Run(16000, 8000, 1000); 1783 Run(16000, 8000, 1000);
1749 } 1784 }
1750 1785
1751 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) { 1786 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) {
1752 Run(8000, 16000, 1000); 1787 Run(8000, 16000, 1000);
1753 } 1788 }
1754 1789
1755 #endif 1790 #endif
1756 1791
1757 } // namespace webrtc 1792 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698