Changeset 1570

Timestamp:

2005-10-07 02:02:14 (3 years ago)

Author:

conrad

Message:

use the correct granulepos on cmml eos packet. This was not being calculated
to include the CMML granuleshift, hence the granulepos was invalid (lower than
previous granulepos in the same track) and the cmml eos packet was not being
written into the stream. (closes ticket:163)

Files:

• libannodex/trunk/src/libannodex/anx_write.c (modified) (3 diffs)

libannodex/trunk/src/libannodex/anx_write.c

@@ -775 +775 @@
-
-static anx_int64_t
+anx_writer_cmml_granulepos_calc (ANNODEX * annodex, double timestamp)
+{
+  AnxWriter * writer = &annodex->x.writer;
+  AnxTrack * track = &writer->cmml_track;
+  anx_int64_t granule, granulepos;
+
+  granule = (anx_int64_t)(timestamp * track->granule_rate_n /
+                          track->granule_rate_d);
+
+  granulepos =
+    (writer->cmml_prev_granule << CMML_GRANULESHIFT) |
+    (granule - writer->cmml_prev_granule);
+
+#ifdef DEBUG
+  printf ("anx_writer_cmml_granulepos_calc: prev_granule %llx, granule %llx, granulepos %llx\n",
+          writer->cmml_prev_granule, granule, granulepos);
+#endif
+
+  writer->cmml_prev_granule = granule;
+
+  return granulepos;
+}
+
+static anx_int64_t
-anx_writer_cmml_granulepos (ANNODEX * annodex)
-{
-  AnxWriter * writer = &annodex->x.writer;
-  AnxTrack * track = &writer->cmml_track;
-  AnxCommand command;
-  AnxCommandData data;
-  double command_time;
-  anx_int64_t granule, granulepos;
-
-  command = annodex->pending_command;
@@ -789 +810 @@
-  data = anx_command_get_data (annodex, command);
-  command_time = anx_command_get_time_offset (annodex, command);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -1040 +1048 @@
-anx_init_clip_eos_packet (ANNODEX * annodex)
-{
-  AnxWriter * writer = &annodex->x.writer;
-  AnxTrack * track = &writer->cmml_track;
-  anx_int64_t granulepos;
-
-
-
-
+
+
-
-  return anx_init_eos_packet (annodex, annodex->cmml_serialno, granulepos);