dvdread added more fixes for libs stuff

Original commit message from CVS:
dvdread added
more fixes for libs stuff

configure.ac

@@ -436,9 +436,10 @@ dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_in
 dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
 
 dnl *** dvdread ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDVDREAD, true)
-GST_CHECK_FEATURE(LIBDVDREAD, [dvdread library], libdvdread, [
-  GST_CHECK_LIBHEADER(LIBDVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, LIBDVDREAD_LIBS="-ldvdread")
+translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true)
+GST_CHECK_FEATURE(DVDREAD, [dvdread library], libdvdread, [
+  GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread")
+  AC_SUBST(DVDREAD_LIBS)
 ])
 
 dnl **** ESound ****
@@ -860,10 +861,6 @@ if test "x$HAVE_LIBHERMES" = "xyes"; then
   AC_DEFINE(HAVE_LIBHERMES)
 fi
 
-if test "x$HAVE_LIBDVDREAD" = xyes; then
-  AC_DEFINE(HAVE_LIBDVDREAD)
-fi
-
 if test "x$HAVE_A52DEC" = xyes; then
   AC_DEFINE(HAVE_A52DEC)
 fi
@@ -895,7 +892,6 @@ AM_CONDITIONAL(EXPERIMENTAL,        test "$EXPERIMENTAL" = "$xyes")
 AM_CONDITIONAL(BROKEN,              test "$BROKEN" = "$xyes")
 
 AM_CONDITIONAL(HAVE_LIBMIKMOD,      test "x$HAVE_LIBMIKMOD" = "xyes")
-AM_CONDITIONAL(HAVE_LIBDVDREAD,     test "x$HAVE_LIBDVDREAD" = "xyes")
 AM_CONDITIONAL(HAVE_LIBJPEG,        test "x$HAVE_LIBJPEG" = "xyes")
 AM_CONDITIONAL(HAVE_LIBSDL,         test "x$HAVE_LIBSDL" = "xyes")
 AM_CONDITIONAL(HAVE_LIBHERMES,      test "x$HAVE_LIBHERMES" = "xyes")

ext/Makefile.am

@@ -22,6 +22,12 @@ else
 AUDIOFILE_DIR=
 endif
 
+if USE_DVDREAD
+DVDREAD_DIR=dvdread
+else
+DVDREAD_DIR=
+endif
+
 if USE_ESD
 ESD_DIR=esd
 else

ext/dvdread/Makefile.am

@@ -0,0 +1,14 @@
+plugindir = $(libdir)/gst
+
+plugin_LTLIBRARIES = libdvdsrc.la
+
+## FIXME: the extra option, what do we do with it ?
+## AM_CFLAGS = -D_LARGEFILE64_SOURCE $(LIBDVDREADCFLAGS)
+
+libdvdsrc_la_SOURCES = dvdsrc.c
+libdvdsrc_la_LDFLAGS = $(DVDREAD_LIBS)
+libdvdsrc_la_CFLAGS = $(GST_CFLAGS)
+
+noinst_HEADERS = dvdsrc.h
+
+EXTRA_DIST = README

ext/dvdread/README

@@ -0,0 +1,5 @@
+Various Info
+============
+
+http://members.aol.com/mpucoder/DVD/index.html
+http://dvd.sourceforge.net/

ext/dvdread/dvdsrc.c

@@ -0,0 +1,798 @@
+/* Gnome-Streamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * Copyright (C) 2001 Billy Biggs <vektor@dumbterm.net>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <errno.h>
+#include <linux/cdrom.h>
+#include <assert.h>
+
+#include <dvdsrc.h>
+
+#include "config.h"
+
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/nav_print.h>
+
+struct _DVDSrcPrivate {
+  GstElement element;
+  /* pads */
+  GstPad *srcpad;
+
+  /* location */
+  gchar *location;
+
+  gboolean new_seek;
+
+  int title, chapter, angle;
+  int pgc_id, start_cell, cur_cell, cur_pack;
+  int ttn, pgn, next_cell;
+  dvd_reader_t *dvd;
+  dvd_file_t *dvd_title;
+  ifo_handle_t *vmg_file;
+  tt_srpt_t *tt_srpt;
+  ifo_handle_t *vts_file;
+  vts_ptt_srpt_t *vts_ptt_srpt;
+  pgc_t *cur_pgc;
+};
+
+
+GstElementDetails dvdsrc_details = {
+  "DVD Source",
+  "Source/File/DVD",
+  "Asynchronous read from encrypted DVD disk",
+  VERSION,
+  "Erik Walthinsen <omega@cse.ogi.edu>",
+  "(C) 2001",
+};
+
+
+/* DVDSrc signals and args */
+enum {
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+enum {
+  ARG_0,
+  ARG_LOCATION,
+  ARG_TITLE,
+  ARG_CHAPTER,
+  ARG_ANGLE
+};
+
+
+static void 		dvdsrc_class_init	(DVDSrcClass *klass);
+static void 		dvdsrc_init		(DVDSrc *dvdsrc);
+
+static void 		dvdsrc_set_property		(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static void 		dvdsrc_get_property		(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+
+//static GstBuffer *	dvdsrc_get		(GstPad *pad);
+static void     	dvdsrc_loop		(GstElement *element);
+//static GstBuffer *	dvdsrc_get_region	(GstPad *pad,gulong offset,gulong size);
+
+static GstElementStateReturn 	dvdsrc_change_state 	(GstElement *element);
+
+
+static GstElementClass *parent_class = NULL;
+//static guint dvdsrc_signals[LAST_SIGNAL] = { 0 };
+
+GType
+dvdsrc_get_type (void) 
+{
+  static GType dvdsrc_type = 0;
+
+  if (!dvdsrc_type) {
+    static const GTypeInfo dvdsrc_info = {
+      sizeof(DVDSrcClass),      NULL,
+      NULL,
+      (GClassInitFunc)dvdsrc_class_init,
+      NULL,
+      NULL,
+      sizeof(DVDSrc),
+      0,
+      (GInstanceInitFunc)dvdsrc_init,
+    };
+    dvdsrc_type = g_type_register_static (GST_TYPE_ELEMENT, "DVDSrc", &dvdsrc_info, 0);
+  }
+  return dvdsrc_type;
+}
+
+static void
+dvdsrc_class_init (DVDSrcClass *klass) 
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass*)klass;
+  gstelement_class = (GstElementClass*)klass;
+
+  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+
+  g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_LOCATION,
+    g_param_spec_string("location","location","location",
+                        NULL, G_PARAM_READWRITE));
+  g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TITLE,
+    g_param_spec_int("title","title","title",
+                     0,G_MAXINT,0,G_PARAM_READWRITE));
+  g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CHAPTER,
+    g_param_spec_int("chapter","chapter","chapter",
+                     0,G_MAXINT,0,G_PARAM_READWRITE));
+  g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ANGLE,
+    g_param_spec_int("angle","angle","angle",
+                     0,G_MAXINT,0,G_PARAM_READWRITE));
+
+  gobject_class->set_property = GST_DEBUG_FUNCPTR(dvdsrc_set_property);
+  gobject_class->get_property = GST_DEBUG_FUNCPTR(dvdsrc_get_property);
+
+  gstelement_class->change_state = dvdsrc_change_state;
+}
+
+static void 
+dvdsrc_init (DVDSrc *dvdsrc) 
+{
+  dvdsrc->priv = g_new(DVDSrcPrivate, 1);
+  dvdsrc->priv->srcpad = gst_pad_new ("src", GST_PAD_SRC);
+  gst_element_add_pad (GST_ELEMENT (dvdsrc), dvdsrc->priv->srcpad);
+  gst_element_set_loop_function (GST_ELEMENT(dvdsrc), GST_DEBUG_FUNCPTR(dvdsrc_loop));
+
+  dvdsrc->priv->location = "/dev/dvd";
+  dvdsrc->priv->new_seek = FALSE;
+  dvdsrc->priv->title = 1;
+  dvdsrc->priv->chapter = 1;
+  dvdsrc->priv->angle = 1;
+}
+
+static void
+dvdsrc_destory (DVDSrc *dvdsrc)
+{
+  // FIXME
+  g_print("FIXME\n");
+  g_free(dvdsrc->priv);
+}
+
+static void 
+dvdsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) 
+{
+  DVDSrc *src;
+  DVDSrcPrivate *priv;
+
+  /* it's not null if we got it, but it might not be ours */
+  g_return_if_fail (GST_IS_DVDSRC (object));
+  
+  src = DVDSRC (object);
+  priv = src->priv;
+
+  switch (prop_id) {
+    case ARG_LOCATION:
+      /* the element must be stopped in order to do this */
+      //g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING));
+
+      if (priv->location)
+        g_free (priv->location);
+      /* clear the filename if we get a NULL (is that possible?) */
+      if (g_value_get_string (value) == NULL)
+        priv->location = "/dev/dvd";
+      /* otherwise set the new filename */
+      else
+        priv->location = g_strdup (g_value_get_string (value));  
+      break;
+    case ARG_TITLE:
+      priv->title = g_value_get_int (value) - 1;
+      priv->new_seek = TRUE;
+      break;
+    case ARG_CHAPTER:
+      priv->chapter = g_value_get_int (value) - 1;
+      priv->new_seek = TRUE;
+      break;
+    case ARG_ANGLE:
+      priv->angle = g_value_get_int (value) - 1;
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+}
+
+static void 
+dvdsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) 
+{
+  DVDSrc *src;
+  DVDSrcPrivate *priv;
+
+  /* it's not null if we got it, but it might not be ours */
+  g_return_if_fail (GST_IS_DVDSRC (object));
+  
+  src = DVDSRC (object);
+  priv = src->priv;
+
+  switch (prop_id) {
+    case ARG_LOCATION:
+      g_value_set_string (value, priv->location);
+      break;
+    case ARG_TITLE:
+      g_value_set_int (value, priv->title + 1);
+      break;
+    case ARG_CHAPTER:
+      g_value_set_int (value, priv->chapter + 1);
+      break;
+    case ARG_ANGLE:
+      g_value_set_int (value, priv->angle + 1);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+/**
+ * Returns true if the pack is a NAV pack.  This check is clearly insufficient,
+ * and sometimes we incorrectly think that valid other packs are NAV packs.  I
+ * need to make this stronger.
+ */
+static int
+is_nav_pack( unsigned char *buffer )
+{
+    return ( buffer[ 41 ] == 0xbf && buffer[ 1027 ] == 0xbf );
+}
+
+static int
+_open(DVDSrcPrivate *priv, const gchar *location)
+{
+  g_return_val_if_fail(priv != NULL, -1);
+  g_return_val_if_fail(location != NULL, -1);
+
+  /**
+   * Open the disc.
+   */
+  priv->dvd = DVDOpen( location );
+  if( !priv->dvd ) {
+    fprintf( stderr, "Couldn't open DVD: %s\n", location );
+    return -1;
+  }
+
+
+  /**
+   * Load the video manager to find out the information about the titles on
+   * this disc.
+   */
+  priv->vmg_file = ifoOpen( priv->dvd, 0 );
+  if( !priv->vmg_file ) {
+    fprintf( stderr, "Can't open VMG info.\n" );
+    DVDClose( priv->dvd );
+    return -1;
+  }
+  priv->tt_srpt = priv->vmg_file->tt_srpt;
+
+  return 0;
+}
+
+static int
+_close(DVDSrcPrivate *priv)
+{
+    ifoClose( priv->vts_file );
+    ifoClose( priv->vmg_file );
+    DVDCloseFile( priv->dvd_title );
+    DVDClose( priv->dvd );
+    return 0;
+}
+
+static int
+_seek(DVDSrcPrivate *priv, int title, int chapter, int angle)
+{
+    /**
+     * Make sure our title number is valid.
+     */
+    fprintf( stderr, "There are %d titles on this DVD.\n",
+             priv->tt_srpt->nr_of_srpts );
+    if( title < 0 || title >= priv->tt_srpt->nr_of_srpts ) {
+        fprintf( stderr, "Invalid title %d.\n", title + 1 );
+        ifoClose( priv->vmg_file );
+        DVDClose( priv->dvd );
+        return -1;
+    }
+
+
+    /**
+     * Make sure the chapter number is valid for this title.
+     */
+    fprintf( stderr, "There are %d chapters in this title.\n",
+             priv->tt_srpt->title[ title ].nr_of_ptts );
+
+    if( chapter < 0 || chapter >= priv->tt_srpt->title[ title ].nr_of_ptts ) {
+        fprintf( stderr, "Invalid chapter %d\n", chapter + 1 );
+        ifoClose( priv->vmg_file );
+        DVDClose( priv->dvd );
+        return -1;
+    }
+
+
+    /**
+     * Make sure the angle number is valid for this title.
+     */
+    fprintf( stderr, "There are %d angles in this title.\n",
+             priv->tt_srpt->title[ title ].nr_of_angles );
+    if( angle < 0 || angle >= priv->tt_srpt->title[ title ].nr_of_angles ) {
+        fprintf( stderr, "Invalid angle %d\n", angle + 1 );
+        ifoClose( priv->vmg_file );
+        DVDClose( priv->dvd );
+        return -1;
+    }
+
+
+    /**
+     * Load the VTS information for the title set our title is in.
+     */
+    priv->vts_file = ifoOpen( priv->dvd, priv->tt_srpt->title[ title ].title_set_nr );
+    if( !priv->vts_file ) {
+        fprintf( stderr, "Can't open the title %d info file.\n",
+                 priv->tt_srpt->title[ title ].title_set_nr );
+        ifoClose( priv->vmg_file );
+        DVDClose( priv->dvd );
+        return -1;
+    }
+
+
+    /**
+     * Determine which program chain we want to watch.  This is based on the
+     * chapter number.
+     */
+    priv->ttn = priv->tt_srpt->title[ title ].vts_ttn;
+    priv->vts_ptt_srpt = priv->vts_file->vts_ptt_srpt;
+    priv->pgc_id = priv->vts_ptt_srpt->title[ priv->ttn - 1 ].ptt[ chapter ].pgcn;
+    priv->pgn = priv->vts_ptt_srpt->title[ priv->ttn - 1 ].ptt[ chapter ].pgn;
+    priv->cur_pgc = priv->vts_file->vts_pgcit->pgci_srp[ priv->pgc_id - 1 ].pgc;
+    priv->start_cell = priv->cur_pgc->program_map[ priv->pgn - 1 ] - 1;
+
+
+    /**
+     * We've got enough info, time to open the title set data.
+     */
+    priv->dvd_title = DVDOpenFile( priv->dvd, priv->tt_srpt->title[ title ].title_set_nr,
+                         DVD_READ_TITLE_VOBS );
+    if( !priv->dvd_title ) {
+        fprintf( stderr, "Can't open title VOBS (VTS_%02d_1.VOB).\n",
+                 priv->tt_srpt->title[ title ].title_set_nr );
+        ifoClose( priv->vts_file );
+        ifoClose( priv->vmg_file );
+        DVDClose( priv->dvd );
+        return -1;
+    }
+
+    return 0;
+}
+
+static void
+dvdsrc_loop (GstElement *element) 
+{
+  DVDSrc *dvdsrc;
+  DVDSrcPrivate *priv;
+
+  g_return_if_fail (element != NULL);
+  g_return_if_fail (GST_IS_DVDSRC (element));
+
+  dvdsrc = DVDSRC (element);
+  priv = dvdsrc->priv;
+  g_return_if_fail (GST_FLAG_IS_SET (dvdsrc, DVDSRC_OPEN));
+
+  do {
+    /**
+     * Playback by cell in this pgc, starting at the cell for our chapter.
+     */
+    priv->next_cell = priv->start_cell;
+    for( priv->cur_cell = priv->start_cell; priv->next_cell < priv->cur_pgc->nr_of_cells; ) {
+
+        priv->cur_cell = priv->next_cell;
+
+        /* Check if we're entering an angle block. */
+        if( priv->cur_pgc->cell_playback[ priv->cur_cell ].block_type
+                                        == BLOCK_TYPE_ANGLE_BLOCK ) {
+            int i;
+
+            priv->cur_cell += priv->angle;
+            for( i = 0;; ++i ) {
+                if( priv->cur_pgc->cell_playback[ priv->cur_cell + i ].block_mode
+                                          == BLOCK_MODE_LAST_CELL ) {
+                    priv->next_cell = priv->cur_cell + i + 1;
+                    break;
+                }
+            }
+        } else {
+            priv->next_cell = priv->cur_cell + 1;
+        }
+
+
+        /**
+         * We loop until we're out of this cell.
+         */
+        for( priv->cur_pack = priv->cur_pgc->cell_playback[ priv->cur_cell ].first_sector;
+             priv->cur_pack < priv->cur_pgc->cell_playback[ priv->cur_cell ].last_sector; ) {
+
+            dsi_t dsi_pack;
+            unsigned int next_vobu, next_ilvu_start, cur_output_size;
+            GstBuffer *buf;
+            unsigned char *data;
+            int len;
+
+            /* create the buffer */
+            // FIXME: should eventually use a bufferpool for this
+            buf = gst_buffer_new ();
+            g_return_if_fail (buf);
+
+            /* allocate the space for the buffer data */
+            data = g_malloc (1024 * DVD_VIDEO_LB_LEN);
+            GST_BUFFER_DATA (buf) = data;
+
+            g_return_if_fail (GST_BUFFER_DATA (buf) != NULL);
+
+            /*
+            if (priv->new_seek) {
+              _seek(priv, priv->titleid, priv->chapid, priv->angle);
+              GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLUSH);
+              priv->new_seek = FALSE;
+            }
+            */
+
+            /**
+             * Read NAV packet.
+             */
+            len = DVDReadBlocks( priv->dvd_title, priv->cur_pack, 1, data );
+            if( len == 0 ) {
+                fprintf( stderr, "Read failed for block %d\n", priv->cur_pack );
+                _close(priv);
+                gst_element_signal_eos (GST_ELEMENT (dvdsrc));
+                return;
+            }
+            assert( is_nav_pack( data ) );
+
+
+            /**
+             * Parse the contained dsi packet.
+             */
+            navRead_DSI( &dsi_pack, &(data[ DSI_START_BYTE ]) );
+            assert( priv->cur_pack == dsi_pack.dsi_gi.nv_pck_lbn );
+            //navPrint_DSI(&dsi_pack);
+
+
+            /**
+             * Determine where we go next.  These values are the ones we mostly
+             * care about.
+             */
+            next_ilvu_start = priv->cur_pack
+                              + dsi_pack.sml_agli.data[ priv->angle ].address;
+            cur_output_size = dsi_pack.dsi_gi.vobu_ea;
+
+
+            /**
+             * If we're not at the end of this cell, we can determine the next
+             * VOBU to display using the VOBU_SRI information section of the
+             * DSI.  Using this value correctly follows the current angle,
+             * avoiding the doubled scenes in The Matrix, and makes our life
+             * really happy.
+             *
+             * Otherwise, we set our next address past the end of this cell to
+             * force the code above to go to the next cell in the program.
+             */
+            if( dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL ) {
+                next_vobu = priv->cur_pack
+                            + ( dsi_pack.vobu_sri.next_vobu & 0x7fffffff );
+            } else {
+                next_vobu = priv->cur_pack + cur_output_size + 1;
+            }
+
+            assert( cur_output_size < 1024 );
+            priv->cur_pack++;
+
+            /**
+             * Read in and output cursize packs.
+             */
+            len = DVDReadBlocks( priv->dvd_title, priv->cur_pack,
+                                         cur_output_size, data );
+            if( len != cur_output_size ) {
+                fprintf( stderr, "Read failed for %d blocks at %d\n",
+                         cur_output_size, priv->cur_pack );
+                _close(priv);
+                gst_element_signal_eos (GST_ELEMENT (dvdsrc));
+                return;
+            }
+
+            GST_BUFFER_SIZE(buf) = cur_output_size * DVD_VIDEO_LB_LEN;
+            gst_pad_push(priv->srcpad, buf);
+            priv->cur_pack = next_vobu;
+        }
+    }
+  } while (!GST_ELEMENT_IS_COTHREAD_STOPPING (element));
+}
+
+#if 0
+static int
+_read(DVDSrcPrivate *priv, int angle, int new_seek, GstBuffer *buf)
+{
+    unsigned char *data;
+
+    data = GST_BUFFER_DATA(buf);
+
+    /**
+     * Playback by cell in this pgc, starting at the cell for our chapter.
+     */
+    if (new_seek) {
+      priv->next_cell = priv->start_cell;
+      priv->cur_cell = priv->start_cell;
+    }
+    if (priv->next_cell < priv->cur_pgc->nr_of_cells) {
+
+        priv->cur_cell = priv->next_cell;
+
+        /* Check if we're entering an angle block. */
+        if( priv->cur_pgc->cell_playback[ priv->cur_cell ].block_type
+                                        == BLOCK_TYPE_ANGLE_BLOCK ) {
+            int i;
+
+            priv->cur_cell += angle;
+            for( i = 0;; ++i ) {
+                if( priv->cur_pgc->cell_playback[ priv->cur_cell + i ].block_mode
+                                          == BLOCK_MODE_LAST_CELL ) {
+                    priv->next_cell = priv->cur_cell + i + 1;
+                    break;
+                }
+            }
+        } else {
+            priv->next_cell = priv->cur_cell + 1;
+        }
+
+
+        /**
+         * We loop until we're out of this cell.
+         */
+        if (priv->new_cell) {
+          priv->cur_pack = priv->cur_pgc->cell_playback[ priv->cur_cell ].first_sector;
+          priv->new_cell = FALSE;
+        }
+
+        if (priv->cur_pack < priv->cur_pgc->cell_playback[ priv->cur_cell ].last_sector; ) {
+
+            dsi_t dsi_pack;
+            unsigned int next_vobu, next_ilvu_start, cur_output_size;
+            int len;
+
+
+            /**
+             * Read NAV packet.
+             */
+            len = DVDReadBlocks( priv->title, priv->cur_pack, 1, data );
+            if( len == 0 ) {
+                fprintf( stderr, "Read failed for block %d\n", priv->cur_pack );
+                _close(priv);
+                return -1;
+            }
+            assert( is_nav_pack( data ) );
+
+
+            /**
+             * Parse the contained dsi packet.
+             */
+            navRead_DSI( &dsi_pack, &(data[ DSI_START_BYTE ]), sizeof(dsi_t) );
+            assert( priv->cur_pack == dsi_pack.dsi_gi.nv_pck_lbn );
+
+
+            /**
+             * Determine where we go next.  These values are the ones we mostly
+             * care about.
+             */
+            next_ilvu_start = priv->cur_pack
+                              + dsi_pack.sml_agli.data[ angle ].address;
+            cur_output_size = dsi_pack.dsi_gi.vobu_ea;
+
+
+            /**
+             * If we're not at the end of this cell, we can determine the next
+             * VOBU to display using the VOBU_SRI information section of the
+             * DSI.  Using this value correctly follows the current angle,
+             * avoiding the doubled scenes in The Matrix, and makes our life
+             * really happy.
+             *
+             * Otherwise, we set our next address past the end of this cell to
+             * force the code above to go to the next cell in the program.
+             */
+            if( dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL ) {
+                next_vobu = priv->cur_pack
+                            + ( dsi_pack.vobu_sri.next_vobu & 0x7fffffff );
+            } else {
+                next_vobu = priv->cur_pack + cur_output_size + 1;
+            }
+
+            assert( cur_output_size < 1024 );
+            priv->cur_pack++;
+
+            /**
+             * Read in and output cursize packs.
+             */
+            len = DVDReadBlocks( priv->title, priv->cur_pack,
+                                         cur_output_size, data );
+            if( len != cur_output_size ) {
+                fprintf( stderr, "Read failed for %d blocks at %d\n",
+                         cur_output_size, priv->cur_pack );
+                _close(priv);
+                return -1;
+            }
+
+            GST_BUFFER_SIZE(buf) = cur_output_size * DVD_VIDEO_LB_LEN;
+            priv->cur_pack = next_vobu;
+        }
+    } else {
+        return -1;
+    }
+
+    return 0;
+}
+
+static GstBuffer *
+dvdsrc_get (GstPad *pad) 
+{
+  DVDSrc *dvdsrc;
+  DVDSrcPrivate *priv;
+  GstBuffer *buf;
+
+  g_return_val_if_fail (pad != NULL, NULL);
+  g_return_val_if_fail (GST_IS_PAD (pad), NULL);
+
+  dvdsrc = DVDSRC (gst_pad_get_parent (pad));
+  priv = dvdsrc->priv;
+  g_return_val_if_fail (GST_FLAG_IS_SET (dvdsrc, DVDSRC_OPEN),NULL);
+
+  /* create the buffer */
+  // FIXME: should eventually use a bufferpool for this
+  buf = gst_buffer_new ();
+  g_return_val_if_fail (buf, NULL);
+
+  /* allocate the space for the buffer data */
+  GST_BUFFER_DATA (buf) = g_malloc (1024 * DVD_VIDEO_LB_LEN);
+  g_return_val_if_fail (GST_BUFFER_DATA (buf) != NULL, NULL);
+
+  if (priv->new_seek) {
+    _seek(priv, priv->titleid, priv->chapid, priv->angle);
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLUSH);
+  }
+
+  /* read it in from the file */
+  if (_read (priv, priv->angle, priv->new_seek, buf)) {
+    gst_element_signal_eos (GST_ELEMENT (dvdsrc));
+    return NULL;
+  }
+
+  if (priv->new_seek) {
+    priv->new_seek = FALSE;
+  }
+
+  return buf;
+}
+#endif
+
+/* open the file, necessary to go to RUNNING state */
+static gboolean 
+dvdsrc_open_file (DVDSrc *src) 
+{
+  g_return_val_if_fail (src != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_DVDSRC(src), FALSE);
+  g_return_val_if_fail (!GST_FLAG_IS_SET (src, DVDSRC_OPEN), FALSE);
+
+  if (_open(src->priv, src->priv->location))
+    return FALSE;
+  if (_seek(src->priv,
+      src->priv->title,
+      src->priv->chapter,
+      src->priv->angle))
+    return FALSE;
+
+  GST_FLAG_SET (src, DVDSRC_OPEN);
+  
+  return TRUE;
+}
+
+/* close the file */
+static void 
+dvdsrc_close_file (DVDSrc *src) 
+{
+  g_return_if_fail (GST_FLAG_IS_SET (src, DVDSRC_OPEN));
+
+  _close(src->priv);
+
+  GST_FLAG_UNSET (src, DVDSRC_OPEN);
+}
+
+static GstElementStateReturn
+dvdsrc_change_state (GstElement *element)
+{
+  g_return_val_if_fail (GST_IS_DVDSRC (element), GST_STATE_FAILURE);
+
+  GST_DEBUG (0,"gstdisksrc: state pending %d\n", GST_STATE_PENDING (element));
+
+  /* if going down into NULL state, close the file if it's open */
+  if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
+    if (GST_FLAG_IS_SET (element, DVDSRC_OPEN))
+      dvdsrc_close_file (DVDSRC (element));
+  /* otherwise (READY or higher) we need to open the file */
+  } else {
+    if (!GST_FLAG_IS_SET (element, DVDSRC_OPEN)) {
+      if (!dvdsrc_open_file (DVDSRC (element)))
+        return GST_STATE_FAILURE;
+    }
+  }
+
+  /* if we haven't failed already, give the parent class a chance to ;-) */
+  if (GST_ELEMENT_CLASS (parent_class)->change_state)
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+
+  return GST_STATE_SUCCESS;
+}
+
+static gboolean
+plugin_init (GModule *module, GstPlugin *plugin)
+{
+  GstElementFactory *factory;
+
+  /* create an elementfactory for the dvdsrc element */
+  factory = gst_elementfactory_new ("dvdsrc", GST_TYPE_DVDSRC,
+                                    &dvdsrc_details);
+  g_return_val_if_fail (factory != NULL, FALSE);
+  
+  gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
+  
+  return TRUE;
+}
+
+GstPluginDesc plugin_desc = {
+  GST_VERSION_MAJOR,
+  GST_VERSION_MINOR,
+  "dvdsrc",
+  plugin_init
+};
+

ext/dvdread/dvdsrc.h

@@ -0,0 +1,75 @@
+/* Gnome-Streamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __DVDSRC_H__
+#define __DVDSRC_H__
+
+
+#include <config.h>
+#include <gst/gst.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+GstElementDetails dvdsrc_details;
+
+
+#define GST_TYPE_DVDSRC \
+  (dvdsrc_get_type())
+#define DVDSRC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DVDSRC,DVDSrc))
+#define DVDSRC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVDSRC,DVDSrcClass))
+#define GST_IS_DVDSRC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVDSRC))
+#define GST_IS_DVDSRC_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVDSRC))
+
+// NOTE: per-element flags start with 16 for now
+typedef enum {
+  DVDSRC_OPEN		= GST_ELEMENT_FLAG_LAST,
+
+  DVDSRC_FLAG_LAST	= GST_ELEMENT_FLAG_LAST+2,
+} DVDSrcFlags;
+
+typedef struct _DVDSrc DVDSrc;
+typedef struct _DVDSrcPrivate DVDSrcPrivate;
+typedef struct _DVDSrcClass DVDSrcClass;
+
+struct _DVDSrc {
+  GstElement element;
+  DVDSrcPrivate *priv;
+};
+
+struct _DVDSrcClass {
+  GstElementClass parent_class;
+};
+
+GType dvdsrc_get_type(void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __DVDSRC_H__ */

gst-libs/gst/audio/Makefile.am

@@ -1,6 +1,6 @@
-## libdir = $(libdir)/gst
+librarydir = $(libdir)/gst
 
-lib_LTLIBRARIES = libgstaudio.la
+library_LTLIBRARIES = libgstaudio.la
 
 libgstaudio_la_SOURCES = audio.c
 

gst-libs/gst/resample/Makefile.am

@@ -1,6 +1,6 @@
-## libdir = $(libdir)/gst
+librarydir = $(libdir)/gst
 
-lib_LTLIBRARIES = libgstresample.la
+library_LTLIBRARIES = libgstresample.la
 
 if HAVE_CPU_I386
 ARCHCFLAGS = -march=i486

gst-libs/gst/riff/Makefile.am

@@ -1,6 +1,6 @@
-libdir = $(prefix)/lib/gst
+librarydir = $(prefix)/lib/gst
 
-lib_LTLIBRARIES = libgstriff.la
+library_LTLIBRARIES = libgstriff.la
 
 libgstriff_la_SOURCES = riffparse.c riffencode.c riffutil.c