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

Side by Side Diff: media/base/demuxer_perftest.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 unified diff | Download patch
« no previous file with comments | « content/browser/media/media_canplaytype_browsertest.cc ('k') | media/base/mime_util_internal.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 #if defined(OS_WIN) 231 #if defined(OS_WIN)
232 // http://crbug.com/399002 232 // http://crbug.com/399002
233 #define MAYBE_Demuxer DISABLED_Demuxer 233 #define MAYBE_Demuxer DISABLED_Demuxer
234 #else 234 #else
235 #define MAYBE_Demuxer Demuxer 235 #define MAYBE_Demuxer Demuxer
236 #endif 236 #endif
237 TEST(DemuxerPerfTest, MAYBE_Demuxer) { 237 TEST(DemuxerPerfTest, MAYBE_Demuxer) {
238 RunDemuxerBenchmark("bear.ogv"); 238 RunDemuxerBenchmark("bear.ogv");
239 RunDemuxerBenchmark("bear-640x360.webm"); 239 RunDemuxerBenchmark("bear-640x360.webm");
240 RunDemuxerBenchmark("sfx_s16le.wav"); 240 RunDemuxerBenchmark("sfx_s16le.wav");
241 RunDemuxerBenchmark("bear.flac");
241 #if defined(USE_PROPRIETARY_CODECS) 242 #if defined(USE_PROPRIETARY_CODECS)
242 RunDemuxerBenchmark("bear-1280x720.mp4"); 243 RunDemuxerBenchmark("bear-1280x720.mp4");
243 RunDemuxerBenchmark("sfx.mp3"); 244 RunDemuxerBenchmark("sfx.mp3");
244 #endif 245 #endif
245 #if defined(OS_CHROMEOS)
246 RunDemuxerBenchmark("bear.flac");
247 #endif
248 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS) 246 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
249 RunDemuxerBenchmark("bear.avi"); 247 RunDemuxerBenchmark("bear.avi");
250 #endif 248 #endif
251 } 249 }
252 250
253 } // namespace media 251 } // namespace media
OLDNEW
« no previous file with comments | « content/browser/media/media_canplaytype_browsertest.cc ('k') | media/base/mime_util_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698