<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211567] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211567">211567</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2017-02-02 09:46:20 -0800 (Thu, 02 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed. Fix jhbuild dependencies build.
* gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch:
Patch updated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkpatchesgstpluginsgood0004qtdemuxaddcontextforapreferredprotectionpatch">trunk/Tools/gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211566 => 211567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-02 17:39:57 UTC (rev 211566)
+++ trunk/Tools/ChangeLog 2017-02-02 17:46:20 UTC (rev 211567)
</span><span class="lines">@@ -1,5 +1,12 @@
</span><span class="cx"> 2017-02-02 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><ins>+ Unreviewed. Fix jhbuild dependencies build.
+
+ * gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch:
+ Patch updated.
+
+2017-02-02 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
</ins><span class="cx"> [EME][GStreamer] Fixed decryptor selection
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167588
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkpatchesgstpluginsgood0004qtdemuxaddcontextforapreferredprotectionpatch"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch (211566 => 211567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch 2017-02-02 17:39:57 UTC (rev 211566)
+++ trunk/Tools/gtk/patches/gst-plugins-good-0004-qtdemux-add-context-for-a-preferred-protection.patch 2017-02-02 17:46:20 UTC (rev 211567)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 5562a03c58a06339df2bf0a55cb39be7321094dd Mon Sep 17 00:00:00 2001
</del><ins>+From ae4f7d4f09a051c2fbbd05e4df9f79fa6522104f Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx"> Date: Fri, 16 Sep 2016 16:08:18 +0200
</span><span class="cx"> Subject: [PATCH] qtdemux: add context for a preferred protection
</span><span class="lines">@@ -13,14 +13,14 @@
</span><span class="cx"> accessible.
</span><span class="cx"> ---
</span><span class="cx"> gst/isomp4/qtdemux.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++++--
</span><del>- gst/isomp4/qtdemux.h | 1 +
- 2 files changed, 204 insertions(+), 6 deletions(-)
</del><ins>+ gst/isomp4/qtdemux.h | 2 +-
+ 2 files changed, 204 insertions(+), 7 deletions(-)
</ins><span class="cx">
</span><span class="cx"> diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
</span><del>-index 782ad2f..f56872a 100644
</del><ins>+index 0425e66..e05e75e 100644
</ins><span class="cx"> --- a/gst/isomp4/qtdemux.c
</span><span class="cx"> +++ b/gst/isomp4/qtdemux.c
</span><del>-@@ -477,6 +477,8 @@ static GstIndex *gst_qtdemux_get_index (GstElement * element);
</del><ins>+@@ -480,6 +480,8 @@ static GstIndex *gst_qtdemux_get_index (GstElement * element);
</ins><span class="cx"> #endif
</span><span class="cx"> static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element,
</span><span class="cx"> GstStateChange transition);
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> static gboolean qtdemux_sink_activate (GstPad * sinkpad, GstObject * parent);
</span><span class="cx"> static gboolean qtdemux_sink_activate_mode (GstPad * sinkpad,
</span><span class="cx"> GstObject * parent, GstPadMode mode, gboolean active);
</span><del>-@@ -569,6 +571,7 @@ gst_qtdemux_class_init (GstQTDemuxClass * klass)
</del><ins>+@@ -554,6 +556,7 @@ gst_qtdemux_class_init (GstQTDemuxClass * klass)
</ins><span class="cx"> gstelement_class->set_index = GST_DEBUG_FUNCPTR (gst_qtdemux_set_index);
</span><span class="cx"> gstelement_class->get_index = GST_DEBUG_FUNCPTR (gst_qtdemux_get_index);
</span><span class="cx"> #endif
</span><span class="lines">@@ -37,15 +37,15 @@
</span><span class="cx">
</span><span class="cx"> gst_tag_register_musicbrainz_tags ();
</span><span class="cx">
</span><del>-@@ -628,6 +631,7 @@ gst_qtdemux_init (GstQTDemux * qtdemux)
</del><ins>+@@ -612,6 +615,7 @@ gst_qtdemux_init (GstQTDemux * qtdemux)
+ qtdemux->cenc_aux_info_sizes = NULL;
</ins><span class="cx"> qtdemux->cenc_aux_sample_count = 0;
</span><span class="cx"> qtdemux->protection_system_ids = NULL;
</span><del>- qtdemux->always_honor_tfdt = FALSE;
</del><span class="cx"> + qtdemux->preferred_protection_system_id = NULL;
</span><span class="cx"> g_queue_init (&qtdemux->protection_event_queue);
</span><span class="cx"> gst_segment_init (&qtdemux->segment, GST_FORMAT_TIME);
</span><span class="cx"> qtdemux->flowcombiner = gst_flow_combiner_new ();
</span><del>-@@ -2023,6 +2027,10 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
</del><ins>+@@ -1972,6 +1976,10 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
</ins><span class="cx"> g_queue_foreach (&qtdemux->protection_event_queue, (GFunc) gst_event_unref,
</span><span class="cx"> NULL);
</span><span class="cx"> g_queue_clear (&qtdemux->protection_event_queue);
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> }
</span><span class="cx"> qtdemux->offset = 0;
</span><span class="cx"> gst_adapter_clear (qtdemux->adapter);
</span><del>-@@ -2454,6 +2462,29 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
</del><ins>+@@ -2404,6 +2412,29 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> qtdemux_parse_ftyp (GstQTDemux * qtdemux, const guint8 * buffer, gint length)
</span><span class="cx"> {
</span><span class="cx"> /* counts as header data */
</span><del>-@@ -3433,6 +3464,8 @@ qtdemux_parse_pssh (GstQTDemux * qtdemux, GNode * node)
</del><ins>+@@ -3392,6 +3423,8 @@ qtdemux_parse_pssh (GstQTDemux * qtdemux, GNode * node)
</ins><span class="cx"> event = gst_event_new_protection (sysid_string, pssh,
</span><span class="cx"> (parent_box_type == FOURCC_moov) ? "isobmff/moov" : "isobmff/moof");
</span><span class="cx"> for (i = 0; i < qtdemux->n_streams; ++i) {
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> g_queue_push_tail (&qtdemux->streams[i]->protection_scheme_event_queue,
</span><span class="cx"> gst_event_ref (event));
</span><span class="cx"> }
</span><del>-@@ -5033,6 +5066,12 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
</del><ins>+@@ -4993,6 +5026,12 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
</ins><span class="cx"> GstEvent *event;
</span><span class="cx">
</span><span class="cx"> while ((event = g_queue_pop_head (&stream->protection_scheme_event_queue))) {
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> gst_pad_push_event (stream->pad, event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@@ -6987,11 +7026,148 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
</del><ins>+@@ -6947,11 +6986,148 @@ qtdemux_do_allocation (GstQTDemux * qtdemux, QtDemuxStream * stream)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gboolean
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">
</span><span class="cx"> g_return_val_if_fail (qtdemux != NULL, FALSE);
</span><span class="cx"> g_return_val_if_fail (stream != NULL, FALSE);
</span><del>-@@ -7006,17 +7182,38 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
</del><ins>+@@ -6966,17 +7142,38 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
</ins><span class="cx"> "cenc protection system information has been found");
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -303,17 +303,18 @@
</span><span class="cx"> if (!gst_structure_has_name (s, "application/x-cenc")) {
</span><span class="cx"> gst_structure_set (s,
</span><span class="cx"> diff --git a/gst/isomp4/qtdemux.h b/gst/isomp4/qtdemux.h
</span><del>-index ecf0c63..0c53437 100644
</del><ins>+index 53bd071..55c4f63 100644
</ins><span class="cx"> --- a/gst/isomp4/qtdemux.h
</span><span class="cx"> +++ b/gst/isomp4/qtdemux.h
</span><del>-@@ -153,6 +153,7 @@ struct _GstQTDemux {
</del><ins>+@@ -153,7 +153,7 @@ struct _GstQTDemux {
</ins><span class="cx"> guint64 cenc_aux_info_offset;
</span><span class="cx"> guint8 *cenc_aux_info_sizes;
</span><span class="cx"> guint32 cenc_aux_sample_count;
</span><ins>+-
</ins><span class="cx"> + gchar *preferred_protection_system_id;
</span><ins>+ };
</ins><span class="cx">
</span><del>- gboolean always_honor_tfdt;
- };
</del><ins>+ struct _GstQTDemuxClass {
</ins><span class="cx"> --
</span><span class="cx"> 2.11.0
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>