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

Unified Diff: media/base/mime_util.cc

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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/BUILD.gn ('k') | media/base/mime_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mime_util.cc
diff --git a/media/base/mime_util.cc b/media/base/mime_util.cc
index 5055c54225565d3b6d9dbf4b399ba261371989b7..ba52704bba7bd82e3de76722f213bdfbdf3a7fbd 100644
--- a/media/base/mime_util.cc
+++ b/media/base/mime_util.cc
@@ -15,6 +15,7 @@
#include "base/strings/string_util.h"
#include "build/build_config.h"
#include "media/base/mime_util.h"
+#include "media/media_features.h"
#if defined(OS_ANDROID)
#include "base/android/build_info.h"
@@ -255,7 +256,7 @@ static const MediaFormat kFormatCodecMappings[] = {
{"audio/x-m4a", PROPRIETARY, kMP4AudioCodecsExpression},
{"video/mp4", PROPRIETARY, kMP4VideoCodecsExpression},
{"video/x-m4v", PROPRIETARY, kMP4VideoCodecsExpression},
-#if defined(ENABLE_MPEG2TS_STREAM_PARSER)
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
{"video/mp2t", PROPRIETARY, kMP4VideoCodecsExpression},
#endif
#if defined(OS_ANDROID)
@@ -308,7 +309,7 @@ static const CodecIDMappings kAmbiguousCodecStringMap[] = {
// avc1/avc3.XXXXXX may be ambiguous; handled by ParseH264CodecID().
};
-#if defined(ENABLE_MPEG2TS_STREAM_PARSER)
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
static const char kHexString[] = "0123456789ABCDEF";
static char IntToHex(int i) {
DCHECK_GE(i, 0) << i << " not a hex value";
@@ -479,7 +480,7 @@ SupportsType MimeUtil::IsSupportedMediaFormat(
return IsCodecSupported(default_codec) ? IsSupported : IsNotSupported;
}
-#if defined(ENABLE_MPEG2TS_STREAM_PARSER)
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
if (mime_type_lower_case == "video/mp2t") {
std::vector<std::string> codecs_to_check;
for (const auto& codec_id : codecs) {
« no previous file with comments | « media/BUILD.gn ('k') | media/base/mime_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698