Attachment 341459 Details for Bug 186040 – [GStreamer] Update "qtdemux: Clarify field name about stream-encryption-system" patch

[patch] [GStreamer] Update "qtdemux: Clarify field name about stream-encryption-system" patch

GStreamer-Update-qtdemux-Clarify-field-name-about-.patch (text/plain), 8.18 KB, created by Thibault Saunier on 2018-05-28 14:11:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Saunier

Created: 2018-05-28 14:11:54 PDT

Size: 8.18 KB

patch

obsolete

>From 45cb2bf8076674682b8fba2850eb47dd53fbdb4a Mon Sep 17 00:00:00 2001
>From: Thibault Saunier <tsaunier@igalia.com>
>Date: Mon, 28 May 2018 16:54:31 -0400
>Subject: [PATCH xserver] [GStreamer] Update "qtdemux: Clarify field name about
> stream-encryption-system" patch
>
>https://bugs.webkit.org/show_bug.cgi?id=186040
>---
> Source/WebCore/ChangeLog                      | 14 +++++++++++++
> .../MediaPlayerPrivateGStreamerBase.cpp       |  2 +-
> Tools/ChangeLog                               | 12 +++++++++++
> Tools/gstreamer/jhbuild.modules               |  2 +-
> ...field-name-about-stream-encryption-s.patch | 21 +++++++++----------
> 5 files changed, 38 insertions(+), 13 deletions(-)
>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d1ad052afd7..f6b9b6af3d3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-28  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GStreamer] Update "qtdemux: Clarify field name about stream-encryption-system" patch
>+        https://bugs.webkit.org/show_bug.cgi?id=186040
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        s/avalaible-stream-encryption-systems/available-stream-encryption-systems/g
>+
>+        Tests: imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-*
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::extractEventsAndSystemsFromMessage):
>+
> 2018-05-25  Thibault Saunier  <tsaunier@igalia.com>
> 
>         [GStreamer] Handle changes in the "drm-preferred-decryption-system-id" NEED_CONTEXT message.
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 1eb4696732c..8a53ddf6f0e 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -311,7 +311,7 @@ static std::pair<Vector<GRefPtr<GstEvent>>, Vector<String>> extractEventsAndSyst
>         streamEncryptionEventsVector.append(GRefPtr<GstEvent>(static_cast<GstEvent*>(g_value_get_boxed(gst_value_list_get_value(streamEncryptionEventsList, i)))));
> 
>     Vector<String> streamEncryptionAllowedSystemsVector;
>-    const GValue* streamEncryptionAllowedSystemsValue = gst_structure_get_value(structure, "avalaible-stream-encryption-systems");
>+    const GValue* streamEncryptionAllowedSystemsValue = gst_structure_get_value(structure, "available-stream-encryption-systems");
>     const char** streamEncryptionAllowedSystems = reinterpret_cast<const char**>(g_value_get_boxed(streamEncryptionAllowedSystemsValue));
>     if (streamEncryptionAllowedSystems) {
>         for (i = 0; streamEncryptionAllowedSystems[i]; ++i)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 38e428d0496..e20d4a1c4e6 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-28  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GStreamer] Update "qtdemux: Clarify field name about stream-encryption-system" patch
>+        https://bugs.webkit.org/show_bug.cgi?id=186040
>+
>+        The patch we merge contained a type and was merged in upstream GStreamer fixing that
>+        (s/avalaible/available/).
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch:
>+
> 2018-05-25  Thibault Saunier  <tsaunier@igalia.com>
> 
>         [GStreamer] Handle changes in the "drm-preferred-decryption-system-id" NEED_CONTEXT message.
>diff --git a/Tools/gstreamer/jhbuild.modules b/Tools/gstreamer/jhbuild.modules
>index c42d4266767..5aeb756ec0a 100644
>--- a/Tools/gstreamer/jhbuild.modules
>+++ b/Tools/gstreamer/jhbuild.modules
>@@ -71,7 +71,7 @@
>       <patch file="gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch" strip="1" /> 
>       <patch file="gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch" strip="1" /> 
>       <patch file="gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch" strip="1" /> 
>-      <patch file="gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch" strip="1" /> 
>+      <patch file="gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch" strip="1" /> 
>     </branch>
>   </autotools>
> 
>diff --git a/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch b/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch
>index d5901e148cb..3dd6bec3f60 100644
>--- a/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch
>+++ b/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch
>@@ -1,13 +1,12 @@
>-From 3de36f28377398e07ad8b90366db9b6b7544c09a Mon Sep 17 00:00:00 2001
>+From 0fbde2a07928ba79b7a4ddb4585f6b1de36a74bb Mon Sep 17 00:00:00 2001
> From: Thibault Saunier <tsaunier@igalia.com>
> Date: Fri, 25 May 2018 12:28:04 +0200
>-Subject: [PATCH 3/3] qtdemux: Clarify field name about
>- stream-encryption-system
>+Subject: [PATCH] qtdemux: Clarify field name about stream-encryption-system
> 
>-This field is actually only informatory but the user can potentially
>+This field is actually only informatory and the user can potentially
> choose something else. EME tests in WebKit testsuite actually doesn't
> take it into and force another encryption system to be used, and expects
>-to be given the occasion to be so.
>+to be given the occasion to do so.
> 
> This basically also reverts 3e063703b3a51b8aaa7f75f36c4660c583a60e93.
> ---
>@@ -15,10 +14,10 @@ This basically also reverts 3e063703b3a51b8aaa7f75f36c4660c583a60e93.
>  1 file changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
>-index 4116f4c69..a7ef6e634 100644
>+index bd3a00ccf..515687353 100644
> --- a/gst/isomp4/qtdemux.c
> +++ b/gst/isomp4/qtdemux.c
>-@@ -8059,12 +8059,6 @@ gst_qtdemux_request_protection_context (GstQTDemux * qtdemux,
>+@@ -8096,12 +8096,6 @@ gst_qtdemux_request_protection_context (GstQTDemux * qtdemux,
>    filtered_sys_ids = gst_protection_filter_systems_by_available_decryptors (
>        (const gchar **) qtdemux->protection_system_ids->pdata);
>  
>@@ -31,22 +30,22 @@ index 4116f4c69..a7ef6e634 100644
>    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 "
>-@@ -8096,7 +8090,8 @@ gst_qtdemux_request_protection_context (GstQTDemux * qtdemux,
>+@@ -8133,7 +8127,8 @@ gst_qtdemux_request_protection_context (GstQTDemux * qtdemux,
>    query = gst_query_new_context ("drm-preferred-decryption-system-id");
>    st = gst_query_writable_structure (query);
>    gst_structure_set (st, "track-id", G_TYPE_UINT, stream->track_id,
> -      "stream-encryption-systems", G_TYPE_STRV, filtered_sys_ids, NULL);
>-+      "avalaible-stream-encryption-systems", G_TYPE_STRV, filtered_sys_ids,
>++      "available-stream-encryption-systems", G_TYPE_STRV, filtered_sys_ids,
> +      NULL);
>    gst_structure_set_value (st, "stream-encryption-events", &event_list);
>    if (gst_qtdemux_run_query (element, query, GST_PAD_SRC)) {
>      gst_query_parse_context (query, &ctxt);
>-@@ -8120,7 +8115,9 @@ gst_qtdemux_request_protection_context (GstQTDemux * qtdemux,
>+@@ -8157,7 +8152,9 @@ gst_qtdemux_request_protection_context (GstQTDemux * qtdemux,
>          "drm-preferred-decryption-system-id");
>      st = (GstStructure *) gst_message_get_structure (msg);
>      gst_structure_set (st, "track-id", G_TYPE_UINT, stream->track_id,
> -        "stream-encryption-systems", G_TYPE_STRV, filtered_sys_ids, NULL);
>-+        "avalaible-stream-encryption-systems", G_TYPE_STRV, filtered_sys_ids,
>++        "available-stream-encryption-systems", G_TYPE_STRV, filtered_sys_ids,
> +        NULL);
> +
>      gst_structure_set_value (st, "stream-encryption-events", &event_list);
>-- 
>2.17.0

Actions: View | Formatted Diff | Diff

Attachments on bug 186040: 341459