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

Unified Diff: media/filters/audio_decoder_unittest.cc

Issue 1577433004: Flip proprietary codecs to false for Android chromium builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo comment change. Created 4 years, 9 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 | « media/base/mime_util_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_decoder_unittest.cc
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index c4f727bfcbced9f356e7034b84e55a00cabf5c28..d29a68d86c9ba6590fc6ae4329b820f685f04545 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -503,7 +503,6 @@ INSTANTIATE_TEST_CASE_P(OpusAudioDecoderBehavioralTest,
testing::ValuesIn(kOpusBehavioralTest));
#if defined(OS_ANDROID)
-
const DecoderTestData kMediaCodecTests[] = {
{MEDIA_CODEC, kCodecOpus, "bear-opus.ogg", kBearOpusExpectations, 24, 48000,
CHANNEL_LAYOUT_STEREO},
@@ -512,10 +511,7 @@ const DecoderTestData kMediaCodecTests[] = {
INSTANTIATE_TEST_CASE_P(MediaCodecAudioDecoderTest,
AudioDecoderTest,
testing::ValuesIn(kMediaCodecTests));
-
-#else // !defined(OS_ANDROID)
-
-// Disable all FFmpeg decoder tests on Android. http://crbug.com/570762.
+#endif // defined(OS_ANDROID)
#if defined(USE_PROPRIETARY_CODECS)
const DecodedBufferExpectations kSfxMp3Expectations[] = {
@@ -598,6 +594,4 @@ INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderBehavioralTest,
FFmpegAudioDecoderBehavioralTest,
testing::ValuesIn(kFFmpegBehavioralTest));
-#endif // !defined(OS_ANDROID)
-
} // namespace media
« no previous file with comments | « media/base/mime_util_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698