-
-
Notifications
You must be signed in to change notification settings - Fork 1
/
chromium-69-wmvflvmpg.patch
115 lines (109 loc) · 4.13 KB
/
chromium-69-wmvflvmpg.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
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
@@ -91,6 +91,17 @@
{"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},
+ {"flv", MimeUtil::FLV1},
});
return *kStringToCodecMap;
@@ -323,6 +333,7 @@
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, MP2};
CodecSet mp4_audio_codecs{FLAC, MP3, OPUS, MP2, DTS, AC3, EAC3};
@@ -366,6 +377,28 @@
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);
+ flv_codecs.emplace(FLV1);
+
const CodecSet implicit_codec;
AddContainerWithCodecs("audio/wav", wav_codecs);
AddContainerWithCodecs("audio/x-wav", wav_codecs);
@@ -389,6 +421,11 @@
AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs);
AddContainerWithCodecs("video/x-matroska", matroska_codecs);
AddContainerWithCodecs("video/x-msvideo", matroska_codecs);
+ AddContainerWithCodecs("video/x-ms-wmv", wmv_codecs);
+ AddContainerWithCodecs("audio/x-ms-wma", wma_codecs);
+ AddContainerWithCodecs("video/x-ms-asf", wmv_codecs);
+ AddContainerWithCodecs("video/x-flv", flv_codecs);
+ AddContainerWithCodecs("video/mpeg", mp1_codecs);
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
AddContainerWithCodecs("audio/aac", implicit_codec); // AAC / ADTS.
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",
diff -up chromium-86.0.4240.111/media/base/mime_util_internal.h.media~ chromium-86.0.4240.111/media/base/mime_util_internal.h
--- chromium-86.0.4240.111/media/base/mime_util_internal.h.media~ 2020-10-21 17:03:42.549720159 +0200
+++ chromium-86.0.4240.111/media/base/mime_util_internal.h 2020-10-21 17:06:08.631768545 +0200
@@ -51,7 +51,18 @@ class MEDIA_EXPORT MimeUtil {
MP2,
MPEG4_SP,
MPEG4_ASP,
- LAST_CODEC = MPEG4_ASP
+ MSMPEG4v1,
+ MSMPEG4v2,
+ MSMPEG4v3,
+ WMV7,
+ WMV8,
+ WMV9,
+ VC1,
+ WMA,
+ VP6,
+ FLV1,
+ MPEG1,
+ LAST_CODEC = MPEG1
};
// Platform configuration structure. Controls which codecs are supported at