mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bryce Seager van Dyk <bvandyk@mozilla.com>
|
||
|
|
Date: Fri, 26 Mar 2021 19:06:00 +0000
|
||
|
|
Subject: [PATCH] Bug 1701089 - Accept "vp09" codec string in Widevine
|
||
|
|
manifest. r=mjf, a=RyanVM
|
||
|
|
|
||
|
|
Differential Revision: https://phabricator.services.mozilla.com/D109810
|
||
|
|
---
|
||
|
|
dom/media/gmp/GMPParent.cpp | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
|
||
|
|
index 2e7f80d368134..1acb0ac18eff6 100644
|
||
|
|
--- a/dom/media/gmp/GMPParent.cpp
|
||
|
|
+++ b/dom/media/gmp/GMPParent.cpp
|
||
|
|
@@ -884,15 +884,16 @@ RefPtr<GenericPromise> GMPParent::ParseChromiumManifest(
|
||
|
|
//
|
||
|
|
// Google's code to parse manifests can be used as a reference for strings
|
||
|
|
// the manifest may contain
|
||
|
|
- // https://cs.chromium.org/chromium/src/chrome/common/media/cdm_manifest.cc?l=73&rcl=393e60bfc2299449db7ef374c0ef1c324716e562
|
||
|
|
+ // https://source.chromium.org/chromium/chromium/src/+/master:components/cdm/common/cdm_manifest.cc;l=74;drc=775880ced8a989191281e93854c7f2201f25068f
|
||
|
|
//
|
||
|
|
// Gecko's internal strings can be found at
|
||
|
|
// https://searchfox.org/mozilla-central/rev/ea63a0888d406fae720cf24f4727d87569a8cab5/dom/media/eme/MediaKeySystemAccess.cpp#149-155
|
||
|
|
for (const nsCString& chromiumCodec : codecs) {
|
||
|
|
nsCString codec;
|
||
|
|
if (chromiumCodec.EqualsASCII("vp8")) {
|
||
|
|
codec = "vp8"_ns;
|
||
|
|
- } else if (chromiumCodec.EqualsASCII("vp9.0")) {
|
||
|
|
+ } else if (chromiumCodec.EqualsASCII("vp9.0") || // Legacy string.
|
||
|
|
+ chromiumCodec.EqualsASCII("vp09")) {
|
||
|
|
codec = "vp9"_ns;
|
||
|
|
} else if (chromiumCodec.EqualsASCII("avc1")) {
|
||
|
|
codec = "h264"_ns;
|