From fc559fff48fc72e04aca551519d5bf8dfef8d877 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Mon, 4 Sep 2006 09:34:25 +0000 Subject: [PATCH] ext/annodex/gstcmmldec.c: Seeking back in a file containing a CMML stream errors out if the seek goes back up to the ... Original commit message from CVS: Patch by: Alessandro Decina * ext/annodex/gstcmmldec.c: (gst_cmml_dec_chain): Seeking back in a file containing a CMML stream errors out if the seek goes back up to the CMML headers. This is because after the seek the xml processing instruction is submitted to the xml parser again, which results in an error. The attached patch fixes the problem. Fixes #353908. * ext/annodex/gstcmmlenc.h: Fix authors name. --- ChangeLog | 15 +++++++++++++++ ext/annodex/gstcmmldec.c | 9 +++++++-- ext/annodex/gstcmmlenc.h | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ebd0f942d..debc6818b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2006-09-04 Wim Taymans + + Patch by: Alessandro Decina + + * ext/annodex/gstcmmldec.c: (gst_cmml_dec_chain): + Seeking back in a file containing a CMML stream errors out if the seek + goes back up to the CMML headers. This is because after the seek the xml + processing instruction is submitted to the xml parser again, + which results in an error. The attached patch fixes the problem. + Fixes #353908. + + * ext/annodex/gstcmmlenc.h: + Fix authors name. + + 2006-08-28 Andy Wingo * ext/raw1394/gstdv1394src.c (gst_dv1394src_from_raw1394handle): diff --git a/ext/annodex/gstcmmldec.c b/ext/annodex/gstcmmldec.c index b388488067..75038c61c7 100644 --- a/ext/annodex/gstcmmldec.c +++ b/ext/annodex/gstcmmldec.c @@ -391,10 +391,15 @@ gst_cmml_dec_chain (GstPad * pad, GstBuffer * buffer) /* handle the packet. the handler will set dec->flow_return */ switch (packet) { case GST_CMML_PACKET_IDENT_HEADER: - gst_cmml_dec_parse_ident_header (dec, buffer); + if (dec->sent_root == FALSE) + /* don't parse the ident again in case of seeking to the beginning */ + gst_cmml_dec_parse_ident_header (dec, buffer); break; case GST_CMML_PACKET_FIRST_HEADER: - gst_cmml_dec_parse_first_header (dec, buffer); + if (dec->sent_root == FALSE) + /* don't parse the xml preamble if it has already been parsed because it + * would error out, so seeking to the beginning would fail */ + gst_cmml_dec_parse_first_header (dec, buffer); break; case GST_CMML_PACKET_SECOND_HEADER: case GST_CMML_PACKET_CLIP: diff --git a/ext/annodex/gstcmmlenc.h b/ext/annodex/gstcmmlenc.h index d8e07ed287..1c03742175 100644 --- a/ext/annodex/gstcmmlenc.h +++ b/ext/annodex/gstcmmlenc.h @@ -3,7 +3,7 @@ * Copyright (C) 2005 Alessandro Decina * * Authors: - * Alessandro Encina + * Alessandro Decina * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public