Attachment 341199 Details for Bug 185948 – Patch

[patch] Patch

bug-185948-20180524185139.patch (text/plain), 4.50 KB, created by Yacine Bandou on 2018-05-24 09:51:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yacine Bandou

Created: 2018-05-24 09:51:39 PDT

Size: 4.50 KB

patch

obsolete

>Subversion Revision: 232152
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index fbee6d508f5bc770d8daec169fbdf9a031691e87..4814984a313e1b04d23edab787053ff0ecbf2b59 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,37 @@
>+2018-05-24  Yacine Bandou  <yacine.bandou_ext@softathome.com>
>+
>+        [EME][GStreamer] Fix regression after updating to GStreamer 1.14.1 in jhbuild(r232060)
>+        https://bugs.webkit.org/show_bug.cgi?id=185948
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        In GStreamer 1.14 the function "gst_protection_filter_systems_by_available_decryptors" returns NULL
>+        when there is no decryptor plugin that supports any of the system ID, instead of an empty array in Gstreamer 1.12.
>+
>+        Thus, the "gst_qtdemux_request_protection_context" function of qtdemux in the "gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection"
>+        patch doesn't wait for the function "gst_protection_filter_systems_by_available_decryptors" to return a NULL, and then,
>+        it crashes when send the "drm-preferred-decryption-system-id" GstMessage with a NULL value in the field "stream-encryption-systems".
>+
>+        Without this patch all the encrypted-media WPT tests crash like the followings:
>+
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-two-videos.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-playback.https.html
>+        imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.https.html
>+
>+        * gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch:
>+
> 2018-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         WebDriver: implement maximize, minimize and fullscreen window commands
>diff --git a/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch b/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch
>index c265ab4f393661394478ad9b2ec11a73951c0d3d..7767693307ece8cade619a3ff7588f8560768358 100644
>--- a/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch
>+++ b/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch
>@@ -122,7 +122,7 @@ index 705bdf7ca..da22463f8 100644
>        gst_pad_push_event (stream->pad, event);
>      }
>  
>-@@ -7756,12 +7790,142 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
>+@@ -7756,12 +7790,144 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
>  #endif
>  }
>  
>@@ -191,6 +191,8 @@ index 705bdf7ca..da22463f8 100644
> +  g_ptr_array_add (qtdemux->protection_system_ids, NULL);
> +  filtered_sys_ids = gst_protection_filter_systems_by_available_decryptors (
> +      (const gchar **) qtdemux->protection_system_ids->pdata);
>++  if (!filtered_sys_ids)
>++    filtered_sys_ids = g_new0 (char *, 1);
> +  g_ptr_array_remove_index (qtdemux->protection_system_ids,
> +      qtdemux->protection_system_ids->len - 1);
> +  GST_TRACE_OBJECT (qtdemux, "detected %u protection systems, we have "

Flags:

calvaris: review-
calvaris: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 185948: 341199 | 341264 | 341271 | 341282 | 341290