Commit 2a3d7ee4 authored by rmcilroy's avatar rmcilroy Committed by Commit bot

Reenable AudioAndroidOutputTest.StartOutputStreamCallbacks on Arm64.

BUG=418029

Review URL: https://codereview.chromium.org/613153003

Cr-Commit-Position: refs/heads/master@{#297406}
parent ab3bb07f
...@@ -811,23 +811,9 @@ TEST_P(AudioAndroidInputTest, ...@@ -811,23 +811,9 @@ TEST_P(AudioAndroidInputTest,
StartInputStreamCallbacks(params); StartInputStreamCallbacks(params);
} }
#if defined(__aarch64__)
// Disable StartOutputStreamCallbacks and
// StartOutputStreamCallbacksNonDefaultParameters on Arm64: crbug.com/418029
#define MAYBE_StartOutputStreamCallbacks DISABLED_StartOutputStreamCallbacks
#define MAYBE_StartOutputStreamCallbacksNonDefaultParameters \
DISABLED_StartOutputStreamCallbacksNonDefaultParameters
#else
#define MAYBE_StartOutputStreamCallbacks StartOutputStreamCallbacks
#define MAYBE_StartOutputStreamCallbacksNonDefaultParameters \
StartOutputStreamCallbacksNonDefaultParameters
#endif
// Start output streaming using default output parameters and ensure that the // Start output streaming using default output parameters and ensure that the
// callback sequence is sane. // callback sequence is sane.
TEST_F(AudioAndroidOutputTest, MAYBE_StartOutputStreamCallbacks) { TEST_F(AudioAndroidOutputTest, StartOutputStreamCallbacks) {
GetDefaultOutputStreamParametersOnAudioThread(); GetDefaultOutputStreamParametersOnAudioThread();
StartOutputStreamCallbacks(audio_output_parameters()); StartOutputStreamCallbacks(audio_output_parameters());
} }
...@@ -837,8 +823,7 @@ TEST_F(AudioAndroidOutputTest, MAYBE_StartOutputStreamCallbacks) { ...@@ -837,8 +823,7 @@ TEST_F(AudioAndroidOutputTest, MAYBE_StartOutputStreamCallbacks) {
// select a 10ms buffer size instead of the default size and to open up the // select a 10ms buffer size instead of the default size and to open up the
// device in mono. // device in mono.
// TODO(henrika): possibly add support for more variations. // TODO(henrika): possibly add support for more variations.
TEST_F(AudioAndroidOutputTest, TEST_F(AudioAndroidOutputTest, StartOutputStreamCallbacksNonDefaultParameters) {
MAYBE_StartOutputStreamCallbacksNonDefaultParameters) {
GetDefaultOutputStreamParametersOnAudioThread(); GetDefaultOutputStreamParametersOnAudioThread();
AudioParameters params(audio_output_parameters().format(), AudioParameters params(audio_output_parameters().format(),
CHANNEL_LAYOUT_MONO, CHANNEL_LAYOUT_MONO,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment