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,20 @@ class MEDIA_EXPORT MimeUtil { MP2, MPEG4_SP, MPEG4_ASP, - LAST_CODEC = MPEG4_ASP + MSMPEG4v1, + MSMPEG4v2, + MSMPEG4v3, + WMV7, + WMV8, + WMV9, + VC1, + WMA1, + WMA2, + VP6, + MPEG1, + MPEG2, + FLV1, + LAST_CODEC = FLV1 }; // Platform configuration structure. Controls which codecs are supported at diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc --- chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 2016-03-23 18:22:20.227596097 +0100 +++ chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc 2016-03-23 18:22:20.245595771 +0100 @@ -120,6 +120,10 @@ AudioCodec CodecIDToAudioCodec(AVCodecID return kCodecMP2; case AV_CODEC_ID_DTS: return kCodecDTS; + case AV_CODEC_ID_WMAV1: + return kCodecWMA1; + case AV_CODEC_ID_WMAV2: + return kCodecWMA2; default: DVLOG(1) << "Unknown audio CodecID: " << codec_id; } @@ -179,6 +183,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec return AV_CODEC_ID_MP2; case kCodecDTS: return AV_CODEC_ID_DTS; + case kCodecWMA1: + return AV_CODEC_ID_WMAV1; + case kCodecWMA2: + return AV_CODEC_ID_WMAV2; default: DVLOG(1) << "Unknown AudioCodec: " << audio_codec; } @@ -197,6 +197,28 @@ return kCodecVP9; case AV_CODEC_ID_AV1: return kCodecAV1; + case AV_CODEC_ID_MSMPEG4V1: + return kCodecMSMPEG4V1; + case AV_CODEC_ID_MSMPEG4V2: + return kCodecMSMPEG4V2; + case AV_CODEC_ID_MSMPEG4V3: + return kCodecMSMPEG4V3; + case AV_CODEC_ID_WMV1: + return kCodecWMV7; + case AV_CODEC_ID_WMV2: + return kCodecWMV8; + case AV_CODEC_ID_WMV3: + return kCodecWMV9; + case AV_CODEC_ID_VC1: + return kCodecVC1; + case AV_CODEC_ID_VP6: + return kCodecVP6; + case AV_CODEC_ID_MPEG1VIDEO: + return kCodecMPEG1; + case AV_CODEC_ID_MPEG2VIDEO: + return kCodecMPEG2; + case AV_CODEC_ID_FLV1: + return kCodecSorensonSpark; default: DVLOG(1) << "Unknown video CodecID: " << codec_id; } --- chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc.bak.2 2016-12-01 23:42:15.717317808 +0100 +++ chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc 2016-12-01 23:44:59.695754038 +0100 @@ -36,6 +36,8 @@ base::Optional ToMediaAudioC CASE_RETURN_OTHER(kCodecMpegHAudio); CASE_RETURN_OTHER(kCodecMP2); CASE_RETURN_OTHER(kCodecDTS); + CASE_RETURN_OTHER(kCodecWMA1); + CASE_RETURN_OTHER(kCodecWMA2); } return base::nullopt; // Not a 'default' to ensure compile-time checks. } @@ -65,6 +67,8 @@ base::Optional ToMediaVideoC CASE_RETURN_OTHER(kCodecHEVC); CASE_RETURN_OTHER(kCodecDolbyVision); CASE_RETURN_OTHER(kCodecAV1); + CASE_RETURN_OTHER(kCodecMSMPEG4V1); + CASE_RETURN_OTHER(kCodecMSMPEG4V2); + CASE_RETURN_OTHER(kCodecMSMPEG4V3); + CASE_RETURN_OTHER(kCodecWMV7); + CASE_RETURN_OTHER(kCodecWMV8); + CASE_RETURN_OTHER(kCodecWMV9); + CASE_RETURN_OTHER(kCodecVP6); + CASE_RETURN_OTHER(kCodecMPEG1); + CASE_RETURN_OTHER(kCodecSorensonSpark); } return base::nullopt; // Not a 'default' to ensure compile-time checks. } @@ -231,6 +244,15 @@ base::Optional