From: <rb...@fr...> - 2005-08-10 10:48:36
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: rbultje Date: Wed Aug 10 2005 03:48:31 PDT Branch: BRANCH-GSTREAMER-0_8 Log message: * ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_get): Fix premature EOS. This causes issues when reading ID3v1 tags using gnomevfssrc instead of filesrc; after ID3v1 tag typefinding, the typefind element will EOS rather than send a discont, which makes actual tag-reading in id3demux fail; the result is that the ID3v1 tags are not stripped off the file, which causes an infinite loop of id3demux plugging to the pipeline. Modified files: . : ChangeLog ext/gnomevfs : gstgnomevfssrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1641.2.334&r2=1.1641.2.335 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/gnomevfs/gstgnomevfssrc.c.diff?r1=1.63.4.7&r2=1.63.4.8 ====Begin Diffs==== Index: gstgnomevfssrc.c =================================================================== RCS file: /cvs/gstreamer/gst-plugins/ext/gnomevfs/Attic/gstgnomevfssrc.c,v retrieving revision 1.63.4.7 retrieving revision 1.63.4.8 diff -u -d -r1.63.4.7 -r1.63.4.8 --- gstgnomevfssrc.c 7 Aug 2005 15:14:40 -0000 1.63.4.7 +++ gstgnomevfssrc.c 10 Aug 2005 10:48:18 -0000 1.63.4.8 @@ -1120,7 +1120,7 @@ g_return_val_if_fail (GST_FLAG_IS_SET (src, GST_GNOMEVFSSRC_OPEN), NULL); /* deal with EOF state */ - if ((src->curoffset >= src->size) && (src->size != 0)) { + if ((src->curoffset >= src->size) && (src->size != 0) && !src->new_seek) { gst_element_set_eos (GST_ELEMENT (src)); GST_DEBUG_OBJECT (src, "Returning EOS"); return GST_DATA (gst_event_new (GST_EVENT_EOS)); Index: ChangeLog RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1641.2.334 retrieving revision 1.1641.2.335 diff -u -d -r1.1641.2.334 -r1.1641.2.335 --- ChangeLog 10 Aug 2005 10:19:21 -0000 1.1641.2.334 +++ ChangeLog 10 Aug 2005 10:48:17 -0000 1.1641.2.335 @@ -1,3 +1,13 @@ +2005-08-10 Ronald S. Bultje <rb...@ro...> + + * ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_get): + Fix premature EOS. This causes issues when reading ID3v1 tags using + gnomevfssrc instead of filesrc; after ID3v1 tag typefinding, the + typefind element will EOS rather than send a discont, which makes + actual tag-reading in id3demux fail; the result is that the ID3v1 + tags are not stripped off the file, which causes an infinite loop + of id3demux plugging to the pipeline. 2005-08-10 Thomas Vander Stichele <thomas at apestaart dot org> * gst/level/filter.func: |