Changeset 872

Timestamp:

2005-02-10 08:49:08 (4 years ago)

Author:

conrad

Message:

code cleanup -- make theora use the internal granuleshift metric rather
than its own custom one

Files:

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

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -109 +109 @@
-}
-
-typedef struct {
-  ogg_int32_t fps_numerator;
-  ogg_int32_t fps_denominator;
-  int keyframe_shift;
-} oggz_theora_metric_t;
-
-#if USE_THEORA_PRE_ALPHA_3_FORMAT
-static int intlog(int num) {
@@ -126 +120 @@
-#endif
-
-static ogg_int64_t
-auto_theora_metric (OGGZ * oggz, long serialno, ogg_int64_t granulepos,
-                    void * user_data)
-{
-  oggz_theora_metric_t * tdata = (oggz_theora_metric_t *)user_data;
-  ogg_int64_t iframe, pframe;
-  ogg_int64_t units;
-
-  iframe = granulepos >> tdata->keyframe_shift;
-  pframe = granulepos - (iframe << tdata->keyframe_shift);
-  granulepos = (iframe + pframe);
-
-  units = OGGZ_AUTO_MULT * granulepos * tdata->fps_denominator /
-    tdata->fps_numerator;
-
-#ifdef DEBUG
-  printf ("oggz_auto: serialno %010ld Got theora frame %lld (%lld + %lld): %lld units\n",
-          serialno, granulepos, iframe, pframe, units);
-#endif
-
-  return units;
-}
-
-static int
-auto_theora (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
-{
-  unsigned char * header = op->packet;
+  ogg_int32_t fps_numerator, fps_denominator;
-  char keyframe_granule_shift = 0;
-oggz_theora_metric_t * tdata
+int keyframe_shift
-
-  if (op->bytes < 41) return 0;
@@ -162 +134 @@
-  if (!op->b_o_s) return 0;
-
-
-
-
-
-
+
+
-
-  /* Very old theora versions used a value of 0 to mean 1.
@@ -172 +141 @@
-   * hence we hardcode this workaround for old or broken streams.
-   */
-tdata->fps_numerator == 0) tdata->
+fps_numerator == 0) 
-
-#if USE_THEORA_PRE_ALPHA_3_FORMAT
-  /* old header format, used by Theora alpha2 and earlier */
-  keyframe_granule_shift = (header[36] & 0xf8) >> 3;
-tdata->
+
-#else
-  keyframe_granule_shift = (char) ((header[40] & 0x03) << 3);
-  keyframe_granule_shift |= (header[41] & 0xe0) >> 5;
-tdata->
+
-#endif
-
-#ifdef DEBUG
-  printf ("Got theora fps %d/%d, keyframe_shift %d\n",
-tdata->fps_numerator, tdata->fps_denominator,
-
-
-
-  oggz_set_metric_internal (oggz, serialno, auto_theora_metric, tdata, 1
-/*oggz_set_metric (oggz, serialno, auto_theora_metric, tdata);*/
+fps_numerator, fps_denominator, keyframe_shift);
+
+
+
+                       OGGZ_AUTO_MULT * (ogg_int64_t)fps_denominator
+oggz_set_granuleshift (oggz, serialno, keyframe_shift);
-
-  return 1;