Changeset 216179 in webkit


Ignore:
Timestamp:
May 4, 2017 4:57:08 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Bump GStreamer version to 1.10.4 in jhbuild
​https://bugs.webkit.org/show_bug.cgi?id=171595

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2017-05-04
Reviewed by Xabier Rodriguez-Calvar.

  • gtk/jhbuild.modules:
  • gtk/patches/gst-plugins-bad-0001-dtls-port-to-OpenSSL-1.1.0.patch: Removed.
  • gtk/patches/gst-plugins-bad-0002-dtlscertificate-Fix-error-checking-in-RSA_generate_k.patch: Removed.
  • gtk/patches/gst-plugins-good-0001-rtpbin-pipeline-gets-an-EOS-when-any-rtpsources-byes.patch: Removed.
  • gtk/patches/gst-plugins-good-0002-rtpbin-avoid-generating-errors-when-rtcp-messages-ar.patch: Removed.
  • gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch:
  • gtk/patches/gst-plugins-good-Revert-qtdemux-expose-streams-with-first-moof-for-fr.patch: Removed.
  • gtk/patches/gst-plugins-good-use-the-tfdt-decode-time.patch: Removed.
Location:
trunk/Tools
Files:
6 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r216173 r216179  
     12017-05-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Bump GStreamer version to 1.10.4 in jhbuild
     4        https://bugs.webkit.org/show_bug.cgi?id=171595
     5
     6        Reviewed by Xabier Rodriguez-Calvar.
     7
     8        * gtk/jhbuild.modules:
     9        * gtk/patches/gst-plugins-bad-0001-dtls-port-to-OpenSSL-1.1.0.patch: Removed.
     10        * gtk/patches/gst-plugins-bad-0002-dtlscertificate-Fix-error-checking-in-RSA_generate_k.patch: Removed.
     11        * gtk/patches/gst-plugins-good-0001-rtpbin-pipeline-gets-an-EOS-when-any-rtpsources-byes.patch: Removed.
     12        * gtk/patches/gst-plugins-good-0002-rtpbin-avoid-generating-errors-when-rtcp-messages-ar.patch: Removed.
     13        * gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch:
     14        * gtk/patches/gst-plugins-good-Revert-qtdemux-expose-streams-with-first-moof-for-fr.patch: Removed.
     15        * gtk/patches/gst-plugins-good-use-the-tfdt-decode-time.patch: Removed.
     16
    1172017-05-03  Saam Barati  <sbarati@apple.com>
    218

  • trunk/Tools/gtk/jhbuild.modules

    r215744 r216179  
    354354  </autotools>
    355355
    356   <autotools id="orc" autogenargs="--disable-gtk-doc" autogen-sh="configure">
    357     <branch module="orc/orc-0.4.17.tar.gz" version="0.4.17"
     356  <autotools id="gstreamer" autogen-sh="configure" autogenargs="--disable-gtk-doc">
     357    <if condition-set="macos">
     358      <autogenargs value="--disable-introspection"/>
     359    </if>
     360    <dependencies>
     361      <dep package="orc"/>
     362    </dependencies>
     363    <branch module="gstreamer/gstreamer-${version}.tar.xz" version="1.10.4"
    358364            repo="gstreamer"
    359             hash="sha256:4fc7cca48c59fff23afee78fb642cdbde001f56401c8f47b95a16578d1d5d7e8"
    360             md5sum="af1bf3dab9e69f3c36f389285e2a12a1"/>
    361   </autotools>
    362 
    363   <autotools id="gstreamer" autogen-sh="configure" autogenargs="--disable-gtk-doc">
    364     <if condition-set="macos">
    365       <autogenargs value="--disable-introspection"/>
    366     </if>
    367     <dependencies>
    368       <dep package="orc"/>
    369     </dependencies>
    370     <branch module="gstreamer/gstreamer-${version}.tar.xz" version="1.8.0"
    371             repo="gstreamer"
    372             hash="sha256:947a314a212b5d94985d89b43440dbe66b696e12bbdf9a2f78967b98d74abedc"
    373             md5sum="6846d7289ec323c38c49b818171e955a">
     365            hash="sha256:50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218">
    374366      <patch file="gstreamer-0001-protection-added-function-to-filter-system-ids.patch" strip="1"/>
    375367    </branch>
    … …  
    385377      <dep package="gstreamer"/>
    386378    </dependencies>
    387     <branch module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" version="1.8.0"
     379    <branch module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" version="1.10.4"
    388380            repo="gstreamer"
    389             hash="sha256:abc0acc1d15b4b9c97c65cd9689bd6400081853b9980ea428d3c8572dd791522"
    390             md5sum="20cc8231609318310f2a55f64c86cbb4"/>
     381            hash="sha256:f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7"/>
    391382  </autotools>
    392383
    … …  
    400391    </dependencies>
    401392
    402     <branch module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" version="1.8.0"
     393    <branch module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" version="1.10.4"
    403394            repo="gstreamer"
    404             hash="sha256:c20c134d47dbc238d921707a3b66da709c2b4dd89f9d267cec13d1ddf16e9f4d"
    405             md5sum="91ed4649c7c2e43a61f731d144f6f6d0">
    406       <patch file="gst-plugins-good-use-the-tfdt-decode-time.patch" strip="1"/>
    407       <patch file="gst-plugins-good-Revert-qtdemux-expose-streams-with-first-moof-for-fr.patch" strip="1"/>
    408       <patch file="gst-plugins-good-0001-rtpbin-pipeline-gets-an-EOS-when-any-rtpsources-byes.patch" strip="1"/>
    409       <patch file="gst-plugins-good-0002-rtpbin-avoid-generating-errors-when-rtcp-messages-ar.patch" strip="1"/>
     395            hash="sha256:8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e">
    410396      <patch file="gst-plugins-good-0003-rtpbin-receive-bundle-support.patch" strip="1"/>
    411397      <patch file="gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch" strip="1"/>
    … …  
    421407      <dep package="openh264"/>
    422408    </dependencies>
    423     <branch module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" version="1.8.0"
     409    <branch module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" version="1.10.4"
    424410            repo="gstreamer"
    425             hash="sha256:116376dd1085082422e0b21b0ecd3d1cb345c469c58e32463167d4675f4ca90e"
    426             md5sum="1c2d797bb96a81e9ef570c7a0a37203e">
    427       <patch file="gst-plugins-bad-0001-dtls-port-to-OpenSSL-1.1.0.patch" strip="1"/>
    428       <patch file="gst-plugins-bad-0002-dtlscertificate-Fix-error-checking-in-RSA_generate_k.patch" strip="1"/>
    429     </branch>
     411            hash="sha256:23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966"/>
    430412  </autotools>
    431413
    … …  
    434416      <dep package="gst-plugins-base"/>
    435417    </dependencies>
    436     <branch module="gst-libav/gst-libav-${version}.tar.xz" version="1.8.0"
     418    <branch module="gst-libav/gst-libav-${version}.tar.xz" version="1.10.4"
    437419            repo="gstreamer"
    438             hash="sha256:5a1ce28876aee93cb4f3d090f0e807915a5d9bc1325e3480dd302b85aeb4291c"
    439             md5sum="361638fa45466c5050bcde6bfe10fa46"/>
     420            hash="sha256:6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b"/>
    440421  </autotools>
    441422

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

    r211567 r216179  
    1 From ae4f7d4f09a051c2fbbd05e4df9f79fa6522104f Mon Sep 17 00:00:00 2001
     1From 248573a84e8f715e5abdc0a2a5ce2faf3e7852fd Mon Sep 17 00:00:00 2001
    22From: Xabier Rodriguez Calvar <calvaris@igalia.com>
    33Date: Fri, 16 Sep 2016 16:08:18 +0200
    … …  
    1414---
    1515 gst/isomp4/qtdemux.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++++--
    16  gst/isomp4/qtdemux.h |   2 +-
    17  2 files changed, 204 insertions(+), 7 deletions(-)
     16 gst/isomp4/qtdemux.h |   2 +
     17 2 files changed, 205 insertions(+), 6 deletions(-)
    1818
    1919diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
    20 index 0425e66..e05e75e 100644
     20index 4cbcaedb2..2d4279646 100644
    2121--- a/gst/isomp4/qtdemux.c
    2222+++ b/gst/isomp4/qtdemux.c
    23 @@ -480,6 +480,8 @@ static GstIndex *gst_qtdemux_get_index (GstElement * element);
     23@@ -490,6 +490,8 @@ static GstIndex *gst_qtdemux_get_index (GstElement * element);
    2424 #endif
    2525 static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element,
    … …  
    3030 static gboolean qtdemux_sink_activate_mode (GstPad * sinkpad,
    3131     GstObject * parent, GstPadMode mode, gboolean active);
    32 @@ -554,6 +556,7 @@ gst_qtdemux_class_init (GstQTDemuxClass * klass)
     32@@ -576,6 +578,7 @@ gst_qtdemux_class_init (GstQTDemuxClass * klass)
    3333   gstelement_class->set_index = GST_DEBUG_FUNCPTR (gst_qtdemux_set_index);
    3434   gstelement_class->get_index = GST_DEBUG_FUNCPTR (gst_qtdemux_get_index);
    … …  
    3838   gst_tag_register_musicbrainz_tags ();
    3939 
    40 @@ -612,6 +615,7 @@ gst_qtdemux_init (GstQTDemux * qtdemux)
     40@@ -634,6 +637,7 @@ gst_qtdemux_init (GstQTDemux * qtdemux)
    4141   qtdemux->cenc_aux_info_sizes = NULL;
    4242   qtdemux->cenc_aux_sample_count = 0;
    … …  
    4646   gst_segment_init (&qtdemux->segment, GST_FORMAT_TIME);
    4747   qtdemux->flowcombiner = gst_flow_combiner_new ();
    48 @@ -1972,6 +1976,10 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
     48@@ -1997,6 +2001,10 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
    4949     g_queue_foreach (&qtdemux->protection_event_queue, (GFunc) gst_event_unref,
    5050         NULL);
    … …  
    5757   qtdemux->offset = 0;
    5858   gst_adapter_clear (qtdemux->adapter);
    59 @@ -2404,6 +2412,29 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
     59@@ -2485,6 +2493,29 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
    6060 }
    6161 
    … …  
    8787 {
    8888   /* counts as header data */
    89 @@ -3392,6 +3423,8 @@ qtdemux_parse_pssh (GstQTDemux * qtdemux, GNode * node)
     89@@ -3673,6 +3704,8 @@ qtdemux_parse_pssh (GstQTDemux * qtdemux, GNode * node)
    9090   event = gst_event_new_protection (sysid_string, pssh,
    9191       (parent_box_type == FOURCC_moov) ? "isobmff/moov" : "isobmff/moof");
    … …  
    9696         gst_event_ref (event));
    9797   }
    98 @@ -4993,6 +5026,12 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
     98@@ -5380,6 +5413,12 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
    9999     GstEvent *event;
    100100 
    … …  
    109109     }
    110110 
    111 @@ -6947,11 +6986,148 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
     111@@ -7475,11 +7514,148 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
    112112 }
    113113 
    … …  
    259259   g_return_val_if_fail (qtdemux != NULL, FALSE);
    260260   g_return_val_if_fail (stream != NULL, FALSE);
    261 @@ -6966,17 +7142,38 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
     261@@ -7494,17 +7670,38 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
    262262         "cenc protection system information has been found");
    263263     return FALSE;
    … …  
    304304     gst_structure_set (s,
    305305diff --git a/gst/isomp4/qtdemux.h b/gst/isomp4/qtdemux.h
    306 index 53bd071..55c4f63 100644
     306index 771ddcc5b..2c37c2c3e 100644
    307307--- a/gst/isomp4/qtdemux.h
    308308+++ b/gst/isomp4/qtdemux.h
    309 @@ -153,7 +153,7 @@ struct _GstQTDemux {
    310    guint64 cenc_aux_info_offset;
     309@@ -155,6 +155,8 @@ struct _GstQTDemux {
    311310   guint8 *cenc_aux_info_sizes;
    312311   guint32 cenc_aux_sample_count;
    313 -
     312 
    314313+  gchar *preferred_protection_system_id;
    315  };
    316  
    317  struct _GstQTDemuxClass {
     314+
     315 
     316   /*
     317    * ALL VARIABLES BELOW ARE ONLY USED IN PUSH-BASED MODE
    318318--
    3193192.11.0
Note: See TracChangeset for help on using the changeset viewer.