[cvs-annodex] commit (/annodex): libannodex/trunk/src/importers/anx_import_ogg.c

Sat Apr 2 13:06:21 EST 2005

Update of /annodex (new revision 1203)

Modified files:
   libannodex/trunk/src/importers/anx_import_ogg.c

Log Message:
when importing anx files that don't use cmml granuleshift, only drop <clip>
tags that occur before the start time (not <head> or preamble).
Fixes "corrupted <head>" bug in ticket:100


Modified: libannodex/trunk/src/importers/anx_import_ogg.c
===================================================================

--- libannodex/trunk/src/importers/anx_import_ogg.c	2005-04-02 02:50:06 UTC (rev 1202)
+++ libannodex/trunk/src/importers/anx_import_ogg.c	2005-04-02 03:06:20 UTC (rev 1203)
@@ -615,8 +615,13 @@
 
       /* If this content doesn't use cmml_granuleshift, and this clip is
        * before the start_time, drop it */
-      if (aod->cmml_granuleshift == 0 &&
+      if (aod->cmml_granuleshift == 0 && op->bytes > 6 &&
+	  !strncmp ((char *)op->packet, "<clip", 5) &&
 	  at_time < aod->anx_source->start_time-TOLERANCE) {
+#ifdef DEBUG
+	fprintf (aod->df,
+		 "anxogg::read_packet_data: CMML clip too early, dropping\n");
+#endif
 	return OGGZ_STOP_OK;
       }
 


-- 
conrad

