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

Side by Side Diff: media/base/demuxer_perftest.cc

Issue 2362193003: Add FLAC audio codec support (Closed)
Patch Set: Enabled the test in media_browsertest.cc on Chromium Created 4 years, 2 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 unified diff | Download patch
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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 #if defined(OS_WIN) 228 #if defined(OS_WIN)
229 // http://crbug.com/399002 229 // http://crbug.com/399002
230 #define MAYBE_Demuxer DISABLED_Demuxer 230 #define MAYBE_Demuxer DISABLED_Demuxer
231 #else 231 #else
232 #define MAYBE_Demuxer Demuxer 232 #define MAYBE_Demuxer Demuxer
233 #endif 233 #endif
234 TEST(DemuxerPerfTest, MAYBE_Demuxer) { 234 TEST(DemuxerPerfTest, MAYBE_Demuxer) {
235 RunDemuxerBenchmark("bear.ogv"); 235 RunDemuxerBenchmark("bear.ogv");
236 RunDemuxerBenchmark("bear-640x360.webm"); 236 RunDemuxerBenchmark("bear-640x360.webm");
237 RunDemuxerBenchmark("sfx_s16le.wav"); 237 RunDemuxerBenchmark("sfx_s16le.wav");
238 RunDemuxerBenchmark("bear.flac");
238 #if defined(USE_PROPRIETARY_CODECS) 239 #if defined(USE_PROPRIETARY_CODECS)
239 RunDemuxerBenchmark("bear-1280x720.mp4"); 240 RunDemuxerBenchmark("bear-1280x720.mp4");
240 RunDemuxerBenchmark("sfx.mp3"); 241 RunDemuxerBenchmark("sfx.mp3");
241 #endif 242 #endif
242 #if defined(OS_CHROMEOS)
243 RunDemuxerBenchmark("bear.flac");
244 #endif
245 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS) 243 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
246 RunDemuxerBenchmark("bear.avi"); 244 RunDemuxerBenchmark("bear.avi");
247 #endif 245 #endif
248 } 246 }
249 247
250 } // namespace media 248 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698