[Mplayer-dvb] Fwd: [vdr] Re: MPlayer v0.90 rc1 and rc2 not working wiht DVB
Steffen Barszus
st_barszus at gmx.de
Sat Dec 28 11:29:38 CET 2002
Hopefully arpi will read this. Can this please be included in mplayer ?
Thanks
Steffen
---------- Forwarded Message ----------
Subject: [vdr] Re: MPlayer v0.90 rc1 and rc2 not working wiht DVB
Date: Sat, 28 Dec 2002 05:37:56 +0100
From: Dimitrios Dimitrakos <mail at dimitrios.de>
To: vdr at linuxtv.org
Steffen Barszus wrote:
>
><----snip---->
>
>Again my question:
>Is anyone able to make a patch that can go in cvs of mplayer ? Main point
> is, that a switch --enable-oldstruct or something like that should be in it
Hi,
here ist somethink maybe usefull for you.
if "/dev/ost/video" exist the build is for oldstruct
if "/dev/dvb/adapter0/video0" exist the build is for HEAD
if nothing from above exists then configure analyze what is the
destination from "--with-extraincdir"
You can manualy choose the build with "--enable-dvbhead" or
"--disable-dvbhead"
Tested with VDR1.1.20 + dvb-20021223 and vdr-1.0.4 +
siemens_dvb-0.9.4-2002-05-20
Now we need only someone for checkin into cvs.
--- MPlayer-0.90rc2/configure 2002-12-23 01:33:05.000000000 +0100
+++ MPlayer-0.90rc2.dimi/configure 2002-12-28 03:17:44.000000000 +0100
@@ -969,6 +969,7 @@
_fbdev=auto
_fbdev_nocopy=no
_dvb=auto
+_dvbhead=auto
_dxr2=auto
_dxr3=auto
_iconv=auto
@@ -1095,7 +1096,9 @@
--enable-fbdev=nocopy) _fbdev=yes; _fbdev_nocopy=yes ;;
--disable-fbdev) _fbdev=no ;;
--enable-dvb) _dvb=yes ;;
+ --enable-dvbhead) _dvbhead=yes ;;
--disable-dvb) _dvb=no ;;
+ --disable-dvbhead) _dvbhead=no ;;
--enable-dxr2) _dxr2=yes ;;
--disable-dxr2) _dxr2=no ;;
--enable-dxr3) _dxr3=yes ;;
@@ -2700,8 +2703,6 @@
fi
echores "$_fbdev"
-
-
echocheck "DVB"
if test "$_dvb" != no ; then
_dvb=no
@@ -2712,7 +2713,7 @@
#include <stdio.h>
#include <time.h>
#include <unistd.h>
-
+
#include <ost/dmx.h>
#include <ost/frontend.h>
#include <ost/sec.h>
@@ -2741,13 +2742,54 @@
_def_dvb='#define HAVE_DVB 1'
_aomodules="mpegpes(dvb) $_aomodules"
_vomodules="mpegpes(dvb) $_vomodules"
-else
+fi
+if test "$_dvbhead" != no ; then
+ echocheck "DVB HEAD"
+ if test "$_dvbhead" != no ; then
+ _dvbhead=no
+ test -c /dev/dvb/adapter0/video0 && _dvbhead=yes
+
+cat >$TMPC << EOF
+#include <sys/poll.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
+#include <linux/dvb/video.h>
+#include <linux/dvb/audio.h>
+int main(void) {return 0;}
+EOF
+ if cc_check ; then
+ _dvbhead=yes
+ echores "yes"
+ else
+ for I in "-I/usr/src/DVB/include" "$_inc_extra/include/linux" ; do
+ if cc_check "$I" ; then
+ _dvbhead=yes
+ _inc_dvb="$I"
+ echores "yes (using $_inc_dvb)"
+ break
+ fi
+ done
+ test "$_dvbhead" = no && echores "no (specify path to
DVB/include (HEAD Version) with --with-extraincdir=DIR)"
+ fi
+ else
+ echores "no"
+ fi
+ if test "$_dvbhead" = yes ; then
+ _def_dvb='#define HAVE_DVB_HEAD 1'
+ _aomodules="mpegpes(dvb) $_aomodules"
+ _vomodules="mpegpes(dvb) $_vomodules"
+ fi
+fi
+if test "$_dvbhead" = no && test "$_dvb" = no ; then
_def_dvb='#undef HAVE_DVB'
_aomodules="mpegpes(file) $_aomodules"
_vomodules="mpegpes(file) $_vomodules"
fi
-
-
echocheck "PNG support"
if test "$_png" = auto ; then
_png=no
--- MPlayer-0.90rc2/libao2/ao_mpegpes.c 2002-10-06 03:08:04.000000000 +0200
+++ MPlayer-0.90rc2.dimi/libao2/ao_mpegpes.c 2002-12-28
02:21:10.000000000 +0100
@@ -1,6 +1,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef DVB_HEAD
+#define HAVE_DVB 1
+#endif
+
#ifdef HAVE_DVB
#include <sys/ioctl.h>
#endif
@@ -15,8 +19,13 @@
#include "../mp_msg.h"
#ifdef HAVE_DVB
+#ifndef HAVE_DVB_HEAD
#include <ost/audio.h>
audioMixer_t dvb_mixer={255,255};
+#else
+#include </linux/dvb/audio.h>
+audio_mixer_t dvb_mixer={255,255};
+#endif
#endif
extern int vo_mpegpes_fd;
extern int vo_mpegpes_fd2;
--- MPlayer-0.90rc2/libvo/vo_mpegpes.c 2002-11-11 16:20:26.000000000 +0100
+++ MPlayer-0.90rc2.dimi/libvo/vo_mpegpes.c 2002-12-28
03:12:27.000000000 +0100
@@ -26,9 +26,11 @@
#include <unistd.h>
#include "mp_msg.h"
-
+#ifdef HAVE_DVB_HEAD
+#define HAVE_DVB 1
+#endif
#ifdef HAVE_DVB
-
+#ifndef HAVE_DVB_HEAD
#include <sys/poll.h>
#include <sys/ioctl.h>
@@ -41,6 +43,20 @@
#include <ost/video.h>
#include <ost/audio.h>
+#else
+#define true 1
+#define false 0
+#include <sys/poll.h>
+
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <time.h>
+
+#include <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
+#include <linux/dvb/video.h>
+#include <linux/dvb/audio.h>
+#endif
#endif
#include "config.h"
@@ -86,6 +102,7 @@
#ifdef HAVE_DVB
if(!arg){
//|O_NONBLOCK
+#ifndef HAVE_DVB_HEAD
if((vo_mpegpes_fd = open("/dev/ost/video",O_RDWR)) < 0){
perror("DVB VIDEO DEVICE: ");
return -1;
@@ -94,6 +111,17 @@
perror("DVB AUDIO DEVICE: ");
return -1;
}
+#else
+ if((vo_mpegpes_fd = open("/dev/dvb/adapter0/video0",O_RDWR)) < 0){
+ perror("DVB VIDEO DEVICE: ");
+ return -1;
+ }
+ if((vo_mpegpes_fd2 =
open("/dev/dvb/adapter0/audio0",O_RDWR|O_NONBLOCK)) < 0){
+ perror("DVB AUDIO DEVICE: ");
+ return -1;
+ }
+
+#endif
if ( (ioctl(vo_mpegpes_fd,VIDEO_SET_BLANK, false) < 0)){
perror("DVB VIDEO SET BLANK: ");
return -1;
Greeting
Dimitri
-- Binary/unsupported file stripped by Listar --
-- Type: application/x-pkcs7-signature
-- File: smime.p7s
-- Desc: S/MIME Cryptographic Signature
--
Info:
To unsubscribe send a mail to listar at linuxtv.org with "unsubscribe vdr" as
subject.
-------------------------------------------------------
--
____________________
counter.li.org : #296567.
machine: 181800
vdr-box : 87
____________________
Please dont CC me, since if I have replied I'll watch the tread. Both mails
will be filtered to the ML-folder. Thanks
More information about the MPlayer-dvb
mailing list