| Index: media/audio/android/audio_android_unittest.cc
|
| diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
|
| index 0ac1be4db9d533222c3b833261e0cde0fb8e4e0e..2cd706e3441b19a0abc9b314872d623fe33862ec 100644
|
| --- a/media/audio/android/audio_android_unittest.cc
|
| +++ b/media/audio/android/audio_android_unittest.cc
|
| @@ -811,9 +811,23 @@ TEST_P(AudioAndroidInputTest,
|
| 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
|
| // callback sequence is sane.
|
| -TEST_F(AudioAndroidOutputTest, StartOutputStreamCallbacks) {
|
| +TEST_F(AudioAndroidOutputTest, MAYBE_StartOutputStreamCallbacks) {
|
| GetDefaultOutputStreamParametersOnAudioThread();
|
| StartOutputStreamCallbacks(audio_output_parameters());
|
| }
|
| @@ -823,7 +837,8 @@ TEST_F(AudioAndroidOutputTest, StartOutputStreamCallbacks) {
|
| // select a 10ms buffer size instead of the default size and to open up the
|
| // device in mono.
|
| // TODO(henrika): possibly add support for more variations.
|
| -TEST_F(AudioAndroidOutputTest, StartOutputStreamCallbacksNonDefaultParameters) {
|
| +TEST_F(AudioAndroidOutputTest,
|
| + MAYBE_StartOutputStreamCallbacksNonDefaultParameters) {
|
| GetDefaultOutputStreamParametersOnAudioThread();
|
| AudioParameters params(audio_output_parameters().format(),
|
| CHANNEL_LAYOUT_MONO,
|
|
|