Changeset 570

Timestamp:

2004-09-13 00:46:49 (4 years ago)

Author:

conrad

Message:

fix theora keyframe shift in oggz_auto (was using old alpha3 method)

Files:

• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (2 diffs)

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -129 +129 @@
-    tdata->fps_numerator;
-
+#ifdef DEBUG
+  printf ("serialno %010ld: Got theora frame %lld (%lld + %lld)\n",
+          serialno, granulepos, iframe, pframe, tdata->keyframe_shift);
+#endif
+
-  return units;
-}
@@ -154 +159 @@
-  /* old header format, used by Theora alpha2 and earlier */
-  keyframe_granule_shift = (header[36] & 0xf8) >> 3;
+  tdata->keyframe_shift = intlog (keyframe_granule_shift - 1);
-#else
-  keyframe_granule_shift = (char) ((header[40] & 0x03) << 3);
-  keyframe_granule_shift |= (header[41] & 0xe0) >> 5;
-
-
-
-
-granule_
+
+
+
+
+
-          tdata->fps_numerator, tdata->fps_denominator,
-keyframe_granul
+tdata->keyfram
-#endif
-