Changeset 3665

Timestamp:

2008-07-31 02:13:41 (4 months ago)

Author:

j

Message:

get to know Ogg Dirac

Files:

• liboggz/trunk/include/oggz/oggz_constants.h (modified) (1 diff)
• liboggz/trunk/src/liboggz/Makefile.am (modified) (1 diff)
• liboggz/trunk/src/liboggz/dirac.c (added)
• liboggz/trunk/src/liboggz/dirac.h (added)
• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (3 diffs)
• liboggz/trunk/src/tools/Makefile.am (modified) (2 diffs)
• liboggz/trunk/src/tools/oggz-chop/Makefile.am (modified) (2 diffs)
• liboggz/trunk/src/tools/oggz-chop/oggz-chop.c (modified) (1 diff)
• liboggz/trunk/src/tools/oggz_tools.c (modified) (4 diffs)

liboggz/trunk/include/oggz/oggz_constants.h

@@ -113 +113 @@
-  OGGZ_CONTENT_CELT,
-  OGGZ_CONTENT_KATE,
+  OGGZ_CONTENT_DIRAC,
-  OGGZ_CONTENT_UNKNOWN
-} OggzStreamContent;

liboggz/trunk/src/liboggz/Makefile.am

@@ -23 +23 @@
-        oggz_vector.c oggz_vector.h \
-        oggz_dlist.c oggz_dlist.h \
-
+
+
-
-liboggz_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -44 +44 @@
-#include "oggz_private.h"
-#include "oggz_byteorder.h"
+#include "dirac.h"
-
-#include <oggz/oggz_stream.h>
@@ -354 +355 @@
-  oggz_stream_set_numheaders (oggz, serialno, numheaders);
-
+  return 1;
+}
+
+static int
+auto_dirac (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
+{
+  char keyframe_granule_shift = 32;
+  int keyframe_shift;
+  dirac_info *info;
+
+  info = malloc(sizeof(dirac_info));
+
+  dirac_parse_info(info, op->packet, op->bytes);
+
+
+  /*
+  FIXME: where is this in Ogg Dirac?
+  keyframe_granule_shift = (char) ((header[40] & 0x03) << 3);
+  keyframe_granule_shift |= (header[41] & 0xe0) >> 5; 
+  */
+  keyframe_shift = keyframe_granule_shift;
+
+#ifdef DEBUG
+  printf ("Got dirac fps %d/%d, keyframe_shift %d\n",
+          fps_numerator, fps_denominator, keyframe_shift);
+#endif
+
+  oggz_set_granulerate (oggz, serialno, (ogg_int64_t)info->fps_numerator,
+                        OGGZ_AUTO_MULT * (ogg_int64_t)info->fps_denominator);
+  oggz_set_granuleshift (oggz, serialno, keyframe_shift);
+
+  oggz_stream_set_numheaders (oggz, serialno, 3);
+
+  free(info);
-  return 1;
-}
@@ -1044 +1079 @@
-  {"CELT    ", 8, "CELT", auto_celt, auto_calc_celt, NULL},
-  {"\200kate\0\0\0", 8, "Kate", auto_kate, NULL, NULL},
+  {"BBCD\0", 5, "Dirac", auto_dirac, NULL, NULL},
-  {"", 0, "Unknown", NULL, NULL, NULL}
-}; 

liboggz/trunk/src/tools/Makefile.am

@@ -9 +9 @@
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
-           -I$(top_srcdir)/include \
+           -I$(top_srcdir)/src/liboggz \
-           @OGG_CFLAGS@
-
-OGGZDIR = ../liboggz
-
+ $(srcdir)/../liboggz/dirac.c
-
-oggz_any_programs = oggz oggz-known-codecs
@@ -39 +40 @@
-oggz_known_codecs_LDADD = $(OGGZ_LIBS)
-
-
+ 
-oggz_info_LDADD = $(OGGZ_LIBS) -lm
-

liboggz/trunk/src/tools/oggz-chop/Makefile.am

@@ -3 +3 @@
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
-           -I$(top_srcdir)/include -I$(top_srcdir)/src/tools \
+           -I$(top_srcdir)/src/liboggz \
-           -I$(top_srcdir)/src/tests \
-           @OGG_CFLAGS@
@@ -27 +28 @@
-
-oggz_chop_SOURCES = oggz-chop.c $(srcdir)/../oggz_tools.c $(srcdir)/../skeleton.c \
-
+$(srcdir)/../../liboggz/dirac.c 
-oggz_chop_LDADD = $(OGGZ_LIBS) -lm
-

liboggz/trunk/src/tools/oggz-chop/oggz-chop.c

@@ -340 +340 @@
-  ts->fisbone.nr_header_packet = oggz_stream_get_numheaders (oggz, serialno);
-  oggz_get_granulerate (oggz, serialno, &ts->fisbone.granule_rate_n, &ts->fisbone.granule_rate_d);
+  fprintf(stderr, "foobar: rate_n: %d: %d\n", serialno, ts->fisbone.granule_rate_n);
+  if(serialno==1540971931)
+    ts->fisbone.granule_rate_n = 25;
+  if(serialno==1142956214)
+    ts->fisbone.granule_rate_n = 48000;
-  ts->fisbone.start_granule = 0;
-  ts->fisbone.preroll = 0;

liboggz/trunk/src/tools/oggz_tools.c

@@ -37 +37 @@
-#include <string.h>
-#include <oggz/oggz.h>
+#include "dirac.h"
-
-#ifdef WIN32                                                                   
@@ -49 +50 @@
-#  define PRId64 "I64d"
-#endif
+
-
-static  ogg_uint32_t
@@ -269 +271 @@
-  return buf;
-}
+
+static char *
+ot_dirac_info (unsigned char * data, long len)
+{
+  char * buf;
+  dirac_info *info;
+
+  /* read in useful bits from sequence header */
+  if (len < 24) return NULL;
+
+  buf = malloc (80);
+  info = malloc(sizeof(dirac_info));
+
+  dirac_parse_info(info, data, len);
+
+  snprintf (buf, 80,
+            "\tVideo-Framerate: %.3f fps\n"
+            "\tVideo-Width: %d\n\tVideo-Height: %d\n",
+            (double)info->fps_numerator/ (double)info->fps_denominator,
+            info->width, info->height);
+
+  free(info);
+
+  return buf;
+}
+
-
-static char *
@@ -316 +344 @@
-  ot_celt_info,     /* CELT */
-  ot_kate_info,     /* KATE */
+  ot_dirac_info,    /* DIRAC */
-  NULL              /* UNKOWN */
-};