dvdnav: remove dvdnav plugin

Remove dvdnav plugin, it has no future. resindvd is the plugin to
use for dvd playback. Note that dvdnav was never really enabled
in -ugly, you had to edit configure.ac to get it built.
This commit is contained in:
Tim-Philipp Müller 2009-07-22 11:10:38 +01:00
parent 487b3b06e7
commit f5d046a0b0
17 changed files with 1161 additions and 2929 deletions

View file

@ -19,9 +19,7 @@ The plugins which use a GPL library are as follows:
a52dec liba52 (http://liba52.sourceforge.net/)
aasink aalib (http://sourceforge.net/projects/aa-project/)
cdparanoia libcdparanoia (http://www.xiph.org/paranoia/)
dtsdec libdts (http://www.videolan.org/dtsdec.html)
dvdnavsrc libdvdnav (http://dvd.sourceforge.net/)
dxr3 (http://dxr3.sourceforge.net/)
icecastsend libshout (http://www.icecast.org)
mad libmad (http://www.mars.org/home/rob/proj/mpeg/)

View file

@ -66,10 +66,6 @@ raw1394/linux1394 (for the dv plugin)
libdvdread (for the dvdsrc)
http://www.dtek.chalmers.se/groups/dvd/
(optional: libcss for encrypted DVDs)
libdvdnav (for the dvdnavsrc)
http://dvd.sourceforge.net/
(optional: libcss for encrypted DVDs)
>= 0.1.9
libesound (for the esd sink
ftp.gnome.org/pub/GNOME/stable/sources/esound)
gnome-vfs (for the gnome-vfs src)

View file

@ -254,42 +254,6 @@ AG_GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdreadsrc, [
AC_SUBST(DVDREAD_LIBS)
])
dnl *** dvdnav ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DVDNAV, true)
AG_GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnav, [
translit(dnm, m, l) AC_SUBST(DVDNAV_LIBS)
translit(dnm, m, l) AC_SUBST(DVDNAV_CFLAGS)
AG_GST_CHECK_CONFIGPROG(DVDNAV, dvdnav-config)
if test x"$HAVE_DVDNAV" = x"yes"; then
dnl check version
DVDNAV_VERSION=`dvdnav-config --version|head -n 1|sed 's/^.*) //'|sed 's/ (.*)//'`
DVDNAV_MAJOR=`echo $DVDNAV_VERSION | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
DVDNAV_MINOR=`echo $DVDNAV_VERSION | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
DVDNAV_MICRO=`echo $DVDNAV_VERSION | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
if [[ "$DVDNAV_MAJOR" -eq "0" ]] && \
[[ "$DVDNAV_MINOR" -lt "1" ]]; then
AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
HAVE_DVDNAV="no"
elif [[ "$DVDNAV_MAJOR" -eq "0" ]] && \
[[ "$DVDNAV_MINOR" -eq "1" ]] && \
[[ "$DVDNAV_MICRO" -lt "7" ]]; then
AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
HAVE_DVDNAV="no"
fi
fi
dnl now check for dvdread/nav_print.h - see #133002
AC_CHECK_HEADER(dvdread/nav_print.h, , [
AC_MSG_WARN([header dvdread/nav_print.h from dvdread missing])
HAVE_DVDNAV="no"
])
AS_SCRUB_INCLUDE(DVDNAV_CFLAGS)
dnl disabled until plugin is fully functional
HAVE_DVDNAV=no
], disabled, , [
AC_MSG_NOTICE([dvdnavsrc not stable yet, not building])
])
dnl *** lame ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
AG_GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
@ -409,7 +373,6 @@ AM_CONDITIONAL(USE_A52DEC, false)
AM_CONDITIONAL(USE_AMRNB, false)
AM_CONDITIONAL(USE_CDIO, false)
AM_CONDITIONAL(USE_DVDREAD, false)
AM_CONDITIONAL(USE_DVDNAV, false)
AM_CONDITIONAL(USE_LAME, false)
AM_CONDITIONAL(USE_ID3TAG, false)
AM_CONDITIONAL(USE_MAD, false)
@ -496,7 +459,6 @@ ext/Makefile
ext/a52dec/Makefile
ext/amrnb/Makefile
ext/cdio/Makefile
ext/dvdnav/Makefile
ext/dvdread/Makefile
ext/lame/Makefile
ext/mad/Makefile

View file

@ -43,7 +43,6 @@
<xi:include href="xml/plugin-asf.xml" />
<xi:include href="xml/plugin-cdio.xml" />
<xi:include href="xml/plugin-dvdlpcmdec.xml" />
<xi:include href="xml/plugin-dvdnav.xml" />
<xi:include href="xml/plugin-dvdread.xml" />
<xi:include href="xml/plugin-dvdsub.xml" />
<xi:include href="xml/plugin-iec958.xml" />

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,50 @@
<SIGNAL>
<NAME>GstRDTManager::clear-pt-map</NAME>
<RETURNS>void</RETURNS>
<FLAGS>l</FLAGS>
GstRDTManager *gstrdtmanager
</SIGNAL>
<SIGNAL>
<NAME>GstRDTManager::on-bye-ssrc</NAME>
<RETURNS>void</RETURNS>
<FLAGS>l</FLAGS>
GstRDTManager *gstrdtmanager
guint arg1
guint arg2
</SIGNAL>
<SIGNAL>
<NAME>GstRDTManager::on-bye-timeout</NAME>
<RETURNS>void</RETURNS>
<FLAGS>l</FLAGS>
GstRDTManager *gstrdtmanager
guint arg1
guint arg2
</SIGNAL>
<SIGNAL>
<NAME>GstRDTManager::on-timeout</NAME>
<RETURNS>void</RETURNS>
<FLAGS>l</FLAGS>
GstRDTManager *gstrdtmanager
guint arg1
guint arg2
</SIGNAL>
<SIGNAL>
<NAME>GstRDTManager::request-pt-map</NAME>
<RETURNS>GstCaps*</RETURNS>
<FLAGS>l</FLAGS>
GstRDTManager *gstrdtmanager
guint arg1
guint arg2
</SIGNAL>
<SIGNAL>
<NAME>GstMPEGParse::reached-offset</NAME>
<RETURNS>void</RETURNS>
<FLAGS>f</FLAGS>
GstMPEGParse *gstmpegparse
</SIGNAL>

View file

@ -1,28 +0,0 @@
<plugin>
<name>dvdnav</name>
<description>Access a DVD with navigation features using libdvdnav</description>
<filename>../../ext/dvdnav/.libs/libgstdvdnav.so</filename>
<basename>libgstdvdnav.so</basename>
<version>0.10.6.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>dvdnavsrc</name>
<longname>DVD Source</longname>
<class>Source/File/DVD</class>
<description>Access a DVD with navigation features using libdvdnav</description>
<author>David I. Lehn &lt;dlehn@users.sourceforge.net&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>video/mpeg, mpegversion=(int)1, systemstream=(boolean)true</details>
</caps>
</pads>
</element>
</elements>
</plugin>

View file

@ -22,12 +22,6 @@ else
DVDREAD_DIR =
endif
if USE_DVDNAV
DVDNAV_DIR = dvdnav
else
DVDNAV_DIR =
endif
if USE_LAME
LAME_DIR = lame
else
@ -69,7 +63,6 @@ SUBDIRS = \
$(AMRNB_DIR) \
$(CDIO_DIR) \
$(DVDREAD_DIR) \
$(DVDNAV_DIR) \
$(LAME_DIR) \
$(MAD_DIR) \
$(MPEG2DEC_DIR) \
@ -81,7 +74,6 @@ DIST_SUBDIRS = \
a52dec \
amrnb \
cdio \
dvdnav \
dvdread \
lame \
mad \

View file

@ -1 +0,0 @@
libgstdvdnav_la-dvdnavsrc.loT

View file

@ -1,11 +0,0 @@
plugin_LTLIBRARIES = libgstdvdnav.la
libgstdvdnav_la_SOURCES = dvdnavsrc.c
libgstdvdnav_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(DVDNAV_CFLAGS)
libgstdvdnav_la_LIBADD = $(GST_BASE_LIBS) $(DVDNAV_LIBS)
libgstdvdnav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdvdnav_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = dvdnavsrc.h
EXTRA_DIST = README

View file

@ -1,11 +0,0 @@
Various Info
============
http://members.aol.com/mpucoder/DVD/index.html
http://dvd.sourceforge.net/
Try this:
./gst-launch dvdnavsrc location=/dev/dvd ! dvddemux .current_video ! { queue ! mpeg2dec ! xvimagesink } dvddemux0.current_audio ! { queue ! a52dec ! osssink }
You can give title, chapter, and angle parameters to dvdnavsrc.

File diff suppressed because it is too large Load diff

View file

@ -1,147 +0,0 @@
/* GStreamer
* Copyright (C) 2002 David I. Lehn <dlehn@users.sourceforge.net>
*
* 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 __GST_DVD_NAV_SRC_H__
#define __GST_DVD_NAV_SRC_H__
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_read.h>
#include <dvdnav/dvdnav.h>
#include <dvdnav/nav_print.h>
#include <gst/gst.h>
#include <gst/base/gstpushsrc.h>
#define GST_TYPE_DVD_NAV_SRC (gst_dvd_nav_src_get_type())
#define GST_DVD_NAV_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DVD_NAV_SRC,GstDvdNavSrc))
#define GST_DVD_NAV_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVD_NAV_SRC,GstDvdNavSrcClass))
#define GST_IS_DVD_NAV_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVD_NAV_SRC))
#define GST_IS_DVD_NAV_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVD_NAV_SRC))
typedef struct _GstDvdNavSrc GstDvdNavSrc;
typedef struct _GstDvdNavSrcClass GstDvdNavSrcClass;
/* The pause modes to handle still frames. */
typedef enum
{
GST_DVD_NAV_SRC_PAUSE_OFF, /* No pause active. */
GST_DVD_NAV_SRC_PAUSE_LIMITED, /* A time limited pause is active. */
GST_DVD_NAV_SRC_PAUSE_UNLIMITED /* An time unlimited pause is active. */
} GstDvdNavSrcPauseMode;
/* The DVD domain types. */
typedef enum
{
GST_DVD_NAV_SRC_DOMAIN_UNKNOWN, /* Unknown domain. */
GST_DVD_NAV_SRC_DOMAIN_FP, /* First Play domain. */
GST_DVD_NAV_SRC_DOMAIN_VMGM, /* Video Management Menu domain */
GST_DVD_NAV_SRC_DOMAIN_VTSM, /* Video Title Menu domain. */
GST_DVD_NAV_SRC_DOMAIN_VTS /* Video Title domain. */
} GstDvdNavSrcDomainType;
struct _GstDvdNavSrc
{
GstPushSrc pushsrc;
GstCaps *streaminfo;
gchar *device;
gchar *last_uri;
gint64 pending_offset; /* Next newsegment event offset */
gboolean new_seek;
gboolean seek_pending;
gboolean need_flush;
gboolean first_seek;
gboolean use_tmaps;
gboolean still_frame;
/* Timing */
#if 0
GstClock *clock; /* The clock for this element */
#endif
/* Pause handling */
GstDvdNavSrcPauseMode pause_mode; /* The current pause mode */
GstClockTime pause_remain; /* Remaining duration of the pause */
/* Highligh handling */
gint button; /* The currently highlighted button *
* number (0 if no highlight) */
dvdnav_highlight_area_t area; /* The area corresponding to the *
* currently highlighted button */
/* State handling */
GstDvdNavSrcDomainType domain; /* The current DVD domain */
gint title; /* Current title, chapter, angle; */
gint chapter; /* can be changed by seek events */
gint angle; /* initialised at start from uri_x */
gint uri_title; /* Current title, chapter, angle */
gint uri_chapter; /* as set via the uri handler */
gint uri_angle;
gint audio_phys; /* The current audio streams */
gint audio_log;
gint subp_phys; /* The current subpicture streams */
gint subp_log;
dvdnav_t *dvdnav; /* The libdvdnav handle */
GstCaps *buttoninfo;
GstBuffer *cur_buf; /* Current output buffer. *
* See dvd_nav_src_get() */
GstClockTime pgc_length; /* Length of the current *
* program chain (title) */
GstClockTime cell_start; /* Start of the current cell */
GstClockTime pg_start; /* Start of the current program *
* within the PGC */
gint cur_vts; /* Current VTS being read */
vmgi_mat_t vmgm_attr; /* VMGM domain info */
GArray *vts_attrs; /* Array of vts_attributes_t *
* structures cached from *
* the VMG ifo */
guint32 sector_length;
dvd_reader_t *dvd;
ifo_handle_t *vmg_file;
tt_srpt_t *tt_srpt;
vts_ptt_srpt_t *vts_ptt_srpt;
ifo_handle_t *vts_file;
vts_tmapt_t *vts_tmapt;
vts_tmap_t *title_tmap;
};
struct _GstDvdNavSrcClass
{
GstPushSrcClass parent_class;
void (*user_op) (GstDvdNavSrc * src, gint op);
};
#endif /* __GST_DVD_NAV_SRC_H__ */

View file

@ -1,9 +0,0 @@
#!/bin/sh
AUDIOSINK=`gconftool-2 -g /system/gstreamer/0.10/default/audiosink`
VIDEOSINK=`gconftool-2 -g /system/gstreamer/0.10/default/videosink`
gst-launch dvdnavsrc ! dvddemux name=demux multiqueue name=mq \
demux.current_video ! mq.sink0 mq.src0 ! mpeg2dec ! dvdspu name=sub ! \
navseek ! ffmpegcolorspace ! videoscale ! $VIDEOSINK \
demux.current_subpicture ! mq.sink1 mq.src1 ! sub.subpicture \
demux.current_audio ! mq.sink2 mq.src2 ! a52dec ! audioconvert ! audioresample ! $AUDIOSINK $@

View file

@ -607,7 +607,7 @@ commands_only_pgc:
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
(_("Could not open DVD title %d. Interactive titles are not supported "
"by this element"), title_set_nr),
("Commands-only PGC, not supported, use dvdnavsrc"));
("Commands-only PGC, not supported, use rsndvdbin"));
return FALSE;
}
}

View file

@ -21,7 +21,6 @@ BuildRequires: gcc-c++
@USE_SIDPLAY_TRUE@BuildRequires: libsidplay-devel >= 1.36.0
@USE_A52DEC_TRUE@BuildRequires: a52dec-devel >= 0.7.3
# @USE_DVDNAV_TRUE@BuildRequires: libdvdnav-devel >= 0.1.3
@USE_DVDREAD_TRUE@BuildRequires: libdvdread-devel >= 0.9.0
@USE_LAME_TRUE@BuildRequires: lame-devel >= 3.89
@USE_MAD_TRUE@BuildRequires: libid3tag-devel >= 0.15.0
@ -32,7 +31,6 @@ BuildRequires: gcc-c++
@USE_LAME_TRUE@Provides: gstreamer-lame = %{version}-%{release}
@USE_MAD_TRUE@Provides: gstreamer-mad = %{version}-%{release}
@USE_A52DEC_TRUE@Provides: gstreamer-a52dec = %{version}-%{release}
# @USE_DVDNAV_TRUE@Provides: gstreamer-dvdnavsrc = %{version}-%{release}
@USE_DVDREAD_TRUE@Provides: gstreamer-dvdread = %{version}-%{release}
@USE_MPEG2DEC_TRUE@Provides: gstreamer-mpeg2dec = %{version}-%{release}
@ -108,7 +106,6 @@ rm -rf $RPM_BUILD_ROOT
@USE_LAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlame.so
@USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so
@USE_A52DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsta52dec.so
# @USE_DVDNAV_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdvdnavsrc.so
@USE_DVDREAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdvdread.so
@USE_MPEG2DEC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2dec.so
@USE_TWOLAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttwolame.so

View file

@ -1,5 +1,4 @@
ext/cdio/gstcdiocddasrc.c
ext/dvdnav/dvdnavsrc.c
ext/dvdread/dvdreadsrc.c
ext/lame/gstlame.c
ext/twolame/gsttwolame.c