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

Unified Diff: media/base/demuxer_perftest.cc

Issue 2580093002: Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Created 4 years 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/audio_video_metadata_extractor_unittest.cc ('k') | media/base/eme_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/demuxer_perftest.cc
diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc
index 6fccde25e1a2a05a77d9a23db922312aa0cbc37f..3ec8cca611bb8537024f18e61a72ec0035838f3f 100644
--- a/media/base/demuxer_perftest.cc
+++ b/media/base/demuxer_perftest.cc
@@ -22,7 +22,6 @@
#include "media/base/timestamp_constants.h"
#include "media/filters/ffmpeg_demuxer.h"
#include "media/filters/file_data_source.h"
-#include "media/media_features.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/perf/perf_test.h"
@@ -240,11 +239,11 @@
RunDemuxerBenchmark("bear-640x360.webm");
RunDemuxerBenchmark("sfx_s16le.wav");
RunDemuxerBenchmark("bear.flac");
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
RunDemuxerBenchmark("bear-1280x720.mp4");
RunDemuxerBenchmark("sfx.mp3");
#endif
-#if BUILDFLAG(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
+#if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
RunDemuxerBenchmark("bear.avi");
#endif
}
« no previous file with comments | « media/base/audio_video_metadata_extractor_unittest.cc ('k') | media/base/eme_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698