diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 22:12:28 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 22:12:28 +0000 |
| commit | 30cbfad358d27dbb3bf19cdf9c236db3aa99c56c (patch) | |
| tree | e86e018deba297ed373896604ba4dc482e64bcfd /media | |
| parent | 0c956160031fb123add5eff31dd66668e3b118ba (diff) | |
| download | chromium_src-30cbfad358d27dbb3bf19cdf9c236db3aa99c56c.zip chromium_src-30cbfad358d27dbb3bf19cdf9c236db3aa99c56c.tar.gz chromium_src-30cbfad358d27dbb3bf19cdf9c236db3aa99c56c.tar.bz2 | |
Fix MP4 support so it properly appears in Canary builds.
BUG=133849
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10636011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/chunk_demuxer.cc | 6 | ||||
| -rw-r--r-- | media/filters/chunk_demuxer_unittest.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc index 8b77834..b29d92e 100644 --- a/media/filters/chunk_demuxer.cc +++ b/media/filters/chunk_demuxer.cc @@ -12,7 +12,7 @@ #include "media/base/stream_parser_buffer.h" #include "media/base/video_decoder_config.h" #include "media/filters/chunk_demuxer_client.h" -#if defined(USE_PROPRIETARY_CODECS) +#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) #include "media/mp4/mp4_stream_parser.h" #endif #include "media/webm/webm_stream_parser.h" @@ -52,7 +52,7 @@ static StreamParser* BuildWebMParser() { return new WebMStreamParser(); } -#if defined(USE_PROPRIETARY_CODECS) +#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) static const CodecInfo kH264CodecInfo = { "avc1.*", DemuxerStream::VIDEO }; static const CodecInfo kAACCodecInfo = { "mp4a.40.*", DemuxerStream::AUDIO }; @@ -75,7 +75,7 @@ static StreamParser* BuildMP4Parser() { static const SupportedTypeInfo kSupportedTypeInfo[] = { { "video/webm", &BuildWebMParser, kVideoWebMCodecs }, { "audio/webm", &BuildWebMParser, kAudioWebMCodecs }, -#if defined(USE_PROPRIETARY_CODECS) +#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) { "video/mp4", &BuildMP4Parser, kVideoMP4Codecs }, { "audio/mp4", &BuildMP4Parser, kAudioMP4Codecs }, #endif diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc index ebf0b88..631f900 100644 --- a/media/filters/chunk_demuxer_unittest.cc +++ b/media/filters/chunk_demuxer_unittest.cc @@ -1623,10 +1623,10 @@ TEST_F(ChunkDemuxerTest, TestDifferentStreamTimecodes) { } TEST_F(ChunkDemuxerTest, TestCodecPrefixMatching) { - ChunkDemuxer::Status expected = ChunkDemuxer::kOk; + ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported; -#if !defined(USE_PROPRIETARY_CODECS) - expected = ChunkDemuxer::kNotSupported; +#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) + expected = ChunkDemuxer::kOk; #endif std::vector<std::string> codecs; |