DVD update:

Original commit message from CVS:
DVD update:
- use libdvdread
- title/chap/angle interface for dvdsrc
- test app dvdplay.c

REQUIREMENTS

@@ -53,8 +53,9 @@ aRts		(for the arts plugin wrapper, and the artsd sink)
 			http://www.arts-project.org
 raw1394/linux1394	(for the dv plugin)
 			http://linux1394.sourceforge.net
-decss		(for the dvdsrc)
-			http://www.linuxrising.com/dvd-munitions_tar.gz
+libdvdread	(for the dvdsrc)
+			http://www.dtek.chalmers.se/groups/dvd/
+			(optional: libcss for encrypted DVDs)
 libesound	(for the esd sink 
 			ftp.gnome.org/pub/GNOME/stable/sources/esound)
 gnome-vfs	(for the gnome-vfs src)

acconfig.h

@@ -30,7 +30,7 @@
 #undef HAVE_LIBXV
 #undef HAVE_OSS
 #undef HAVE_XAUDIO
-#undef HAVE_CSSAUTH
+#undef HAVE_LIBDVDREAD
 #undef HAVE_VORBIS
 #undef HAVE_LIBMAD
 #undef HAVE_LIBMIKMOD

configure.base

@@ -197,7 +197,6 @@ AC_MSG_RESULT(no)
 AC_MSG_RESULT(no)
 ])
 
-
 dnl Check for essential libraries first:
 dnl ====================================
 
@@ -665,17 +664,10 @@ AC_MSG_CHECKING(openquicktime)
 AC_CHECK_LIB(openquicktime, quicktime_init, HAVE_LIBOPENQUICKTIME=yes, HAVE_LIBOPENQUICKTIME=no, )
 AC_CHECK_HEADER(openquicktime/openquicktime.h, :, HAVE_LIBOPENQUICKTIME=no)
 
-
-dnl check if css-auth.c exists (FIXME)
-AC_MSG_CHECKING(DVD CSS code)
-if test -f plugins/dvdsrc/css-auth.c
-then
-  AC_MSG_RESULT(yes)
-  HAVE_CSSAUTH="yes"
-else
-  AC_MSG_RESULT(no)
-  HAVE_CSSAUTH="no"
-fi
+dnl Check for libdvdread
+AC_MSG_CHECKING(libdvdread)
+AC_CHECK_LIB(dvdread, DVDOpen, HAVE_LIBDVDREAD=yes, HAVE_LIBDVDREAD=no, )
+AC_CHECK_HEADER(dvdread/dvd_reader.h, :, HAVE_LIBDVDREAD=no)
 
 dnl Check for SDL library
 AC_MSG_CHECKING(SDL library)
@@ -978,8 +970,8 @@ if test "x$HAVE_LIBHERMES" = "xyes"; then
   AC_DEFINE(HAVE_LIBHERMES)
 fi
 
-if test "x$HAVE_CSSAUTH" = xyes; then
-  AC_DEFINE(HAVE_CSSAUTH)
+if test "x$HAVE_LIBDVDREAD" = xyes; then
+  AC_DEFINE(HAVE_LIBDVDREAD)
 fi
 
 if test "x$HAVE_LINUX_CDROM" = xyes; then
@@ -1025,7 +1017,7 @@ AM_CONDITIONAL(HAVE_LIBMAD,         test "x$HAVE_LIBMAD" = "xyes")
 AM_CONDITIONAL(HAVE_LIBMIKMOD,      test "x$HAVE_LIBMIKMOD" = "xyes")
 AM_CONDITIONAL(HAVE_LINUX_CDROM,    test "x$HAVE_LINUX_CDROM" = "xyes")
 AM_CONDITIONAL(HAVE_LINUX_VIDEODEV, test "x$HAVE_LINUX_VIDEODEV" = "xyes")
-AM_CONDITIONAL(HAVE_CSSAUTH,        test "x$HAVE_CSSAUTH" = "xyes")
+AM_CONDITIONAL(HAVE_LIBDVDREAD,     test "x$HAVE_LIBDVDREAD" = "xyes")
 AM_CONDITIONAL(HAVE_VORBIS,         test "x$HAVE_VORBIS" = "xyes")
 AM_CONDITIONAL(HAVE_LIBJPEG,        test "x$HAVE_LIBJPEG" = "xyes")
 AM_CONDITIONAL(HAVE_LIBSDL,         test "x$HAVE_LIBSDL" = "xyes")

test/.gitignore

@@ -58,3 +58,4 @@ sinesliders
 mp2tomp1v2
 main
 testspeed
+dvdplay

test/Makefile.am

@@ -4,7 +4,7 @@ if HAVE_GNOME
 GNOME_PROGS = spectrum wave mp1parse videotest aviparse \
 		videotest2 video2mp1 dvshow dv2mp1 \
 		mpeg2parse2 mpeg2parse3 \
-		mp2tomp1v2 main sinesliders testspeed
+		mp2tomp1v2 main sinesliders testspeed dvdplay
 sinesliders_LDADD = ../libs/control/libgstcontrol.la
 else
 GNOME_PROGS =

test/dvdplay.c

@@ -0,0 +1,147 @@
+#include <gnome.h>
+#include <gst/gst.h>
+
+GstPipeline *pipeline;
+GstElement *v_queue, *a_queue, *v_thread, *a_thread;
+GtkWidget *appwindow;
+GtkWidget  *gtk_socket;
+
+void eof(GstElement *src) {
+  g_print("have eos, quitting\n");
+  exit(0);
+}
+
+gboolean idle_func(gpointer data) {
+  gst_bin_iterate(GST_BIN(data));
+  return TRUE;
+}
+
+void mpeg2parse_newpad(GstElement *parser,GstPad *pad, GstElement *pipeline) {
+
+  g_print("***** a new pad %s was created\n", gst_pad_get_name(pad));
+
+  if (strncmp(gst_pad_get_name(pad), "video_", 6) == 0) {
+    gst_pad_connect(pad, gst_element_get_pad(v_queue,"sink"));
+    gst_bin_add(GST_BIN(pipeline),v_thread);
+    gst_element_set_state(v_thread,GST_STATE_PLAYING);
+  } else if (strcmp(gst_pad_get_name(pad), "private_stream_1.0") == 0) {
+    gst_pad_connect(pad, gst_element_get_pad(a_queue,"sink"));
+    gst_bin_add(GST_BIN(pipeline),a_thread);
+    gst_element_set_state(a_thread,GST_STATE_PLAYING);
+  }
+}
+
+void mpeg2parse_have_size(GstElement *videosink,gint width,gint height) {
+  gtk_widget_set_usize(gtk_socket,width,height);
+  gtk_widget_show_all(appwindow);
+}
+
+int main(int argc,char *argv[]) {
+  GstElement *src, *parse;
+  GstElement *v_decode, *show, *color;
+  GstElement *a_decode, *osssink;
+
+  if (argc < 5) {
+    g_print("usage: %s dvdlocation title chapter angle\n", argv[0]);
+    exit(1);
+  }
+
+  gst_init(&argc,&argv);
+  gnome_init("MPEG2 Video player","0.0.1",argc,argv);
+
+  // ***** construct the main pipeline *****
+  pipeline = GST_PIPELINE(gst_pipeline_new("pipeline"));
+  g_return_val_if_fail(pipeline != NULL, -1);
+
+  src = gst_elementfactory_make("dvdsrc","src");
+  g_return_val_if_fail(src != NULL, -1);
+  gtk_object_set(GTK_OBJECT(src),"location",argv[1],NULL);
+  gtk_object_set(GTK_OBJECT(src),"title",atoi(argv[2]),NULL);
+  gtk_object_set(GTK_OBJECT(src),"chapter",atoi(argv[3]),NULL);
+  gtk_object_set(GTK_OBJECT(src),"angle",atoi(argv[4]),NULL);
+
+  parse = gst_elementfactory_make("mpeg2parse","parse");
+  //parse = gst_elementfactory_make("mpeg1parse","parse");
+  g_return_val_if_fail(parse != NULL, -1);
+
+  gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(src));
+  gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(parse));
+
+  gst_element_connect(src,"src",parse,"sink");
+
+
+  // ***** pre-construct the video thread *****
+  v_thread = GST_ELEMENT(gst_thread_new("v_thread"));
+  g_return_val_if_fail(v_thread != NULL, -1);
+
+  v_queue = gst_elementfactory_make("queue","v_queue");
+  g_return_val_if_fail(v_queue != NULL, -1);
+
+  v_decode = gst_elementfactory_make("mpeg2dec","decode_video");
+  g_return_val_if_fail(v_decode != NULL, -1);
+
+  color = gst_elementfactory_make("colorspace","color");
+  g_return_val_if_fail(color != NULL, -1);
+
+  show = gst_elementfactory_make("xvideosink","show");
+  g_return_val_if_fail(show != NULL, -1);
+
+  gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(v_queue));
+  gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(v_decode));
+  gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(color));
+  gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(show));
+
+  gst_element_connect(v_queue,"src",v_decode,"sink");
+  gst_element_connect(v_decode,"src",color,"sink");
+  gst_element_connect(color,"src",show,"sink");
+
+
+  // ***** pre-construct the audio thread *****
+  a_thread = GST_ELEMENT(gst_thread_new("a_thread"));
+  g_return_val_if_fail(a_thread != NULL, -1);
+
+  a_queue = gst_elementfactory_make("queue","a_queue");
+  g_return_val_if_fail(a_queue != NULL, -1);
+  
+  a_decode = gst_elementfactory_make("a52dec","decode_audio");
+  g_return_val_if_fail(a_decode != NULL, -1);
+
+  osssink = gst_elementfactory_make("osssink","osssink");
+  g_return_val_if_fail(osssink != NULL, -1);
+
+  gst_bin_add(GST_BIN(a_thread),GST_ELEMENT(a_queue));
+  gst_bin_add(GST_BIN(a_thread),GST_ELEMENT(a_decode));
+  gst_bin_add(GST_BIN(a_thread),GST_ELEMENT(osssink));
+
+  gst_element_connect(a_queue,"src",a_decode,"sink");
+  gst_element_connect(a_decode,"src",osssink,"sink");
+
+
+  // ***** construct the GUI *****
+  appwindow = gnome_app_new("DVD Player","DVD Player");
+
+  gtk_socket = gtk_socket_new ();
+  gtk_widget_show (gtk_socket);
+
+  gnome_app_set_contents(GNOME_APP(appwindow),
+      	        GTK_WIDGET(gtk_socket));
+
+  gtk_widget_realize (gtk_socket);
+  gtk_socket_steal (GTK_SOCKET (gtk_socket), 
+		  gst_util_get_int_arg (GTK_OBJECT(show), "xid"));
+
+  gtk_signal_connect(GTK_OBJECT(parse),"new_pad",mpeg2parse_newpad, pipeline);
+  gtk_signal_connect(GTK_OBJECT(src),"eos",GTK_SIGNAL_FUNC(eof),NULL);
+  gtk_signal_connect(GTK_OBJECT(show),"have_size",mpeg2parse_have_size, pipeline);
+
+  g_print("setting to PLAYING state\n");
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
+
+  gtk_idle_add(idle_func,pipeline);
+
+  gdk_threads_enter();
+  gtk_main();
+  gdk_threads_leave();
+
+  return 0;
+}