Thedj work on zvbi support with some cleanup from me and backported to...

Thedj work on zvbi support with some cleanup from me and backported to vlc-0.8.6b. The change in modules/demux/ts.c cannot be checked into the archive because it breaks the telx.c module.

configure.ac

@@ -3419,6 +3419,21 @@ if test "${enable_x264}" != "no"; then
   fi
 fi
 
+dnl
+dnl vbi decoder plugin (using libzbvi)
+dnl
+AC_ARG_ENABLE(zvbi,
+  [  --enable-zvbi          VBI decoding support with libzvbi (default enabled)])
+if test "${enable_zvbi}" != "no"; then
+  PKG_CHECK_MODULES(ZVBI,
+        zvbi-0.2 >= 0.2.25,
+        [
+          VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
+          VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
+          VLC_ADD_PLUGINS([zvbi]) ],
+        [AC_MSG_WARN(ZVBI library not found)])
+fi
+
 dnl
 dnl  CMML plugin
 dnl

extras/contrib/src/Makefile

@@ -138,7 +138,7 @@ ifdef HAVE_DARWIN_OS
 	.dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \
 	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
 	.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca .goom2k4 .x264
+        .libdca .goom2k4 .x264 .zvbi
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
@@ -187,10 +187,10 @@ else
    all:  \
 	.a52 .mpeg2 .id3tag .mad \
 	.FLAC .speex .faad .faac .lame .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.live .goom2k4 .caca .mod .x264 .xml .twolame \
 	.mpcdec \
 	.dvdnav .dvbpsi .dirac \
-	.aclocal .libdca .libdc1394
+	.aclocal .zvbi .libdca .libdc1394
 #	.png .gpg-error .gcrypt .gnutls .mpcdec\
 #	.SDL_image  .daap .cddb .cdio .vcdimager 
    endif
@@ -1044,10 +1044,10 @@ DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 # libdvbpsi
 # ***************************************************************************
 
-libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz:
+libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz:
 	$(WGET) $(LIBDVBPSI_URL)
 
-libdvbpsi: libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .dvbpsi: libdvbpsi
@@ -1057,7 +1057,7 @@ libdvbpsi: libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
 
 CLEAN_FILE += .dvbpsi
 CLEAN_PKG += libdvbpsi
-DISTCLEAN_PKG += libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+DISTCLEAN_PKG += libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 
 # ***************************************************************************
 # live
@@ -1482,7 +1482,11 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 
 .zvbi: zvbi
-	(cd $<; ./configure --prefix=$(PREFIX) && make)
+ifdef HAVE_DARWIN_OS
+i	cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) CFLAGS="${CFLAGS} -fnested-functions"  && make && make install)
+ else
+	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) CFLAGS="${CFLAGS}"  && make && make install)
+ endif
 	touch $@
 
 CLEAN_FILE += .zvbi

extras/contrib/src/packages.mak

@@ -91,7 +91,7 @@ LIBDVDREAD_URL=$(VIDEOLAN)/contrib/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 LIBDVDNAV_VERSION=20050211
 LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 LIBDVBPSI_VERSION=0.1.5
-LIBDVBPSI_URL=$(VIDEOLAN)/contrib/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=latest
 LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz
 #GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
@@ -179,5 +179,7 @@ NASM_VERSION=0.98.40-20060130
 NASM_URL=$(VIDEOLAN)/testing/contrib/nasm-0.98.40-20060130.tar.bz2
 PTHREADS_VERSION=2-7-0
 PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
+ZVBI_VERSION=0.2.25
+ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
 UNICOWS_VERSION=1.1.1
 UNICOWS_URL=$(SF)/libunicows/libunicows-$(UNICOWS_VERSION)-src.tar.gz

modules/codec/Modules.am

@@ -29,3 +29,4 @@ SOURCES_cvdsub = cvdsub.c
 SOURCES_fake = fake.c
 SOURCES_realaudio = realaudio.c
 SOURCES_sdl_image = sdl_image.c
+SOURCES_zvbi = zvbi.c

modules/codec/zvbi.c

@@ -34,9 +34,10 @@
 #include <stdint.h>
 
 #include <libzvbi.h>
-#include "vlc_vout.h"
+#include <vlc/vout.h>
 #include "vlc_bits.h"
 #include "vlc_codec.h"
+#include "vlc_block.h"
 
 typedef enum {
     DATA_UNIT_EBU_TELETEXT_NON_SUBTITLE     = 0x02,
@@ -105,8 +106,6 @@ static int Open( vlc_object_t *p_this )
 {
     decoder_t     *p_dec = (decoder_t *) p_this;
     decoder_sys_t *p_sys = NULL;
-    vlc_value_t    val;
-    int            i;
 
     if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') )
     {
@@ -136,9 +135,9 @@ static int Open( vlc_object_t *p_this )
 		event_handler, p_dec );
     
     /* Create the var on vlc_global. */
-    p_sys->i_wanted_page = var_CreateGetInteger( p_dec->p_libvlc_global, 
+    p_sys->i_wanted_page = var_CreateGetInteger( p_dec->p_libvlc, 
 						 "vbi-page" );
-    var_AddCallback( p_dec->p_libvlc_global, "vbi-page", RequestPage, p_sys );
+    var_AddCallback( p_dec->p_libvlc, "vbi-page", RequestPage, p_sys );
     return VLC_SUCCESS;
 }
 

modules/demux/ts.c

@@ -2,7 +2,7 @@
  * ts.c: Transport Stream input module for VLC.
  *****************************************************************************
  * Copyright (C) 2004-2005 VideoLAN (Centrale Réseaux) and its contributors
- * $Id$
+ * $Id: e6e5a3f03a064eca04ca52cbad61d04342dc9cf2 $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
@@ -1674,6 +1674,8 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
         /* */
         i_skip += 2;
     }
+    else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
+        i_skip = 0; /* FIXME temporary hack for zvbi support */
 
     /* skip header */
     while( p_pes && i_skip > 0 )