Changeset 3207

Timestamp:

2007-08-28 20:00:50 (1 year ago)

Author:

shans

Message:

modified packet check to not select theora headers as keyframes
cleaned up debug message a bit, added some

Files:

• libannodex/trunk/src/importers/anx_import_ogg.c (modified) (10 diffs)

libannodex/trunk/src/importers/anx_import_ogg.c

@@ -257 +257 @@
-  if (aod->use_granule_seek) {
-    seek_offset = aod->min_granule_seek;
+#ifdef DEBUG
+    fprintf(aod->df, "anxogg_seek_update: using min_granule_seek %f\n", 
+                seek_offset);
+#endif
-  } else {
-    seek_offset = source->start_time;
+#ifdef DEBUG
+    fprintf(aod->df, "anxogg_seek_update: using start time %f\n", 
+                seek_offset);
+#endif
-  }
-  seek_offset -= 1.0;
@@ -325 +333 @@
-
-#ifdef DEBUG
-
-
+
+
+
-#endif
-      if (aod->cmml_granuleshift == 0)
@@ -422 +431 @@
-           aod->cmml_granuleshift = 0;
-#ifdef DEBUG
-
+
+
-#endif
-                 aod->cmml_need_keygranule = 0;
@@ -574 +584 @@
-  /* XXX: TRUE if a theora from a keyframe, even if no granulepos */
-  if (!strcmp (track->content_type, THEORA_CONTENT_TYPE) &&
-4
+C
-#ifdef DEBUG
-    fprintf (aod->df,
@@ -854 +864 @@
-    iframe = granulepos >> aod->cmml_granuleshift;
-    cmml_keygranule = iframe << aod->cmml_granuleshift;
+#ifdef DEBUG
+    fprintf(aod->df, "cmml_keygranule is %llx\n", cmml_keygranule);
+#endif
-
-    offset = gp_to_time (aod->oggz, serialno, cmml_keygranule);
@@ -863 +876 @@
-    if (aot == NULL) {
-      /* If this track is not in the table, ignore it. */
-      printf("NULL aot\n");
-      return OGGZ_STOP_OK;
-    }
@@ -879 +891 @@
-      offset = gp_to_time (aod->oggz, serialno, granulepos);
-#ifdef DEBUG
-printf("offset %f start_time %f TOLERANCE %f\n", offset, start_time,
-
+fprintf(aod->df, "offset %f start_time %f TOLERANCE %f\n", offset, 
+start_time, 
-#endif
-      if (offset-TOLERANCE <= start_time) {
@@ -895 +907 @@
-      offset = gp_to_time (aod->oggz, serialno, aot->keygranule);
-      aot->keygranule_time = offset;
-
+ {
-        aod->min_granule_seek = offset;
-
+
+
+
+
+
-#ifdef DEBUG
-      fprintf (aod->df,
@@ -943 +959 @@
-  if (end_time == -1.0) {
-#ifdef DEBUG
-printf(
+fprintf(aod->df, 
-#endif
-    end_offset = oggz_seek (aod->oggz, 0, SEEK_END);
@@ -975 +991 @@
-  units = (ogg_int64_t)(SUBSECONDS * start_time);
-  units_at = oggz_seek_units (aod->oggz, units, SEEK_SET);
+#ifdef DEBUG
+  fprintf(aod->df, "oggz_seek_units on %lld returned %lld\n", units, units_at);
+#endif
-  if (units_at == -1) {
-#ifdef DEBUG