Index: media/filters/stream_parser_factory.cc |
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc |
index fc3257b139d04ce08b50f0633c28c25de552965f..0353163c0a2237729549d2721ce8f1d2c6d27be3 100644 |
--- a/media/filters/stream_parser_factory.cc |
+++ b/media/filters/stream_parser_factory.cc |
@@ -14,13 +14,14 @@ |
#include "media/formats/mpeg/adts_stream_parser.h" |
#include "media/formats/mpeg/mpeg1_audio_stream_parser.h" |
#include "media/formats/webm/webm_stream_parser.h" |
+#include "media/media_features.h" |
#if defined(OS_ANDROID) |
#include "base/android/build_info.h" |
#endif |
#if defined(USE_PROPRIETARY_CODECS) |
-#if defined(ENABLE_MPEG2TS_STREAM_PARSER) |
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) |
#include "media/formats/mp2t/mp2t_stream_parser.h" |
#endif |
#include "media/formats/mp4/es_descriptor.h" |
@@ -231,7 +232,7 @@ static StreamParser* BuildADTSParser(const std::vector<std::string>& codecs, |
return new ADTSStreamParser(); |
} |
-#if defined(ENABLE_MPEG2TS_STREAM_PARSER) |
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) |
static const CodecInfo* kVideoMP2TCodecs[] = { |
&kH264AVC1CodecInfo, |
&kH264AVC3CodecInfo, |
@@ -259,17 +260,16 @@ static StreamParser* BuildMP2TParser(const std::vector<std::string>& codecs, |
#endif |
#endif |
- |
static const SupportedTypeInfo kSupportedTypeInfo[] = { |
- { "video/webm", &BuildWebMParser, kVideoWebMCodecs }, |
- { "audio/webm", &BuildWebMParser, kAudioWebMCodecs }, |
+ {"video/webm", &BuildWebMParser, kVideoWebMCodecs}, |
+ {"audio/webm", &BuildWebMParser, kAudioWebMCodecs}, |
#if defined(USE_PROPRIETARY_CODECS) |
- { "audio/aac", &BuildADTSParser, kAudioADTSCodecs }, |
- { "audio/mpeg", &BuildMP3Parser, kAudioMP3Codecs }, |
- { "video/mp4", &BuildMP4Parser, kVideoMP4Codecs }, |
- { "audio/mp4", &BuildMP4Parser, kAudioMP4Codecs }, |
-#if defined(ENABLE_MPEG2TS_STREAM_PARSER) |
- { "video/mp2t", &BuildMP2TParser, kVideoMP2TCodecs }, |
+ {"audio/aac", &BuildADTSParser, kAudioADTSCodecs}, |
+ {"audio/mpeg", &BuildMP3Parser, kAudioMP3Codecs}, |
+ {"video/mp4", &BuildMP4Parser, kVideoMP4Codecs}, |
+ {"audio/mp4", &BuildMP4Parser, kAudioMP4Codecs}, |
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) |
+ {"video/mp2t", &BuildMP2TParser, kVideoMP2TCodecs}, |
#endif |
#endif |
}; |