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

Unified Diff: media/filters/audio_decoder_unittest.cc

Issue 2515553002: Fix mimetype mappings for FLAC support. (Closed)
Patch Set: Comments. Created 4 years, 1 month 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/filters/ffmpeg_demuxer_unittest.cc » ('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 1978482102cf57c5de1d1bfa92a92abdde48dde1..5c42c6d8c150c26862cda1306b520b07423b172c 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -574,13 +574,11 @@ const DecodedBufferExpectations kSfxAdtsExpectations[] = {
};
#endif
-#if defined(OS_CHROMEOS)
const DecodedBufferExpectations kSfxFlacExpectations[] = {
{0, 104489, "-2.42,-1.12,0.71,1.70,1.09,-0.68,"},
{104489, 104489, "-1.99,-0.67,1.18,2.19,1.60,-0.16,"},
{208979, 79433, "2.84,2.70,3.23,4.06,4.59,4.44,"},
};
-#endif
const DecodedBufferExpectations kSfxWaveExpectations[] = {
{0, 23219, "-1.23,-0.87,0.47,1.85,1.88,0.29,"},
@@ -613,10 +611,8 @@ const DecoderTestData kFFmpegTests[] = {
{FFMPEG, kCodecAAC, "sfx.adts", kSfxAdtsExpectations, 0, 44100,
CHANNEL_LAYOUT_MONO},
#endif
-#if defined(OS_CHROMEOS)
{FFMPEG, kCodecFLAC, "sfx.flac", kSfxFlacExpectations, 0, 44100,
CHANNEL_LAYOUT_MONO},
-#endif
{FFMPEG, kCodecPCM, "sfx_f32le.wav", kSfxWaveExpectations, 0, 44100,
CHANNEL_LAYOUT_MONO},
{FFMPEG, kCodecPCM, "4ch.wav", kFourChannelWaveExpectations, 0, 44100,
« no previous file with comments | « media/base/mime_util_unittest.cc ('k') | media/filters/ffmpeg_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698