mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: ignore empty subtitle buffers

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=696244
This commit is contained in:
Matej Knopp 2013-03-21 02:53:24 +01:00 committed by Tim-Philipp Müller
parent f494635126
commit 516a0b8acb
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/isomp4/qtdemux.c
View file

@ -3597,6 +3597,13 @@ gst_qtdemux_process_buffer (GstQTDemux * qtdemux, QtDemuxStream * stream,
gst_buffer_map (buf, &map, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
/* empty buffer can be send to terminate previous entry */
if (map.size == 2 && map.data[0] == 0 && map.data[1] == 0) {
gst_buffer_unmap (buf, &map);
gst_buffer_unref (buf);
return NULL;
}
if (G_LIKELY (map.size >= 2)) { if (G_LIKELY (map.size >= 2)) {
nsize = GST_READ_UINT16_BE (map.data); nsize = GST_READ_UINT16_BE (map.data);
nsize = MIN (nsize, map.size - 2); nsize = MIN (nsize, map.size - 2);
@ -3626,7 +3633,7 @@ gst_qtdemux_process_buffer (GstQTDemux * qtdemux, QtDemuxStream * stream,
* Also checks for additional actions and custom processing that may * Also checks for additional actions and custom processing that may
* need to be done first. * need to be done first.
*/ */
static gboolean static GstFlowReturn
gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux, gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
QtDemuxStream * stream, GstBuffer * buf, QtDemuxStream * stream, GstBuffer * buf,
guint64 dts, guint64 pts, guint64 duration, gboolean keyframe, guint64 dts, guint64 pts, guint64 duration, gboolean keyframe,
@ -3688,6 +3695,10 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
if (G_UNLIKELY (stream->need_process)) if (G_UNLIKELY (stream->need_process))
buf = gst_qtdemux_process_buffer (qtdemux, stream, buf); buf = gst_qtdemux_process_buffer (qtdemux, stream, buf);
if (!buf) {
goto exit;
}
GST_BUFFER_DTS (buf) = dts; GST_BUFFER_DTS (buf) = dts;
GST_BUFFER_PTS (buf) = pts; GST_BUFFER_PTS (buf) = pts;
GST_BUFFER_DURATION (buf) = duration; GST_BUFFER_DURATION (buf) = duration;