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

Side by Side Diff: webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc

Issue 1472173003: Removed api call that will break the upcoming thread checking scheme (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 switch (test_config_->runtime_parameter_setting_scheme) { 821 switch (test_config_->runtime_parameter_setting_scheme) {
822 case RuntimeParameterSettingScheme::SparseStreamMetadataChangeScheme: 822 case RuntimeParameterSettingScheme::SparseStreamMetadataChangeScheme:
823 case RuntimeParameterSettingScheme::FixedMonoStreamMetadataScheme: 823 case RuntimeParameterSettingScheme::FixedMonoStreamMetadataScheme:
824 break; 824 break;
825 case RuntimeParameterSettingScheme::ExtremeStreamMetadataChangeScheme: 825 case RuntimeParameterSettingScheme::ExtremeStreamMetadataChangeScheme:
826 case RuntimeParameterSettingScheme::FixedStereoStreamMetadataScheme: 826 case RuntimeParameterSettingScheme::FixedStereoStreamMetadataScheme:
827 if (capture_count_local % 2 == 0) { 827 if (capture_count_local % 2 == 0) {
828 ASSERT_EQ(AudioProcessing::Error::kNoError, 828 ASSERT_EQ(AudioProcessing::Error::kNoError,
829 apm_->set_stream_delay_ms(30)); 829 apm_->set_stream_delay_ms(30));
830 apm_->set_stream_key_pressed(true); 830 apm_->set_stream_key_pressed(true);
831 apm_->set_output_will_be_muted(true);
832 apm_->set_delay_offset_ms(15); 831 apm_->set_delay_offset_ms(15);
833 EXPECT_EQ(apm_->delay_offset_ms(), 15); 832 EXPECT_EQ(apm_->delay_offset_ms(), 15);
834 EXPECT_GE(apm_->num_reverse_channels(), 0); 833 EXPECT_GE(apm_->num_reverse_channels(), 0);
835 EXPECT_LE(apm_->num_reverse_channels(), 2); 834 EXPECT_LE(apm_->num_reverse_channels(), 2);
836 } else { 835 } else {
837 ASSERT_EQ(AudioProcessing::Error::kNoError, 836 ASSERT_EQ(AudioProcessing::Error::kNoError,
838 apm_->set_stream_delay_ms(50)); 837 apm_->set_stream_delay_ms(50));
839 apm_->set_stream_key_pressed(false); 838 apm_->set_stream_key_pressed(false);
840 apm_->set_output_will_be_muted(false);
841 apm_->set_delay_offset_ms(20); 839 apm_->set_delay_offset_ms(20);
842 EXPECT_EQ(apm_->delay_offset_ms(), 20); 840 EXPECT_EQ(apm_->delay_offset_ms(), 20);
843 apm_->delay_offset_ms(); 841 apm_->delay_offset_ms();
844 apm_->num_reverse_channels(); 842 apm_->num_reverse_channels();
845 EXPECT_GE(apm_->num_reverse_channels(), 0); 843 EXPECT_GE(apm_->num_reverse_channels(), 0);
846 EXPECT_LE(apm_->num_reverse_channels(), 2); 844 EXPECT_LE(apm_->num_reverse_channels(), 2);
847 } 845 }
848 break; 846 break;
849 default: 847 default:
850 FAIL(); 848 FAIL();
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1110 DISABLED_AudioProcessingImplLockExtensive, 1108 DISABLED_AudioProcessingImplLockExtensive,
1111 AudioProcessingImplLockTest, 1109 AudioProcessingImplLockTest,
1112 ::testing::ValuesIn(TestConfig::GenerateExtensiveTestConfigs())); 1110 ::testing::ValuesIn(TestConfig::GenerateExtensiveTestConfigs()));
1113 1111
1114 INSTANTIATE_TEST_CASE_P( 1112 INSTANTIATE_TEST_CASE_P(
1115 DISABLED_AudioProcessingImplLockBrief, 1113 DISABLED_AudioProcessingImplLockBrief,
1116 AudioProcessingImplLockTest, 1114 AudioProcessingImplLockTest,
1117 ::testing::ValuesIn(TestConfig::GenerateBriefTestConfigs())); 1115 ::testing::ValuesIn(TestConfig::GenerateBriefTestConfigs()));
1118 1116
1119 } // namespace webrtc 1117 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698