mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-23 23:42:54 +00:00
Sync extra-media.patch with Mageia and rename it
This commit is contained in:
parent
8abe1e4b9d
commit
d82a90686c
2 changed files with 9 additions and 8 deletions
|
@ -134,7 +134,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
|
|||
const CodecSet webm_audio_codecs{OPUS, VORBIS};
|
||||
CodecSet webm_video_codecs{VP8, VP9};
|
||||
#if BUILDFLAG(ENABLE_AV1_DECODER)
|
||||
@@ -304,6 +337,8 @@
|
||||
@@ -302,6 +335,8 @@
|
||||
#endif // BUILDFLAG(ENABLE_MPEG_H_AUDIO_DEMUXING)
|
||||
|
||||
mp4_video_codecs.emplace(H264);
|
||||
|
@ -143,7 +143,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
|
|||
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
||||
mp4_video_codecs.emplace(HEVC);
|
||||
#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
||||
@@ -341,12 +376,16 @@
|
||||
@@ -339,12 +374,16 @@
|
||||
DCHECK(!mp4_video_codecs.empty());
|
||||
AddContainerWithCodecs("video/mp4", mp4_codecs, false);
|
||||
|
||||
|
@ -159,8 +159,8 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
|
|||
+ AddContainerWithCodecs("video/x-msvideo", matroska_codecs, true);
|
||||
|
||||
#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
|
||||
// TODO(ddorwin): Exactly which codecs should be supported?
|
||||
@@ -968,10 +1007,14 @@
|
||||
CodecSet mp2t_codecs{H264, MPEG2_AAC, MPEG4_AAC, MP3};
|
||||
@@ -965,10 +1004,14 @@
|
||||
case H264:
|
||||
case HEVC:
|
||||
case DOLBY_VISION:
|
||||
|
@ -252,9 +252,9 @@ diff -up chromium-62.0.3192.0/media/remoting/proto_enum_utils.cc.extra-media chr
|
|||
}
|
||||
return base::nullopt; // Not a 'default' to ensure compile-time checks.
|
||||
}
|
||||
diff -up chromium-62.0.3192.0/media/remoting/rpc.proto.extra-media chromium-62.0.3192.0/media/remoting/rpc.proto
|
||||
--- chromium-62.0.3192.0/media/remoting/rpc.proto.extra-media 2017-08-22 21:04:45.000000000 +0200
|
||||
+++ chromium-62.0.3192.0/media/remoting/rpc.proto 2017-08-30 15:39:09.736186059 +0200
|
||||
diff -up chromium-62.0.3192.0/media/remoting/media_remoting_rpc.proto.extra-media chromium-62.0.3192.0/media/remoting/media_remoting_rpc.proto
|
||||
--- chromium-62.0.3192.0/media/remoting/media_remoting_rpc.proto.extra-media 2017-08-22 21:04:45.000000000 +0200
|
||||
+++ chromium-62.0.3192.0/media/remoting/media_remoting_rpc.proto 2017-08-30 15:39:09.736186059 +0200
|
||||
@@ -67,6 +67,7 @@ message AudioDecoderConfig {
|
||||
kCodecALAC = 15;
|
||||
kCodecAC3 = 16;
|
|
@ -8,6 +8,7 @@
|
|||
# [7] https://packages.altlinux.org/ru/Sisyphus/srpms/chromium/spec
|
||||
# [8] https://build.opensuse.org/package/show/network:chromium/chromium
|
||||
# [9] https://packages.ubuntu.com/search?keywords=chromium-browser
|
||||
# [10] http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/
|
||||
|
||||
# The script ./patches.sh helps to sync patches in spec and real files
|
||||
|
||||
|
@ -58,7 +59,7 @@ Patch4: chromium-30.0.1599.66-master-prefs-path.patch
|
|||
|
||||
Patch22: chromium-54-proprietary-codecs-assert.patch
|
||||
# (cjw) Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio.
|
||||
Patch32: chromium-55-extra-media.patch
|
||||
Patch32: Mageia-extra-media.patch
|
||||
# (cjw) fix build with current glib...
|
||||
Patch36: chromium-58-glib.patch
|
||||
# New from Debian
|
||||
|
|
Loading…
Add table
Reference in a new issue