diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg chromium-62.0.3192.0/media/base/mime_util_internal.cc --- chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg 2017-08-30 15:52:00.602204610 +0200 +++ chromium-62.0.3192.0/media/base/mime_util_internal.cc 2017-08-30 16:08:19.855437935 +0200 @@ -78,6 +78,16 @@ {"mp2", MimeUtil::MP2}, {"mp4v.20.8", MimeUtil::MPEG4_SP}, {"mp4v.20.240", MimeUtil::MPEG4_ASP}, + {"msmpeg4v1", MimeUtil::MSMPEG4v1}, + {"msmpeg4v2", MimeUtil::MSMPEG4v2}, + {"msmpeg4v3", MimeUtil::MSMPEG4v3}, + {"wmv7", MimeUtil::WMV7}, + {"wmv8", MimeUtil::WMV8}, + {"wmv9", MimeUtil::WMV9}, + {"vc-1", MimeUtil::VC1}, + {"wma", MimeUtil::WMA}, + {"vp6", MimeUtil::VP6}, + {"mpeg1", MimeUtil::MPEG1}, // TODO(dalecurtis): This is not the correct final string. Fix before enabling // by default. http://crbug.com/784607 #if BUILDFLAG(ENABLE_AV1_DECODER) @@ -311,7 +321,8 @@ CodecSet webm_codecs(webm_audio_codecs); webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); - + + const CodecSet mp1_codecs{MPEG1}; const CodecSet mp3_codecs{MP3}; CodecSet mp4_audio_codecs; @@ -354,6 +365,27 @@ CodecSet mp4_codecs(mp4_audio_codecs); mp4_codecs.insert(mp4_video_codecs.begin(), mp4_video_codecs.end()); + const CodecSet wma_codecs{WMA}; + + CodecSet wmv_codecs(wma_codecs); + wmv_codecs.emplace(MSMPEG4v1); + wmv_codecs.emplace(MSMPEG4v2); + wmv_codecs.emplace(MSMPEG4v3); + wmv_codecs.emplace(MPEG4_SP); + wmv_codecs.emplace(MPEG4_ASP); + wmv_codecs.emplace(WMV7); + wmv_codecs.emplace(WMV8); + wmv_codecs.emplace(WMV9); + wmv_codecs.emplace(VC1); + + matroska_codecs.emplace(MSMPEG4v1); + matroska_codecs.emplace(MSMPEG4v2); + matroska_codecs.emplace(MSMPEG4v3); + + CodecSet flv_codecs(mp4_codecs); + flv_codecs.emplace(VP6); + flv_codecs.emplace(MP3); + const CodecSet implicit_codec; AddContainerWithCodecs("audio/wav", wav_codecs, false); AddContainerWithCodecs("audio/x-wav", wav_codecs, false); @@ -377,6 +409,11 @@ AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs, false); AddContainerWithCodecs("video/x-matroska", matroska_codecs, false); + AddContainerWithCodecs("video/x-ms-wmv", wmv_codecs, true); + AddContainerWithCodecs("audio/x-ms-wma", wma_codecs, true); + AddContainerWithCodecs("video/x-ms-asf", wmv_codecs, true); + AddContainerWithCodecs("video/x-flv", flv_codecs, true); + AddContainerWithCodecs("video/mpeg", mp1_codecs, true); #if BUILDFLAG(USE_PROPRIETARY_CODECS) AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS. @@ -1017,6 +1054,15 @@ case DTS: case MPEG4_SP: case MPEG4_ASP: + case MSMPEG4v1: + case MSMPEG4v2: + case MSMPEG4v3: + case WMV7: + case WMV8: + case WMV9: + case VC1: + case WMA: + case VP6: return true; case MP3: @@ -1029,6 +1075,7 @@ case VP9: case THEORA: case AV1: + case MPEG1: return false; } diff -up chromium-62.0.3192.0/media/base/mime_util_internal.h.wmvflvmpg chromium-62.0.3192.0/media/base/mime_util_internal.h --- chromium-62.0.3192.0/media/base/mime_util_internal.h.wmvflvmpg 2017-08-30 15:52:00.602204610 +0200 +++ chromium-62.0.3192.0/media/base/mime_util_internal.h 2017-08-30 15:52:00.616204356 +0200 @@ -48,7 +48,17 @@ class MEDIA_EXPORT MimeUtil { MP2, MPEG4_SP, MPEG4_ASP, - LAST_CODEC = MPEG4_ASP + MSMPEG4v1, + MSMPEG4v2, + MSMPEG4v3, + WMV7, + WMV8, + WMV9, + VC1, + WMA, + VP6, + MPEG1, + LAST_CODEC = MPEG1 }; // Platform configuration structure. Controls which codecs are supported at diff -up chromium-62.0.3192.0/net/base/mime_util.cc.wmvflvmpg chromium-62.0.3192.0/net/base/mime_util.cc --- chromium-62.0.3192.0/net/base/mime_util.cc.wmvflvmpg 2017-08-30 15:52:00.604204573 +0200 +++ chromium-62.0.3192.0/net/base/mime_util.cc 2017-08-30 16:08:50.210885222 +0200 @@ -94,6 +94,10 @@ static const MimeInfo kPrimaryMappings[] {"video/x-matroska", "mkv"}, {"audio/x-matroska", "mkv"}, {"video/x-msvideo", "avi"}, + {"video/x-ms-wmv", "wmv"}, + {"audio/x-ms-wma", "wma"}, + {"video/x-flv", "flv"}, + {"video/mpeg", "mpg,mpeg"}, {"multipart/related", "mht,mhtml"}, {"text/css", "css"}, {"text/html", "html,htm,shtml,shtm"}, @@ -512,6 +516,7 @@ static const char* const kStandardVideoT "video/sd-video", "video/webm", "video/x-dv", + "video/x-flv", "video/x-m4v", "video/x-matroska", "video/x-mpeg",