Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
berolinux committed Mar 12, 2018
1 parent 2f8a67f commit 54edf00
Show file tree
Hide file tree
Showing 13 changed files with 335 additions and 181 deletions.
2 changes: 1 addition & 1 deletion .abf.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sources:
chromium-64.0.3282.140.tar.xz: 1499b6258e9d8fa20b4cc755afe7700006828b71
chromium-65.0.3325.146.tar.xz: 4f736ba24ae34b3b9d7e074ee93f527a85a5b0cb
91 changes: 53 additions & 38 deletions chromium-40-wmvflvmpg.patch
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
--- chromium-64.0.3282.119/media/base/mime_util_internal.cc.0112~ 2018-01-27 13:13:56.050972071 +0100
+++ chromium-64.0.3282.119/media/base/mime_util_internal.cc 2018-01-27 13:15:39.210010833 +0100
@@ -76,6 +76,11 @@ const base::flat_map<std::string, MimeUt
{"vp8.0", MimeUtil::VP8}, {"theora", MimeUtil::THEORA},
{"dts", MimeUtil::DTS}, {"mp2", MimeUtil::MP2},
{"mp4v.20.8", MimeUtil::MPEG4_SP}, {"mp4v.20.240", MimeUtil::MPEG4_ASP},
--- chromium-65.0.3294.5/media/base/mime_util_internal.cc.0112~ 2017-12-16 05:27:08.293304909 +0100
+++ chromium-65.0.3294.5/media/base/mime_util_internal.cc 2017-12-16 05:31:48.297726447 +0100
@@ -80,7 +80,12 @@ const base::flat_map<std::string, MimeUt
{"av1", MimeUtil::AV1},
#endif
{"dts", MimeUtil::DTS}, {"mp2", MimeUtil::MP2},
- {"mp4v.20.8", MimeUtil::MPEG4_SP}, {"mp4v.20.240", MimeUtil::MPEG4_ASP}
+ {"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)
@@ -313,6 +318,9 @@ void MimeUtil::AddSupportedMediaFormats(
const CodecSet mp3_codecs{MP3};
const CodecSet aac{MPEG2_AAC, MPEG4_AAC};
+ {"vp6", MimeUtil::VP6}, {"mpeg1", MimeUtil::MPEG1}
},
base::KEEP_FIRST_OF_DUPES);

@@ -309,6 +314,9 @@ void MimeUtil::AddSupportedMediaFormats(
CodecSet webm_codecs(webm_audio_codecs);
webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());

+ CodecSet mp1_codecs;
+ mp1_codecs.emplace(MPEG1);
+ mp1_codecs.insert(MPEG1);
+
CodecSet avc_and_aac(aac);
avc_and_aac.emplace(H264);
const CodecSet mp3_codecs{MP3};

@@ -346,6 +354,29 @@ void MimeUtil::AddSupportedMediaFormats(
CodecSet mp4_audio_codecs;
@@ -351,6 +359,29 @@ void MimeUtil::AddSupportedMediaFormats(
CodecSet mp4_codecs(mp4_audio_codecs);
mp4_codecs.insert(mp4_video_codecs.begin(), mp4_video_codecs.end());
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)

+ CodecSet wma_codecs;
+ wma_codecs.insert(WMA);
+
+
+ CodecSet wmv_codecs(wma_codecs);
+ wmv_codecs.insert(MSMPEG4v1);
+ wmv_codecs.insert(MSMPEG4v2);
Expand All @@ -39,11 +41,11 @@
+ wmv_codecs.insert(WMV8);
+ wmv_codecs.insert(WMV9);
+ wmv_codecs.insert(VC1);
+
+
+ matroska_codecs.insert(MSMPEG4v1);
+ matroska_codecs.insert(MSMPEG4v2);
+ matroska_codecs.insert(MSMPEG4v3);
+
+
+ CodecSet flv_codecs;
+ flv_codecs.insert(VP6);
+ flv_codecs.insert(mp4_codecs.begin(), mp4_codecs.end());
Expand All @@ -52,19 +54,19 @@
const CodecSet implicit_codec;
AddContainerWithCodecs("audio/wav", wav_codecs, false);
AddContainerWithCodecs("audio/x-wav", wav_codecs, false);
@@ -363,6 +394,11 @@ void MimeUtil::AddSupportedMediaFormats(
@@ -374,6 +405,11 @@ void MimeUtil::AddSupportedMediaFormats(

AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs, false);
AddContainerWithCodecs("video/x-matroska", matroska_codecs, false);
AddContainerWithCodecs("video/x-matroska", matroska_video_codecs, false);
+ AddContainerWithCodecs("video/x-ms-wmv", wmv_codecs, true);
+ AddContainerWithCodecs("audio/x-ms-wma", wma_codecs, true);
+ AddContainerWithCodecs("video/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/mpeg", mp3_codecs, true); // Allow "mp3".
@@ -1015,6 +1051,15 @@ bool MimeUtil::IsCodecProprietary(Codec
AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS.
@@ -1032,6 +1068,15 @@ bool MimeUtil::IsCodecProprietary(Codec
case DTS:
case MPEG4_SP:
case MPEG4_ASP:
Expand All @@ -79,21 +81,22 @@
+ case VP6:
return true;

case PCM:
@@ -1026,6 +1071,7 @@ bool MimeUtil::IsCodecProprietary(Codec
case MP3:
@@ -1043,6 +1088,7 @@ bool MimeUtil::IsCodecProprietary(Codec
case VP8:
case VP9:
case THEORA:
case AV1:
+ case MPEG1:
case AV1:
return false;
}

--- chromium-64.0.3282.119/media/base/mime_util_internal.h.0112~ 2018-01-27 13:13:56.053972072 +0100
+++ chromium-64.0.3282.119/media/base/mime_util_internal.h 2018-01-27 13:16:06.481021210 +0100
@@ -48,6 +48,16 @@ class MEDIA_EXPORT MimeUtil {
--- chromium-65.0.3294.5/media/base/mime_util_internal.h.0112~ 2017-12-16 05:27:08.293304909 +0100
+++ chromium-65.0.3294.5/media/base/mime_util_internal.h 2017-12-16 05:27:08.295304921 +0100
@@ -49,7 +49,17 @@ class MEDIA_EXPORT MimeUtil {
MP2,
MPEG4_SP,
MPEG4_ASP,
- LAST_CODEC = MPEG4_ASP
+ MSMPEG4v1,
+ MSMPEG4v2,
+ MSMPEG4v3,
Expand All @@ -104,12 +107,24 @@
+ WMA,
+ VP6,
+ MPEG1,
AV1,
LAST_CODEC = AV1
+ LAST_CODEC = MPEG1
};
--- chromium-64.0.3282.119/net/base/mime_util.cc.0112~ 2018-01-27 13:13:56.051972072 +0100
+++ chromium-64.0.3282.119/net/base/mime_util.cc 2018-01-27 13:13:56.054972073 +0100
@@ -513,6 +513,7 @@ static const char* const kStandardVideoT

// Platform configuration structure. Controls which codecs are supported at
--- chromium-65.0.3294.5/net/base/mime_util.cc.0112~ 2017-12-16 05:27:08.294304915 +0100
+++ chromium-65.0.3294.5/net/base/mime_util.cc 2017-12-16 05:27:08.295304921 +0100
@@ -101,6 +101,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"}
};

static const MimeInfo kSecondaryMappings[] = {
@@ -513,6 +517,7 @@ static const char* const kStandardVideoT
"video/sd-video",
"video/webm",
"video/x-dv",
Expand Down
4 changes: 2 additions & 2 deletions chromium-52.0.2743.82-arm-webrtc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- chromium-63.0.3239.84/third_party/webrtc/system_wrappers/source/cpu_features.cc.0016~ 2017-12-07 12:38:38.825728577 +0100
+++ chromium-63.0.3239.84/third_party/webrtc/system_wrappers/source/cpu_features.cc 2017-12-07 12:50:35.858338372 +0100
--- chromium-63.0.3230.0/third_party/webrtc/system_wrappers/source/cpu_features.cc.0016~ 2017-10-09 19:07:22.113723328 +0200
+++ chromium-63.0.3230.0/third_party/webrtc/system_wrappers/source/cpu_features.cc 2017-10-09 19:09:23.100996328 +0200
@@ -18,6 +18,47 @@

#include "typedefs.h" // NOLINT(build/include)
Expand Down
97 changes: 49 additions & 48 deletions chromium-55-extra-media.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- chromium-64.0.3282.119/media/base/audio_codecs.cc.0111~ 2018-01-24 21:05:48.000000000 +0100
+++ chromium-64.0.3282.119/media/base/audio_codecs.cc 2018-01-27 13:09:46.050882326 +0100
--- chromium-65.0.3294.5/media/base/audio_codecs.cc.0111~ 2017-12-16 00:05:11.000000000 +0100
+++ chromium-65.0.3294.5/media/base/audio_codecs.cc 2017-12-16 05:22:48.058363681 +0100
@@ -44,6 +44,8 @@ std::string GetCodecName(AudioCodec code
return "alac";
case kCodecAC3:
Expand All @@ -18,8 +18,8 @@
return kUnknownAudioCodec;
}

--- chromium-64.0.3282.119/media/base/audio_codecs.h.0111~ 2018-01-24 21:05:48.000000000 +0100
+++ chromium-64.0.3282.119/media/base/audio_codecs.h 2018-01-27 13:09:46.051882326 +0100
--- chromium-65.0.3294.5/media/base/audio_codecs.h.0111~ 2017-12-16 00:05:11.000000000 +0100
+++ chromium-65.0.3294.5/media/base/audio_codecs.h 2017-12-16 05:22:48.058363681 +0100
@@ -32,13 +32,14 @@ enum AudioCodec {
kCodecPCM_ALAW = 14,
kCodecALAC = 15,
Expand All @@ -36,8 +36,8 @@
};

std::string MEDIA_EXPORT GetCodecName(AudioCodec codec);
--- chromium-64.0.3282.119/media/base/decode_capabilities.cc.0111~ 2018-01-24 21:05:48.000000000 +0100
+++ chromium-64.0.3282.119/media/base/decode_capabilities.cc 2018-01-27 13:09:46.051882326 +0100
--- chromium-65.0.3294.5/media/base/decode_capabilities.cc.0111~ 2017-12-16 00:05:11.000000000 +0100
+++ chromium-65.0.3294.5/media/base/decode_capabilities.cc 2017-12-16 05:22:48.058363681 +0100
@@ -179,13 +179,13 @@ bool IsSupportedVideoConfig(const VideoC
case media::kCodecH264:
case media::kCodecVP8:
Expand All @@ -55,17 +55,17 @@
case media::kCodecDolbyVision:
return false;
}
--- chromium-64.0.3282.119/media/base/mime_util_internal.cc.0111~ 2018-01-24 21:05:48.000000000 +0100
+++ chromium-64.0.3282.119/media/base/mime_util_internal.cc 2018-01-27 13:11:48.656925482 +0100
@@ -74,6 +74,8 @@ const base::flat_map<std::string, MimeUt
{"vorbis", MimeUtil::VORBIS}, {"opus", MimeUtil::OPUS},
{"flac", MimeUtil::FLAC}, {"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8}, {"theora", MimeUtil::THEORA},
+ {"dts", MimeUtil::DTS}, {"mp2", MimeUtil::MP2},
+ {"mp4v.20.8", MimeUtil::MPEG4_SP}, {"mp4v.20.240", MimeUtil::MPEG4_ASP},
// TODO(dalecurtis): This is not the correct final string. Fix before enabling
// by default. http://crbug.com/784607
--- chromium-65.0.3294.5/media/base/mime_util_internal.cc.0111~ 2017-12-16 00:05:11.000000000 +0100
+++ chromium-65.0.3294.5/media/base/mime_util_internal.cc 2017-12-16 05:26:19.718997797 +0100
@@ -79,6 +79,8 @@ const base::flat_map<std::string, MimeUt
#if BUILDFLAG(ENABLE_AV1_DECODER)
{"av1", MimeUtil::AV1},
#endif
+ {"dts", MimeUtil::DTS}, {"mp2", MimeUtil::MP2},
+ {"mp4v.20.8", MimeUtil::MPEG4_SP}, {"mp4v.20.240", MimeUtil::MPEG4_ASP}
},
base::KEEP_FIRST_OF_DUPES);

@@ -175,6 +177,9 @@ VideoCodec MimeUtilToVideoCodec(MimeUtil
return kCodecTheora;
case MimeUtil::DOLBY_VISION:
Expand Down Expand Up @@ -108,34 +108,33 @@
const CodecSet webm_audio_codecs{OPUS, VORBIS};
CodecSet webm_video_codecs{VP8, VP9};
#if BUILDFLAG(ENABLE_AV1_DECODER)
@@ -296,6 +326,8 @@ void MimeUtil::AddSupportedMediaFormats(

CodecSet mp4_video_codecs;
mp4_video_codecs.emplace(H264);
+ mp4_video_codecs.emplace(MPEG4_SP);
+ mp4_video_codecs.emplace(MPEG4_ASP);
@@ -306,6 +336,8 @@ void MimeUtil::AddSupportedMediaFormats(
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
mp4_video_codecs.emplace(HEVC);
#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
@@ -329,6 +361,9 @@ void MimeUtil::AddSupportedMediaFormats(
AddContainerWithCodecs("application/ogg", ogg_codecs, false);
AddContainerWithCodecs("audio/flac", implicit_codec, false);
+ mp4_video_codecs.emplace(MPEG4_SP);
+ mp4_video_codecs.emplace(MPEG4_ASP);

#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
mp4_video_codecs.emplace(DOLBY_VISION);
@@ -340,12 +372,16 @@ void MimeUtil::AddSupportedMediaFormats(
DCHECK(!mp4_video_codecs.empty());
AddContainerWithCodecs("video/mp4", mp4_codecs, false);

+ AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs, false);
+ AddContainerWithCodecs("video/x-matroska", matroska_codecs, false);
+ AddContainerWithCodecs("video/x-matroska", matroska_video_codecs, false);
+
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
AddContainerWithCodecs("audio/mp3", implicit_codec, true);
@@ -341,6 +376,7 @@ void MimeUtil::AddSupportedMediaFormats(
AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS.
// These strings are supported for backwards compatibility only and thus only
// support the codecs needed for compatibility.
AddContainerWithCodecs("audio/x-m4a", aac, true);
AddContainerWithCodecs("video/x-m4v", avc_and_aac, true);
+ AddContainerWithCodecs("video/x-msvideo", matroska_codecs, true);

#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
// TODO(ddorwin): Exactly which codecs should be supported?
@@ -976,9 +1012,13 @@ bool MimeUtil::IsCodecProprietary(Codec
@@ -993,9 +1029,13 @@ bool MimeUtil::IsCodecProprietary(Codec
case H264:
case HEVC:
case DOLBY_VISION:
Expand All @@ -144,26 +143,28 @@
+ case MPEG4_ASP:
return true;

case PCM:
case MP3:
+ case MP2:
case PCM:
case VORBIS:
case OPUS:
case FLAC:
--- chromium-64.0.3282.119/media/base/mime_util_internal.h.0111~ 2018-01-27 13:09:46.051882326 +0100
+++ chromium-64.0.3282.119/media/base/mime_util_internal.h 2018-01-27 13:12:23.648938120 +0100
@@ -44,6 +44,10 @@ class MEDIA_EXPORT MimeUtil {
VP9,
--- chromium-65.0.3294.5/media/base/mime_util_internal.h.0111~ 2017-12-16 00:05:11.000000000 +0100
+++ chromium-65.0.3294.5/media/base/mime_util_internal.h 2017-12-16 05:22:48.058363681 +0100
@@ -45,7 +45,11 @@ class MEDIA_EXPORT MimeUtil {
THEORA,
DOLBY_VISION,
AV1,
- LAST_CODEC = AV1
+ DTS,
+ MP2,
+ MPEG4_SP,
+ MPEG4_ASP,
AV1,
LAST_CODEC = AV1
+ LAST_CODEC = MPEG4_ASP
};
--- chromium-64.0.3282.119/media/ffmpeg/ffmpeg_common.cc.0111~ 2018-01-24 21:05:48.000000000 +0100
+++ chromium-64.0.3282.119/media/ffmpeg/ffmpeg_common.cc 2018-01-27 13:09:46.051882326 +0100

// Platform configuration structure. Controls which codecs are supported at
--- chromium-65.0.3294.5/media/ffmpeg/ffmpeg_common.cc.0111~ 2017-12-16 00:05:11.000000000 +0100
+++ chromium-65.0.3294.5/media/ffmpeg/ffmpeg_common.cc 2017-12-16 05:22:48.059363690 +0100
@@ -115,6 +115,8 @@ AudioCodec CodecIDToAudioCodec(AVCodecID
return kCodecOpus;
case AV_CODEC_ID_ALAC:
Expand All @@ -184,8 +185,8 @@
default:
DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
}
--- chromium-64.0.3282.119/media/filters/ffmpeg_video_decoder.cc.0111~ 2018-01-24 21:05:48.000000000 +0100
+++ chromium-64.0.3282.119/media/filters/ffmpeg_video_decoder.cc 2018-01-27 13:13:07.616954175 +0100
--- chromium-65.0.3294.5/media/filters/ffmpeg_video_decoder.cc.0111~ 2017-12-16 00:05:11.000000000 +0100
+++ chromium-65.0.3294.5/media/filters/ffmpeg_video_decoder.cc 2017-12-16 05:22:48.059363690 +0100
@@ -59,7 +59,6 @@ static int GetThreadCount(const VideoDec
case kUnknownVideoCodec:
case kCodecVC1:
Expand All @@ -202,8 +203,8 @@
// Normalize to three threads for 1080p content, then scale linearly
// with number of pixels.
// Examples:
--- chromium-64.0.3282.119/media/remoting/proto_enum_utils.cc.0111~ 2018-01-24 21:05:49.000000000 +0100
+++ chromium-64.0.3282.119/media/remoting/proto_enum_utils.cc 2018-01-27 13:09:46.052882327 +0100
--- chromium-65.0.3294.5/media/remoting/proto_enum_utils.cc.0111~ 2017-12-16 00:05:12.000000000 +0100
+++ chromium-65.0.3294.5/media/remoting/proto_enum_utils.cc 2017-12-16 05:22:48.059363690 +0100
@@ -57,6 +57,7 @@ base::Optional<AudioCodec> ToMediaAudioC
CASE_RETURN_OTHER(kCodecPCM_ALAW);
CASE_RETURN_OTHER(kCodecALAC);
Expand All @@ -220,8 +221,8 @@
}
return base::nullopt; // Not a 'default' to ensure compile-time checks.
}
--- chromium-64.0.3282.119/media/remoting/rpc.proto.0111~ 2018-01-24 21:05:49.000000000 +0100
+++ chromium-64.0.3282.119/media/remoting/rpc.proto 2018-01-27 13:09:46.052882327 +0100
--- chromium-65.0.3294.5/media/remoting/rpc.proto.0111~ 2017-12-16 00:05:12.000000000 +0100
+++ chromium-65.0.3294.5/media/remoting/rpc.proto 2017-12-16 05:22:48.059363690 +0100
@@ -66,6 +66,7 @@ message AudioDecoderConfig {
kCodecPCM_ALAW = 14;
kCodecALAC = 15;
Expand All @@ -230,8 +231,8 @@
}

// Proto version of media::SampleFormat.
--- chromium-64.0.3282.119/net/base/mime_util.cc.0111~ 2018-01-24 21:05:50.000000000 +0100
+++ chromium-64.0.3282.119/net/base/mime_util.cc 2018-01-27 13:09:46.052882327 +0100
--- chromium-65.0.3294.5/net/base/mime_util.cc.0111~ 2017-12-16 00:05:13.000000000 +0100
+++ chromium-65.0.3294.5/net/base/mime_util.cc 2017-12-16 05:22:48.059363690 +0100
@@ -98,6 +98,9 @@ static const MimeInfo kPrimaryMappings[]
{"text/xml", "xml"},
{"video/mp4", "mp4,m4v"},
Expand Down
12 changes: 10 additions & 2 deletions chromium-55-flac.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- chromium-62.0.3202.89/media/base/mime_util_internal.cc.0114~ 2017-11-12 16:14:03.270153746 +0100
+++ chromium-62.0.3202.89/media/base/mime_util_internal.cc 2017-11-12 16:14:03.271153750 +0100
--- chromium-63.0.3230.0/media/base/mime_util_internal.cc.0114~ 2017-10-09 20:07:12.902664570 +0200
+++ chromium-63.0.3230.0/media/base/mime_util_internal.cc 2017-10-09 21:02:36.858649113 +0200
@@ -282,6 +282,7 @@ void MimeUtil::AddSupportedMediaFormats(
matroska_audio_codecs.insert(MPEG2_AAC);
matroska_audio_codecs.insert(MPEG4_AAC);
Expand All @@ -8,3 +8,11 @@

CodecSet matroska_video_codecs;
matroska_video_codecs.insert(THEORA);
@@ -358,6 +359,7 @@ void MimeUtil::AddSupportedMediaFormats(
flv_codecs.insert(VP6);
flv_codecs.insert(mp4_codecs.begin(), mp4_codecs.end());
flv_codecs.insert(MP3);
+ flv_codecs.insert(FLAC);

const CodecSet implicit_codec;
AddContainerWithCodecs("audio/wav", wav_codecs, false);
Loading

0 comments on commit 54edf00

Please sign in to comment.