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

Unified Diff: media/audio/android/audio_android_unittest.cc

Issue 613153003: Reenable AudioAndroidOutputTest.StartOutputStreamCallbacks on Arm64. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 640ae7e7ce10b3d0f70ad0ba3a78a4e2055ccd05..6fa7987f717e312f6b0c5d7bb6853b681337fda2 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -811,23 +811,9 @@ 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, MAYBE_StartOutputStreamCallbacks) {
+TEST_F(AudioAndroidOutputTest, StartOutputStreamCallbacks) {
GetDefaultOutputStreamParametersOnAudioThread();
StartOutputStreamCallbacks(audio_output_parameters());
}
@@ -837,8 +823,7 @@ TEST_F(AudioAndroidOutputTest, MAYBE_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,
- MAYBE_StartOutputStreamCallbacksNonDefaultParameters) {
+TEST_F(AudioAndroidOutputTest, StartOutputStreamCallbacksNonDefaultParameters) {
GetDefaultOutputStreamParametersOnAudioThread();
AudioParameters params(audio_output_parameters().format(),
CHANNEL_LAYOUT_MONO,
« 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