Mailing List archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[vdr] Re: MPlayer v0.90 rc1 and rc2 not working wiht DVB



Steffen Barszus wrote:

>On Friday 27 December 2002 22:33, you wrote:
>  
>
>>Adis Salcin wrote:
>>    
>>
>>>Well here is what i have do,
>>>compile CVS driver for DVB rev 1.3 card, vdr 1.1.20 and it work okey..
>>>no problem, but thing is when i wont to compile mplayer to use dvb and
>>>with extra cddir...
>>>here what have do
>>>
>>>: download mplayer***.bz2 from HP website
>>>
>>>aplayed this patch to mplayer
>>>http://www.linuxtv.org:81/mailinglists/vdr/2002/12-2002/msg00707.html
>>>
>>>and try this command
>>>
>>>./configure --with-extraincdir=/usr/local/src/DVB/include
>>>and have try /usr/local/src/DVB/include/
>>>and          /usr/local/src/DVB/include/linux/dvb
>>>and          /usr/local/src/DVB/include/linux/dvb/
>>>
>>>but in configure window when look fot upstair log olways same
>>>Checking for DVB ... no (specify path to DVB/ost/include with
>>>--with-extraincdir=DIR)
>>>
>>>--------
>>>Checking for SVGAlib ... no
>>>Checking for FBDev ... yes
>>>Checking for DVB ... no (specify path to DVB/ost/include with
>>>--with-extraincdir=DIR) Checking for PNG support ... yes
>>>--------
>>>
>>>and have type olso: make and make install
>>>have run driver for dvb make insmod(can see n-tv so driver working)
>>>start moive:
>>>mplayer -vo mpegpes -ao mpegpes -vop
>>>lavc,expand=720:576:0:0:1,scale=720:576 -subpos 80 -sub
>>>/mnt/win_c/Gotovi/Download\ Centre/TrainingDay_serb.sub
>>>/mnt/win_c/Gotovi/Download\ Centre/ntk-divx-td1.avi
>>>
>>>moive is played as i can see that moive is going but nothing on my TV
>>>except N-tv,...
>>>
>>>pls help me to have this working.. thnx
>>>
>>>
>>>
>>>--------------------------------
>>>Adis Salčin,                    |
>>>IT Computers (Mostar) - Servis  |
>>>http://www.webmaster.co.ba      |
>>>--------------------------------
>>>      
>>>
>>For compatibility with the other part of patch you must change the includes
>>from
>>#include <dvb/dmx.h>
>>to
>>#include <linux/dvb/dmx.h>
>>
>>or use this one.
>>    
>>
><----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@linuxtv.org with "unsubscribe vdr" as subject.



Home | Main Index | Thread Index