diff options
| author | damienv@chromium.org <damienv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 04:26:39 +0000 |
|---|---|---|
| committer | damienv@chromium.org <damienv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 04:26:39 +0000 |
| commit | 990e3f9e6b878a9a0f1c84626090180390972fd0 (patch) | |
| tree | a3b1bbf51a977e52e52ec53529fe3126bdde359a /media/filters/stream_parser_factory.cc | |
| parent | 940511d40b6ffb6a71b0ba53be53a92ef2b47155 (diff) | |
| download | chromium_src-990e3f9e6b878a9a0f1c84626090180390972fd0.zip chromium_src-990e3f9e6b878a9a0f1c84626090180390972fd0.tar.gz chromium_src-990e3f9e6b878a9a0f1c84626090180390972fd0.tar.bz2 | |
Mpeg2 TS stream parser for media source.
BUG=254214
TEST=Mp2tStreamParserTest.*
Review URL: https://chromiumcodereview.appspot.com/23921008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/filters/stream_parser_factory.cc')
| -rw-r--r-- | media/filters/stream_parser_factory.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc index 4d2e524..c41164b 100644 --- a/media/filters/stream_parser_factory.cc +++ b/media/filters/stream_parser_factory.cc @@ -14,6 +14,9 @@ #include "media/webm/webm_stream_parser.h" #if defined(USE_PROPRIETARY_CODECS) +#if defined(ENABLE_MPEG2TS_STREAM_PARSER) +#include "media/mp2t/mp2t_stream_parser.h" +#endif #include "media/mp4/es_descriptor.h" #include "media/mp4/mp4_stream_parser.h" #endif @@ -203,6 +206,19 @@ static StreamParser* BuildMP3Parser( return new MP3StreamParser(); } +#if defined(ENABLE_MPEG2TS_STREAM_PARSER) +static const CodecInfo* kVideoMP2TCodecs[] = { + &kH264CodecInfo, + &kMPEG4AACCodecInfo, + &kMPEG2AACLCCodecInfo, + NULL +}; + +static StreamParser* BuildMP2TParser( + const std::vector<std::string>& codecs, const media::LogCB& log_cb) { + return new media::mp2t::Mp2tStreamParser(); +} +#endif #endif @@ -213,6 +229,9 @@ static const SupportedTypeInfo kSupportedTypeInfo[] = { { "audio/mpeg", &BuildMP3Parser, kAudioMP3Codecs }, { "video/mp4", &BuildMP4Parser, kVideoMP4Codecs }, { "audio/mp4", &BuildMP4Parser, kAudioMP4Codecs }, +#if defined(ENABLE_MPEG2TS_STREAM_PARSER) + { "video/mp2t", &BuildMP2TParser, kVideoMP2TCodecs }, +#endif #endif }; |