Changeset 232060 in webkit


Ignore:
Timestamp:
May 22, 2018 4:37:15 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

[GStreamer] Update to GStreamer 1.14.1 in jhbuild
​https://bugs.webkit.org/show_bug.cgi?id=185689

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2018-05-22
Reviewed by Philippe Normand.

And update the patches, removing the ones that have been merged upstream.

  • gstreamer/jhbuild.modules:
  • gstreamer/patches/gst-plugins-good-0001-gstgdkpixbufdec-stop-pretending-to-decode-gifs.patch: Removed.
  • gstreamer/patches/gst-plugins-good-0001-souphttpsrc-cookie-jar-and-context-query-support.patch: Removed. Not needed anymore and closed as OBSELETE upstream.
  • gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch: Renamed from Tools/gstreamer/patches/gst-plugins-good-0006-qtdemux-add-context-for-a-preferred-protection.patch

This patch has now been merged in GStreamer master and will be there in GStreamer 1.16.

  • gstreamer/patches/gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch: Renamed from Tools/gstreamer/patches/gst-plugins-good-0008-qtdemux-also-push-buffers-without-encryption-info-in.patch.

This patch has now been merged in GStreamer master and will be there in GStreamer 1.16.

  • gstreamer/patches/gst-plugins-good-0009-qtdemux-fix-assert-when-moof-contains-one-sample.patch: Removed.
  • gstreamer/patches/gstreamer-0001-protection-added-function-to-filter-system-ids.patch: Removed.
Location:
trunk/Tools
Files:
4 deleted
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r232052 r232060  
     12018-05-22  Thibault Saunier  <tsaunier@igalia.com>
     2
     3        [GStreamer] Update to GStreamer 1.14.1 in jhbuild
     4        https://bugs.webkit.org/show_bug.cgi?id=185689
     5
     6        Reviewed by Philippe Normand.
     7
     8        And update the patches, removing the ones that have been merged upstream.
     9
     10        * gstreamer/jhbuild.modules:
     11        * gstreamer/patches/gst-plugins-good-0001-gstgdkpixbufdec-stop-pretending-to-decode-gifs.patch: Removed.
     12        * gstreamer/patches/gst-plugins-good-0001-souphttpsrc-cookie-jar-and-context-query-support.patch: Removed. Not needed anymore and closed as OBSELETE upstream.
     13        * gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch: Renamed from Tools/gstreamer/patches/gst-plugins-good-0006-qtdemux-add-context-for-a-preferred-protection.patch
     14        This patch has now been merged in GStreamer master and will be there in GStreamer 1.16.
     15        * gstreamer/patches/gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch: Renamed from Tools/gstreamer/patches/gst-plugins-good-0008-qtdemux-also-push-buffers-without-encryption-info-in.patch.
     16        This patch has now been merged in GStreamer master and will be there in GStreamer 1.16.
     17        * gstreamer/patches/gst-plugins-good-0009-qtdemux-fix-assert-when-moof-contains-one-sample.patch: Removed.
     18        * gstreamer/patches/gstreamer-0001-protection-added-function-to-filter-system-ids.patch: Removed.
     19
    1202018-05-21  Yusuke Suzuki  <utatane.tea@gmail.com>
    221

  • trunk/Tools/gstreamer/jhbuild.modules

    r230565 r232060  
    4545      <dep package="orc"/>
    4646    </dependencies>
    47     <branch module="gstreamer/gstreamer-${version}.tar.xz" version="1.12.4"
    48             repo="gstreamer"
    49             hash="sha256:5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674">
    50       <patch file="gstreamer-0001-protection-added-function-to-filter-system-ids.patch" strip="1"/>
     47    <branch hash="sha:28d82b0d261544a9bf85b429399929e4986eb00efcf1ce16cc71d269a4c3186c" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.14.1">
    5148    </branch>
    5249  </autotools>
    … …  
    6158      <dep package="gstreamer"/>
    6259    </dependencies>
    63     <branch module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" version="1.12.4"
    64             repo="gstreamer"
    65             hash="sha256:4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282"/>
     60    <branch hash="sha:1026c7c3082d825d9b5d034c1a6dd8a4ebab60eb3738b0a0afde4ad2dc0b0db5" module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" repo="gstreamer" version="1.14.1" />
    6661  </autotools>
    6762
    … …  
    7267    </dependencies>
    7368
    74     <branch module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" version="1.12.4"
    75             repo="gstreamer"
    76             hash="sha256:649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957">
    77       <patch file="gst-plugins-good-0001-gstgdkpixbufdec-stop-pretending-to-decode-gifs.patch" strip="1"/>
    78       <patch file="gst-plugins-good-0005-souphttpsrc-cookie-jar-and-context-query-support.patch" strip="1"/>
    79       <patch file="gst-plugins-good-0006-qtdemux-add-context-for-a-preferred-protection.patch" strip="1"/>
    80       <patch file="gst-plugins-good-0008-qtdemux-also-push-buffers-without-encryption-info-in.patch" strip="1"/>
    81       <patch file="gst-plugins-good-0009-qtdemux-fix-assert-when-moof-contains-one-sample.patch" strip="1"/>
     69    <branch hash="sha:34ec062ddb766a32377532e039781f4a16fbc3e8b449e642605bacab26a99172" module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" repo="gstreamer" version="1.14.1">
     70      <patch file="gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch" strip="1" /> <!-- Merged as ee4b45da24cb7465b416c230597f8efc7b2c45cb -->
     71      <patch file="gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch" strip="1" /> <!-- Merged as 844423ff99e281fc831303b92861ed43ce5c1518 -->
    8272    </branch>
    8373  </autotools>
    … …  
    8979      <dep package="openh264"/>
    9080    </dependencies>
    91     <branch module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" version="1.12.4"
    92             repo="gstreamer"
    93             hash="sha256:0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08"/>
     81    <branch hash="sha:2a77c6908032aafdf2cd2e5823fec948f16a25c2d1497a953828d762dc20d61a" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.14.1" />
    9482  </autotools>
    9583
    … …  
    9886      <dep package="gst-plugins-base"/>
    9987    </dependencies>
    100     <branch module="gst-libav/gst-libav-${version}.tar.xz" version="1.12.4"
    101             repo="gstreamer"
    102             hash="sha256:2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62"/>
     88    <branch hash="sha:eff80a02d2f2fb9f34b67e9a26e9954d3218c7aa18e863f2a47805fa7066029d" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.14.1" />
    10389  </autotools>
    10490
    10591  <autotools id="gstreamer-vaapi">
    106     <branch module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" version="1.12.4"
    107             repo="gstreamer"
    108             hash="sha256:1c2d77242e1f30c4d1394636cae9f6877228a017960fca96881e0080d8b6e9c9"/>
     92    <branch hash="sha:585c3ddb0c39220de0a33e5d0ed6196a108b8407ec3538d7c64617713b4434e8" module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" repo="gstreamer" version="1.14.1" />
    10993    <dependencies>
    11094      <dep package="gstreamer"/>

  • trunk/Tools/gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch

    r232059 r232060  
    1 From e09ab95ad39264783bf0e57dfb89165ad9b83802 Mon Sep 17 00:00:00 2001
     1From 0ba62ba4805e2cdbed17fa9934762d685be42fd4 Mon Sep 17 00:00:00 2001
    22From: Xabier Rodriguez Calvar <calvaris@igalia.com>
    33Date: Wed, 21 Jun 2017 17:59:21 +0200
    4 Subject: [PATCH] qtdemux: add context for a preferred protection
     4Subject: [PATCH 2/7] qtdemux: add context for a preferred protection
    55
    66qtdemux selected the first system corresponding to a working GStreamer
    … …  
    3232https://bugzilla.gnome.org/show_bug.cgi?id=770107
    3333---
    34  gst/isomp4/qtdemux.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++++--
     34 gst/isomp4/qtdemux.c | 200 +++++++++++++++++++++++++++++++++++++++++--
    3535 gst/isomp4/qtdemux.h |   1 +
    3636 2 files changed, 195 insertions(+), 6 deletions(-)
    3737
    3838diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
    39 index f0f8320e2..f710d2685 100644
     39index 705bdf7ca..da22463f8 100644
    4040--- a/gst/isomp4/qtdemux.c
    4141+++ b/gst/isomp4/qtdemux.c
    42 @@ -513,6 +513,8 @@ static GstIndex *gst_qtdemux_get_index (GstElement * element);
     42@@ -511,6 +511,8 @@ static GstIndex *gst_qtdemux_get_index (GstElement * element);
    4343 #endif
    4444 static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element,
    … …  
    4949 static gboolean qtdemux_sink_activate_mode (GstPad * sinkpad,
    5050     GstObject * parent, GstPadMode mode, gboolean active);
    51 @@ -602,6 +604,7 @@ gst_qtdemux_class_init (GstQTDemuxClass * klass)
     51@@ -600,6 +602,7 @@ gst_qtdemux_class_init (GstQTDemuxClass * klass)
    5252   gstelement_class->set_index = GST_DEBUG_FUNCPTR (gst_qtdemux_set_index);
    5353   gstelement_class->get_index = GST_DEBUG_FUNCPTR (gst_qtdemux_get_index);
    … …  
    5757   gst_tag_register_musicbrainz_tags ();
    5858 
    59 @@ -660,6 +663,7 @@ gst_qtdemux_init (GstQTDemux * qtdemux)
     59@@ -658,6 +661,7 @@ gst_qtdemux_init (GstQTDemux * qtdemux)
    6060   qtdemux->cenc_aux_info_sizes = NULL;
    6161   qtdemux->cenc_aux_sample_count = 0;
    … …  
    6565   gst_segment_init (&qtdemux->segment, GST_FORMAT_TIME);
    6666   qtdemux->tag_list = gst_tag_list_new_empty ();
    67 @@ -2114,6 +2118,10 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
     67@@ -2121,6 +2125,10 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
    6868       g_ptr_array_free (qtdemux->protection_system_ids, TRUE);
    6969       qtdemux->protection_system_ids = NULL;
    … …  
    7676     gst_flow_combiner_reset (qtdemux->flowcombiner);
    7777     for (n = 0; n < qtdemux->n_streams; n++)
    78 @@ -2600,6 +2608,28 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
     78@@ -2606,6 +2614,28 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
     79   return result;
    7980 }
    8081 
    81  static void
     82+static void
    8283+gst_qtdemux_set_context (GstElement * element, GstContext * context)
    8384+{
    … …  
    101102+}
    102103+
    103 +static void
     104 static void
    104105 qtdemux_parse_ftyp (GstQTDemux * qtdemux, const guint8 * buffer, gint length)
    105106 {
    106    /* counts as header data */
    107 @@ -3829,6 +3859,8 @@ qtdemux_parse_pssh (GstQTDemux * qtdemux, GNode * node)
     107@@ -3847,6 +3877,8 @@ qtdemux_parse_pssh (GstQTDemux * qtdemux, GNode * node)
    108108   event = gst_event_new_protection (sysid_string, pssh,
    109109       (parent_box_type == FOURCC_moov) ? "isobmff/moov" : "isobmff/moof");
    … …  
    114114         gst_event_ref (event));
    115115   }
    116 @@ -5538,6 +5570,8 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
     116@@ -5563,6 +5595,8 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
    117117     GstEvent *event;
    118118 
    … …  
    123123     }
    124124 
    125 @@ -7696,11 +7730,141 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
     125@@ -7756,12 +7790,142 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
     126 #endif
    126127 }
    127128 
    128  static gboolean
     129+static gboolean
    129130+pad_query (const GValue * item, GValue * value, gpointer user_data)
    130131+{
    … …  
    256257+}
    257258+
    258 +static gboolean
     259 static gboolean
    259260 gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
    260261     QtDemuxStream * stream)
    … …  
    266267   g_return_val_if_fail (qtdemux != NULL, FALSE);
    267268   g_return_val_if_fail (stream != NULL, FALSE);
    268 @@ -7716,17 +7880,41 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
     269@@ -7777,17 +7941,41 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
    269270         "cenc protection system information has been found");
    270271     return FALSE;
    … …  
    314315     gst_structure_set (s,
    315316diff --git a/gst/isomp4/qtdemux.h b/gst/isomp4/qtdemux.h
    316 index ebd725871..b3d64a4e8 100644
     317index ad4da3ef2..079372356 100644
    317318--- a/gst/isomp4/qtdemux.h
    318319+++ b/gst/isomp4/qtdemux.h
    319 @@ -154,6 +154,7 @@ struct _GstQTDemux {
     320@@ -151,6 +151,7 @@ struct _GstQTDemux {
    320321   guint64 cenc_aux_info_offset;
    321322   guint8 *cenc_aux_info_sizes;
    … …  
    326327   /*
    327328--
    328 2.11.0
    329 
     3292.17.0
     330

  • trunk/Tools/gstreamer/patches/gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch

    r232059 r232060  
    1 From 78559bc5db3495f12b0284e4be5fc8bfcd7041e2 Mon Sep 17 00:00:00 2001
     1From 762e9c645ec13513c62eb5a3800d7406e01cdcb7 Mon Sep 17 00:00:00 2001
    22From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
    33Date: Mon, 24 Apr 2017 17:22:02 +0000
    4 Subject: [PATCH] qtdemux: also push buffers without encryption info instead of
    5  dropping them
     4Subject: [PATCH 3/7] qtdemux: also push buffers without encryption info
     5 instead of dropping them
    66
    77---
    8  gst/isomp4/qtdemux.c | 26 ++++++++++++--------------
    9  1 file changed, 12 insertions(+), 14 deletions(-)
     8 gst/isomp4/qtdemux.c | 39 +++++++++++++++++++--------------------
     9 1 file changed, 19 insertions(+), 20 deletions(-)
    1010
    1111diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
    12 index f0f8320..3f2c016 100644
     12index da22463f8..8e9f5b9ae 100644
    1313--- a/gst/isomp4/qtdemux.c
    1414+++ b/gst/isomp4/qtdemux.c
    15 @@ -5541,26 +5541,25 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
     15@@ -5600,26 +5600,25 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
    1616       gst_pad_push_event (stream->pad, event);
    1717     }
    … …  
    6060 
    6161--
    62 2.11.0
     622.17.0
    6363
Note: See TracChangeset for help on using the changeset viewer.