| Index: media/base/mime_util.cc
|
| diff --git a/media/base/mime_util.cc b/media/base/mime_util.cc
|
| index 7debd6ca5d22d85ff3b87ee7b0b0080b78f5df6d..c26750d7af16427526875ce97307f042d4bc2711 100644
|
| --- a/media/base/mime_util.cc
|
| +++ b/media/base/mime_util.cc
|
| @@ -11,6 +11,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"
|
| @@ -251,7 +252,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)
|
| @@ -304,7 +305,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";
|
| @@ -475,7 +476,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) {
|
|
|