|
 |
867ed1f |
diff -up chromium-64.0.3282.119/media/base/mime_util_internal.cc.mp3 chromium-64.0.3282.119/media/base/mime_util_internal.cc
|
|
|
867ed1f |
--- chromium-64.0.3282.119/media/base/mime_util_internal.cc.mp3 2018-01-24 15:05:48.000000000 -0500
|
|
|
867ed1f |
+++ chromium-64.0.3282.119/media/base/mime_util_internal.cc 2018-01-25 11:18:12.354147726 -0500
|
|
|
867ed1f |
@@ -279,15 +279,19 @@ void MimeUtil::AddSupportedMediaFormats(
|
|
|
867ed1f |
CodecSet webm_codecs(webm_audio_codecs);
|
|
|
867ed1f |
webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
|
|
|
867ed1f |
|
|
|
867ed1f |
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
|
867ed1f |
const CodecSet mp3_codecs{MP3};
|
|
|
867ed1f |
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
|
867ed1f |
const CodecSet aac{MPEG2_AAC, MPEG4_AAC};
|
|
|
867ed1f |
+#else
|
|
|
867ed1f |
+ const CodecSet aac{};
|
|
|
867ed1f |
+#endif
|
|
|
867ed1f |
+ CodecSet mp4_audio_codecs(aac);
|
|
|
867ed1f |
+ mp4_audio_codecs.emplace(MP3);
|
|
|
867ed1f |
|
|
|
867ed1f |
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
|
867ed1f |
CodecSet avc_and_aac(aac);
|
|
|
867ed1f |
avc_and_aac.emplace(H264);
|
|
|
867ed1f |
|
|
|
867ed1f |
- CodecSet mp4_audio_codecs(aac);
|
|
|
867ed1f |
- mp4_audio_codecs.emplace(MP3);
|
|
|
867ed1f |
mp4_audio_codecs.emplace(FLAC);
|
|
|
867ed1f |
#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
|
|
|
867ed1f |
mp4_audio_codecs.emplace(AC3);
|
|
|
867ed1f |
@@ -329,10 +333,10 @@ void MimeUtil::AddSupportedMediaFormats(
|
|
|
867ed1f |
AddContainerWithCodecs("application/ogg", ogg_codecs, false);
|
|
|
867ed1f |
AddContainerWithCodecs("audio/flac", implicit_codec, false);
|
|
|
867ed1f |
|
|
|
867ed1f |
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
|
867ed1f |
AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
|
|
|
867ed1f |
AddContainerWithCodecs("audio/mp3", implicit_codec, true);
|
|
|
867ed1f |
AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
|
|
|
867ed1f |
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
|
867ed1f |
AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS.
|
|
|
867ed1f |
AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
|
|
|
867ed1f |
DCHECK(!mp4_video_codecs.empty());
|
|
|
867ed1f |
@@ -970,7 +974,6 @@ bool MimeUtil::IsCodecProprietary(Codec
|
|
|
867ed1f |
case INVALID_CODEC:
|
|
|
867ed1f |
case AC3:
|
|
|
867ed1f |
case EAC3:
|
|
|
867ed1f |
- case MP3:
|
|
|
867ed1f |
case MPEG2_AAC:
|
|
|
867ed1f |
case MPEG4_AAC:
|
|
|
867ed1f |
case H264:
|
|
|
867ed1f |
@@ -978,6 +981,7 @@ bool MimeUtil::IsCodecProprietary(Codec
|
|
|
867ed1f |
case DOLBY_VISION:
|
|
|
867ed1f |
return true;
|
|
|
867ed1f |
|
|
|
867ed1f |
+ case MP3:
|
|
|
867ed1f |
case PCM:
|
|
|
867ed1f |
case VORBIS:
|
|
|
867ed1f |
case OPUS:
|