mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Fix text and closed-caption handling.

Browse source 
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1182
broke text and and closed caption extraction when introducing WebVTT
support, by making the output buffers not have timestamps any more.

Fix that by making the process functions copy buffer metadata
when generating new output buffers.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1262>
This commit is contained in:
Jan Schmidt 2021-10-28 21:37:47 +11:00
parent 5b1662d37e
commit f6ed40c93a
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
View file

@ -5677,6 +5677,7 @@ static GstBuffer *
gst_qtdemux_process_buffer_clcp (GstQTDemux * qtdemux, QtDemuxStream * stream, gst_qtdemux_process_buffer_clcp (GstQTDemux * qtdemux, QtDemuxStream * stream,
GstBuffer * buf) GstBuffer * buf)
{ {
GstBuffer *outbuf = NULL;
GstMapInfo map; GstMapInfo map;
guint8 *cc; guint8 *cc;
gsize cclen = 0; gsize cclen = 0;
@ -5694,14 +5695,15 @@ gst_qtdemux_process_buffer_clcp (GstQTDemux * qtdemux, QtDemuxStream * stream,
* [cdat],[cdt2] or [ccdp] atom */ * [cdat],[cdt2] or [ccdp] atom */
cc = extract_cc_from_data (stream, map.data, map.size, &cclen); cc = extract_cc_from_data (stream, map.data, map.size, &cclen);
gst_buffer_unmap (buf, &map); gst_buffer_unmap (buf, &map);
gst_buffer_unref (buf);
if (cc) { if (cc) {
buf = _gst_buffer_new_wrapped (cc, cclen, g_free); outbuf = _gst_buffer_new_wrapped (cc, cclen, g_free);
gst_buffer_copy_into (outbuf, buf, GST_BUFFER_COPY_METADATA, 0, -1);
} else { } else {
/* Conversion failed or there's nothing */ /* Conversion failed or there's nothing */
buf = NULL;
} }
return buf; gst_buffer_unref (buf);
return outbuf;
} }
/* DVD subpicture specific sample handling. /* DVD subpicture specific sample handling.
@ -5733,6 +5735,7 @@ static GstBuffer *
gst_qtdemux_process_buffer_text (GstQTDemux * qtdemux, QtDemuxStream * stream, gst_qtdemux_process_buffer_text (GstQTDemux * qtdemux, QtDemuxStream * stream,
GstBuffer * buf) GstBuffer * buf)
{ {
GstBuffer *outbuf = NULL;
GstMapInfo map; GstMapInfo map;
guint nsize = 0; guint nsize = 0;
gchar *str; gchar *str;
@ -5762,18 +5765,18 @@ gst_qtdemux_process_buffer_text (GstQTDemux * qtdemux, QtDemuxStream * stream,
* no other encoding expected */ * no other encoding expected */
str = gst_tag_freeform_string_to_utf8 ((gchar *) map.data + 2, nsize, NULL); str = gst_tag_freeform_string_to_utf8 ((gchar *) map.data + 2, nsize, NULL);
gst_buffer_unmap (buf, &map); gst_buffer_unmap (buf, &map);
if (str) { if (str) {
gst_buffer_unref (buf); outbuf = _gst_buffer_new_wrapped (str, strlen (str), g_free);
buf = _gst_buffer_new_wrapped (str, strlen (str), g_free); gst_buffer_copy_into (outbuf, buf, GST_BUFFER_COPY_METADATA, 0, -1);
} else { } else {
/* this should not really happen unless the subtitle is corrupted */ /* this should not really happen unless the subtitle is corrupted */
gst_buffer_unref (buf);
buf = NULL;
} }
gst_buffer_unref (buf);
/* FIXME ? convert optional subsequent style info to markup */ /* FIXME ? convert optional subsequent style info to markup */
return buf; return outbuf;
} }
/* WebVTT sample handling according to 14496-30 */ /* WebVTT sample handling according to 14496-30 */