Index: media/base/mime_util_internal.cc |
diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc |
index 031d548c7ced5e5e9b85f3f1d36481a2d751d4e7..2a0a957a7d51dd68509fae1654516f1d41ebd0b5 100644 |
--- a/media/base/mime_util_internal.cc |
+++ b/media/base/mime_util_internal.cc |
@@ -13,6 +13,7 @@ |
#include "media/base/media_client.h" |
#include "media/base/media_switches.h" |
#include "media/base/video_codecs.h" |
+#include "media/media_features.h" |
#if defined(OS_ANDROID) |
#include "base/android/build_info.h" |
@@ -246,7 +247,7 @@ SupportsType MimeUtil::AreSupportedCodecs( |
} |
void MimeUtil::InitializeMimeTypeMaps() { |
-#if defined(USE_PROPRIETARY_CODECS) |
+#if BUILDFLAG(USE_PROPRIETARY_CODECS) |
allow_proprietary_codecs_ = true; |
#endif |
@@ -291,7 +292,7 @@ void MimeUtil::AddSupportedMediaFormats() { |
CodecSet webm_codecs(webm_audio_codecs); |
webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); |
-#if defined(USE_PROPRIETARY_CODECS) |
+#if BUILDFLAG(USE_PROPRIETARY_CODECS) |
CodecSet mp3_codecs; |
mp3_codecs.insert(MP3); |
@@ -319,7 +320,7 @@ void MimeUtil::AddSupportedMediaFormats() { |
mp4_video_codecs.insert(VP9); |
CodecSet mp4_codecs(mp4_audio_codecs); |
mp4_codecs.insert(mp4_video_codecs.begin(), mp4_video_codecs.end()); |
-#endif // defined(USE_PROPRIETARY_CODECS) |
+#endif // BUILDFLAG(USE_PROPRIETARY_CODECS) |
AddContainerWithCodecs("audio/wav", wav_codecs, false); |
AddContainerWithCodecs("audio/x-wav", wav_codecs, false); |
@@ -335,7 +336,7 @@ void MimeUtil::AddSupportedMediaFormats() { |
AddContainerWithCodecs("application/ogg", ogg_codecs, false); |
AddContainerWithCodecs("audio/flac", implicit_codec, false); |
-#if defined(USE_PROPRIETARY_CODECS) |
+#if BUILDFLAG(USE_PROPRIETARY_CODECS) |
AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". |
AddContainerWithCodecs("audio/mp3", implicit_codec, true); |
AddContainerWithCodecs("audio/x-mp3", implicit_codec, true); |
@@ -361,13 +362,13 @@ void MimeUtil::AddSupportedMediaFormats() { |
AddContainerWithCodecs("application/x-mpegurl", hls_codecs, true); |
AddContainerWithCodecs("application/vnd.apple.mpegurl", hls_codecs, true); |
#endif // defined(OS_ANDROID) |
-#endif // defined(USE_PROPRIETARY_CODECS) |
+#endif // BUILDFLAG(USE_PROPRIETARY_CODECS) |
} |
void MimeUtil::AddContainerWithCodecs(const std::string& mime_type, |
const CodecSet& codecs, |
bool is_proprietary_mime_type) { |
-#if !defined(USE_PROPRIETARY_CODECS) |
+#if !BUILDFLAG(USE_PROPRIETARY_CODECS) |
DCHECK(!is_proprietary_mime_type); |
#endif |