mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/matroska/matroska-demux.c: Update FIXME/TODOs and only ignore EOS at the central, important place instead of seve...

Browse source 
Original commit message from CVS:
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_contents_seekentry):
Update FIXME/TODOs and only ignore EOS at the central, important place
instead of several places.
This commit is contained in:
Sebastian Dröge 2008-06-18 20:09:28 +00:00
parent 54f515d2c8
commit 0865a6019e
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-06-18 Sebastian Dröge <slomo@circular-chaos.org>
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_contents_seekentry):
Update FIXME/TODOs and only ignore EOS at the central, important place
instead of several places.
2008-06-18 Wim Taymans <wim.taymans@collabora.co.uk> 2008-06-18 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/rtp/gstrtpg726pay.c: * gst/rtp/gstrtpg726pay.c:

21
gst/matroska/matroska-demux.c
View file

@ -21,12 +21,8 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/* TODO: "Unkown track header" & "Unknown entry": implement if useful /* TODO: dynamic number of tracks without upper bound
* TODO: dynamic number of tracks without upper bound
* FIXME: uint64 -> int64 overflows!
* TODO: check CRC32 if present * TODO: check CRC32 if present
* FIXME: go out of loops, don't add Track or whatever if something goes wrong
* or required elements are not there
* TODO: there can be a segment after the first segment. Handle like * TODO: there can be a segment after the first segment. Handle like
* chained oggs. Fixes #334082 * chained oggs. Fixes #334082
* TODO: handle gaps better, especially gaps at the start of a track. * TODO: handle gaps better, especially gaps at the start of a track.
@ -955,8 +951,8 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
else else
context->flags &= ~GST_MATROSKA_VIDEOTRACK_INTERLACED; context->flags &= ~GST_MATROSKA_VIDEOTRACK_INTERLACED;
GST_DEBUG_OBJECT (demux, "TrackVideoInterlaced: %d", GST_DEBUG_OBJECT (demux, "TrackVideoInterlaced: %d",
(context-> (context->flags & GST_MATROSKA_VIDEOTRACK_INTERLACED) ? 1 :
flags & GST_MATROSKA_VIDEOTRACK_INTERLACED) ? 1 : 0); 0);
break; break;
} }
@ -4104,12 +4100,8 @@ gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux)
GList *l; GList *l;
DEBUG_ELEMENT_START (demux, ebml, "SeekHead"); DEBUG_ELEMENT_START (demux, ebml, "SeekHead");
ret = gst_ebml_read_master (ebml, &id); if ((ret = gst_ebml_read_master (ebml, &id)) != GST_FLOW_OK)
if (ret == GST_FLOW_UNEXPECTED) goto finish;
ret = GST_FLOW_OK;
if (ret != GST_FLOW_OK)
break;
/* Prevent infinite recursion if there's a cycle from /* Prevent infinite recursion if there's a cycle from
* one seekhead to the same again. Simply break if * one seekhead to the same again. Simply break if
@ -4123,9 +4115,6 @@ gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux)
} }
ret = gst_matroska_demux_parse_contents (demux); ret = gst_matroska_demux_parse_contents (demux);
if (ret == GST_FLOW_UNEXPECTED)
ret = GST_FLOW_OK;
break; break;
} }
case GST_MATROSKA_ID_ATTACHMENTS: case GST_MATROSKA_ID_ATTACHMENTS: