dvbtools-cvs Mailing List for DVB tools (Page 5)

Brought to you by: linuxstb, nicosb

dvbtools-cvs — Mailing list for CVS commit messages

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May (10)	Jun (35)	Jul (11)	Aug (9)	Sep	Oct (9)	Nov (1)	Dec
2003	Jan (3)	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (1)	Oct (9)	Nov (3)	Dec
2004	Jan (2)	Feb	Mar (28)	Apr (5)	May	Jun (1)	Jul (5)	Aug (2)	Sep	Oct (2)	Nov	Dec (5)
2005	Jan (2)	Feb (8)	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct (1)	Nov	Dec
2007	Jan	Feb	Mar (26)	Apr	May (2)	Jun	Jul	Aug	Sep (5)	Oct	Nov	Dec
2008	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2009	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 3 4 5 6 7 8 > >> (Page 5 of 8)

[dvbtools-cvs] dvbtune tune.c,1.18,1.19

From: <lin...@us...> - 2003-11-14 11:50:20

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv32169

Modified Files:
	tune.c 
Log Message:
Bug fix from John Knottenbelt

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tune.c	9 Oct 2003 18:24:42 -0000	1.18
--- tune.c	14 Nov 2003 11:50:17 -0000	1.19
***************
*** 235,242 ****
          fprintf(stderr,"Getting frontend event\n");
          if ((status = ioctl(fd_frontend, FE_GET_EVENT, &event)) < 0){
! 	  if (status != -EOVERFLOW) {
  	    perror("FE_GET_EVENT");
  	    return -1;
  	  }
          }
        }
--- 235,245 ----
          fprintf(stderr,"Getting frontend event\n");
          if ((status = ioctl(fd_frontend, FE_GET_EVENT, &event)) < 0){
! 	  if (errno != EOVERFLOW) {
  	    perror("FE_GET_EVENT");
+ 	    fprintf(stderr,"status = %d\n", status);
+ 	    fprintf(stderr,"errno = %d\n", errno);
  	    return -1;
  	  }
+ 	  else fprintf(stderr,"Overflow error, trying again (status = %d, errno = %d)", status, errno);
          }
        }

[dvbtools-cvs] dvbstream tune.c,1.11,1.12

From: <lin...@us...> - 2003-11-14 11:49:59

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv32070

Modified Files:
	tune.c 
Log Message:
Bug fix from John Knottenbelt

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tune.c	9 Oct 2003 19:25:46 -0000	1.11
--- tune.c	14 Nov 2003 11:49:55 -0000	1.12
***************
*** 213,217 ****
  
  int check_status(int fd_frontend,struct dvb_frontend_parameters* feparams,int tone) {
-   int i,res;
    int32_t strength;
    fe_status_t festatus;
--- 213,216 ----
***************
*** 235,243 ****
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if (status = ioctl(fd_frontend, FE_GET_EVENT, &event) < 0){
! 	  if (status != -EOVERFLOW) {
  	    perror("FE_GET_EVENT");
  	    return -1;
  	  }
          }
        }
--- 234,245 ----
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ((status = ioctl(fd_frontend, FE_GET_EVENT, &event)) < 0){
! 	  if (errno != EOVERFLOW) {
  	    perror("FE_GET_EVENT");
+ 	    fprintf(stderr,"status = %d\n", status);
+ 	    fprintf(stderr,"errno = %d\n", errno);
  	    return -1;
  	  }
+ 	  else fprintf(stderr,"Overflow error, trying again (status = %d, errno = %d)", status, errno);
          }
        }

[dvbtools-cvs] dvbstream dvbstream.c,1.9,1.10

From: <lin...@us...> - 2003-10-10 07:10:55

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv10730

Modified Files:
	dvbstream.c 
Log Message:
Symbol rate is required for DVB-C - thanks to Nico

Index: dvbstream.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/dvbstream.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dvbstream.c	30 Sep 2003 13:30:35 -0000	1.9
--- dvbstream.c	10 Oct 2003 07:10:51 -0000	1.10
***************
*** 625,629 ****
    if ( (freq>100000000)) {
      if (open_fe(&fd_frontend,0)) {
!       i=tune_it(fd_frontend,0,freq,0,0,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
        close(fd_frontend);
      }
--- 625,629 ----
    if ( (freq>100000000)) {
      if (open_fe(&fd_frontend,0)) {
!       i=tune_it(fd_frontend,0,freq,srate,0,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
        close(fd_frontend);
      }

[dvbtools-cvs] dvbstream ts_filter.c,1.3,1.4

From: <lin...@us...> - 2003-10-09 19:28:59

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv1247

Modified Files:
	ts_filter.c 
Log Message:
Add some error detection

Index: ts_filter.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/ts_filter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ts_filter.c	27 Jun 2002 19:30:29 -0000	1.3
--- ts_filter.c	9 Oct 2003 19:28:55 -0000	1.4
***************
*** 1,4 ****
  /* A simple filter (stdin -> stdout) to extract a single stream from a
!    multiplexed TS.  Specify the PID on the command-line */
  
  #include <stdio.h>
--- 1,7 ----
  /* A simple filter (stdin -> stdout) to extract a single stream from a
!    multiplexed TS.  Specify the PID on the command-line 
! 
!    Updated 29th January 2003 - Added some error checking and reporting.
! */
  
  #include <stdio.h>
***************
*** 9,13 ****
--- 12,20 ----
  {
    int pid,n;
+   unsigned int i=0;
+   unsigned int j=0;
    unsigned char buf[188];
+   unsigned char my_cc;
+   int errors=0;
  
    pid=atoi(argv[1]);
***************
*** 15,26 ****
    fprintf(stderr,"filtering PID %d\n",pid);
  
!   for (;;) {
!     n=fread(buf,1,188,stdin);
!     if (n==188) {
!       if (pid==(((buf[1] & 0x1f) << 8) | buf[2])) {
!         fwrite(buf,1,188,stdout);
        }
      }
    }
    return(0);
  }
--- 22,57 ----
    fprintf(stderr,"filtering PID %d\n",pid);
  
!   n=fread(buf,1,188,stdin);
!   my_cc=buf[3]&0x0f;
!   i++;
!   while (n==188) {
!     if (buf[0]!=0x47) {
!       // TO DO: Re-sync.
!       fprintf(stderr,"FATAL ERROR IN STREAM AT PACKET %d\n",i);
!       exit;
!     }
!     if (pid==(((buf[1] & 0x1f) << 8) | buf[2])) {
!       if (my_cc!=(buf[3]&0x0f)) {
!         fprintf(stderr,"Output packet %d: packet incontinuity - expected %02x, found %02x\n",j,my_cc,buf[3]&0x0f);
!         my_cc=buf[3]&0x0f;
!         errors++;
!       }
!       n=fwrite(buf,1,188,stdout);
!       if (n==188) {
!         j++;
!       } else {
!         fprintf(stderr,"FATAL ERROR - CAN NOT WRITE PACKET %d\n",i);
!         exit;
!       }
!       if (my_cc==0x0f) {
!         my_cc=0;
!       } else {
!         my_cc++;
        }
      }
+     n=fread(buf,1,188,stdin);
    }
+   fprintf(stderr,"Read %d packets, wrote %d.\n",i,j);
+   fprintf(stderr,"%d incontinuity errors.\n",errors);
    return(0);
  }

[dvbtools-cvs] dvbstream tune.c,1.10,1.11

From: <lin...@us...> - 2003-10-09 19:25:50

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv844

Modified Files:
	tune.c 
Log Message:
Synchronise with dvbtune

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tune.c	16 Jan 2003 07:51:41 -0000	1.10
--- tune.c	9 Oct 2003 19:25:46 -0000	1.11
***************
*** 169,172 ****
--- 169,215 ----
  
  #ifdef NEWSTRUCT
+ struct diseqc_cmd {
+    struct dvb_diseqc_master_cmd cmd;
+    uint32_t wait;
+ };
+ 
+ void diseqc_send_msg(int fd, fe_sec_voltage_t v, struct diseqc_cmd *cmd,
+ 		     fe_sec_tone_mode_t t, fe_sec_mini_cmd_t b)
+ {
+    ioctl(fd, FE_SET_TONE, SEC_TONE_OFF);
+    ioctl(fd, FE_SET_VOLTAGE, v);
+    usleep(15 * 1000);
+    ioctl(fd, FE_DISEQC_SEND_MASTER_CMD, &cmd->cmd);
+    usleep(cmd->wait * 1000);
+    usleep(15 * 1000);
+    ioctl(fd, FE_DISEQC_SEND_BURST, b);
+    usleep(15 * 1000);
+    ioctl(fd, FE_SET_TONE, t);
+ }
+ 
+ 
+ 
+ 
+ /* digital satellite equipment control,
+  * specification is available from http://www.eutelsat.com/ 
+  */
+ static int do_diseqc(int secfd, int sat_no, int pol, int hi_lo)
+ {
+    struct diseqc_cmd cmd =
+        { {{0xe0, 0x10, 0x38, 0xf0, 0x00, 0x00}, 4}, 0 };
+ 
+    /* param: high nibble: reset bits, low nibble set bits,
+     * bits are: option, position, polarizaion, band
+     */
+    cmd.cmd.msg[3] =
+        0xf0 | (((sat_no * 4) & 0x0f) | (hi_lo ? 1 : 0) | (pol ? 0 : 2));
+ 
+    diseqc_send_msg(secfd, pol,
+ 		   &cmd, hi_lo,
+ 		   (sat_no / 4) % 2 ? SEC_MINI_B : SEC_MINI_A);
+ 
+    return 1;
+ }
+ 
  int check_status(int fd_frontend,struct dvb_frontend_parameters* feparams,int tone) {
    int i,res;
***************
*** 431,435 ****
        }
  #ifdef NEWSTRUCT
!       if (ioctl(fd_frontend,FE_SET_VOLTAGE,voltage) < 0) {
  #else
        if (ioctl(fd_sec,SEC_SET_VOLTAGE,voltage) < 0) {
--- 474,478 ----
        }
  #ifdef NEWSTRUCT
! if (diseqc==0) if (ioctl(fd_frontend,FE_SET_VOLTAGE,voltage) < 0) {
  #else
        if (ioctl(fd_sec,SEC_SET_VOLTAGE,voltage) < 0) {
***************
*** 475,480 ****
  
  #ifdef NEWSTRUCT
        if (ioctl(fd_frontend,FE_SET_TONE,tone) < 0) {
!          perror("ERROR setting tone\n");
        }
  #else
--- 518,525 ----
  
  #ifdef NEWSTRUCT
+       if (diseqc==0) {
        if (ioctl(fd_frontend,FE_SET_TONE,tone) < 0) {
!                perror("ERROR setting tone\n");
!       }
        }
  #else
***************
*** 485,489 ****
  
  #ifdef NEWSTRUCT
!   #warning DISEQC is unimplemented for NEWSTRUCT
  #else
        if (diseqc > 0) {
--- 530,537 ----
  
  #ifdef NEWSTRUCT
! 	      if (diseqc > 0) {
! 		do_diseqc(fd_frontend, diseqc-1,voltage,tone);
! 		sleep(1);
!               }
  #else
        if (diseqc > 0) {

[dvbtools-cvs] dvbstream rtptv.sh,1.1.1.1,1.2

From: <lin...@us...> - 2003-10-09 18:30:47

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv15772

Modified Files:
	rtptv.sh 
Log Message:
Minor changes

Index: rtptv.sh
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/rtptv.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rtptv.sh	15 May 2002 16:39:56 -0000	1.1.1.1
--- rtptv.sh	9 Oct 2003 18:30:41 -0000	1.2
***************
*** 1,7 ****
  #!/bin/sh
! DUMPRTP=/home/dave/DVB/dvbstream-0.2/dumprtp
! TS2PS=/home/dave/DVB/DVB/apps/mpegtools/ts2ps
  BFR=bfr
! MPLAYER='mplayer -ao sdl -framedrop -'
  
! $DUMPRTP | $TS2PS 1 2 | $BFR -m 1024kB  | $MPLAYER
--- 1,7 ----
  #!/bin/sh
! DUMPRTP=/home/dave/DVB/cvs/dvbstream/dumprtp
! TS2PS=/home/dave/src/mpegtools/ts2ps
  BFR=bfr
! MPLAYER='mplayer -ao sdl -vo sdl -'
  
! $DUMPRTP | $TS2PS 0 0 | $BFR -m 1024kB  | $MPLAYER

[dvbtools-cvs] dvbstream dumprtp.c,1.2,1.3

From: <lin...@us...> - 2003-10-09 18:27:38

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv12598

Modified Files:
	dumprtp.c 
Log Message:
Add error detection

Index: dumprtp.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/dumprtp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dumprtp.c	27 Jun 2002 19:11:31 -0000	1.2
--- dumprtp.c	9 Oct 2003 18:27:33 -0000	1.3
***************
*** 35,41 ****
--- 35,49 ----
    struct rtpheader rh;
    int lengthData;
+   unsigned short seq=0;
+   int flag=0;
  
    while(1) {
      getrtp2(socket,&rh, &buf,&lengthData);
+     if (flag==0) { seq=rh.b.sequence; flag=1; }
+     if (seq!=rh.b.sequence) {
+       fprintf(stderr,"rtptsaudio: NETWORK CONGESTION - expected %d, received %d\n",seq,rh.b.sequence);
+       seq=rh.b.sequence;
+     }
+     seq++;
      write(1,buf,lengthData);
    }

[dvbtools-cvs] dvbtune tune.c,1.17,1.18

From: <lin...@us...> - 2003-10-09 18:24:46

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv12084

Modified Files:
	tune.c 
Log Message:
Minor compiler warning clean-ups

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tune.c	9 Oct 2003 18:22:19 -0000	1.17
--- tune.c	9 Oct 2003 18:24:42 -0000	1.18
***************
*** 213,217 ****
  
  int check_status(int fd_frontend,struct dvb_frontend_parameters* feparams,int tone) {
-   int i,res;
    int32_t strength;
    fe_status_t festatus;
--- 213,216 ----
***************
*** 235,239 ****
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if (status = ioctl(fd_frontend, FE_GET_EVENT, &event) < 0){
  	  if (status != -EOVERFLOW) {
  	    perror("FE_GET_EVENT");
--- 234,238 ----
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ((status = ioctl(fd_frontend, FE_GET_EVENT, &event)) < 0){
  	  if (status != -EOVERFLOW) {
  	    perror("FE_GET_EVENT");

[dvbtools-cvs] dvbtune tune.c,1.16,1.17

From: <lin...@us...> - 2003-10-09 18:22:23

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv11637

Modified Files:
	tune.c 
Log Message:
An different diseqc implementation for NEWSTRUCT

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tune.c	14 Aug 2003 04:15:44 -0000	1.16
--- tune.c	9 Oct 2003 18:22:19 -0000	1.17
***************
*** 169,172 ****
--- 169,215 ----
  
  #ifdef NEWSTRUCT
+ struct diseqc_cmd {
+    struct dvb_diseqc_master_cmd cmd;
+    uint32_t wait;
+ };
+ 
+ void diseqc_send_msg(int fd, fe_sec_voltage_t v, struct diseqc_cmd *cmd,
+ 		     fe_sec_tone_mode_t t, fe_sec_mini_cmd_t b)
+ {
+    ioctl(fd, FE_SET_TONE, SEC_TONE_OFF);
+    ioctl(fd, FE_SET_VOLTAGE, v);
+    usleep(15 * 1000);
+    ioctl(fd, FE_DISEQC_SEND_MASTER_CMD, &cmd->cmd);
+    usleep(cmd->wait * 1000);
+    usleep(15 * 1000);
+    ioctl(fd, FE_DISEQC_SEND_BURST, b);
+    usleep(15 * 1000);
+    ioctl(fd, FE_SET_TONE, t);
+ }
+ 
+ 
+ 
+ 
+ /* digital satellite equipment control,
+  * specification is available from http://www.eutelsat.com/ 
+  */
+ static int do_diseqc(int secfd, int sat_no, int pol, int hi_lo)
+ {
+    struct diseqc_cmd cmd =
+        { {{0xe0, 0x10, 0x38, 0xf0, 0x00, 0x00}, 4}, 0 };
+ 
+    /* param: high nibble: reset bits, low nibble set bits,
+     * bits are: option, position, polarizaion, band
+     */
+    cmd.cmd.msg[3] =
+        0xf0 | (((sat_no * 4) & 0x0f) | (hi_lo ? 1 : 0) | (pol ? 0 : 2));
+ 
+    diseqc_send_msg(secfd, pol,
+ 		   &cmd, hi_lo,
+ 		   (sat_no / 4) % 2 ? SEC_MINI_B : SEC_MINI_A);
+ 
+    return 1;
+ }
+ 
  int check_status(int fd_frontend,struct dvb_frontend_parameters* feparams,int tone) {
    int i,res;
***************
*** 431,435 ****
        }
  #ifdef NEWSTRUCT
!       if (ioctl(fd_frontend,FE_SET_VOLTAGE,voltage) < 0) {
  #else
        if (ioctl(fd_sec,SEC_SET_VOLTAGE,voltage) < 0) {
--- 474,478 ----
        }
  #ifdef NEWSTRUCT
! if (diseqc==0) if (ioctl(fd_frontend,FE_SET_VOLTAGE,voltage) < 0) {
  #else
        if (ioctl(fd_sec,SEC_SET_VOLTAGE,voltage) < 0) {
***************
*** 475,480 ****
  
  #ifdef NEWSTRUCT
        if (ioctl(fd_frontend,FE_SET_TONE,tone) < 0) {
!          perror("ERROR setting tone\n");
        }
  #else
--- 518,525 ----
  
  #ifdef NEWSTRUCT
+       if (diseqc==0) {
        if (ioctl(fd_frontend,FE_SET_TONE,tone) < 0) {
!                perror("ERROR setting tone\n");
!       }
        }
  #else
***************
*** 486,508 ****
  #ifdef NEWSTRUCT
  	      if (diseqc > 0) {
!             struct dvb_diseqc_master_cmd cmd = { {0xE0, 0x10, 0x38, 0xF0, 0x00, 0x00}, 4};
!             cmd.msg[3] = 0xF0 | ((((diseqc - 1) * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (voltage == SEC_VOLTAGE_18 ? 2 : 0));
! 
!                if (ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF) < 0) {
! 	         perror ("FE_SET_TONE\n");
! 	       }
!                if (ioctl(fd_frontend, FE_SET_VOLTAGE, voltage) < 0) {
! 	       perror ("FE_SET_VOLTAGE\n");
! 	       }
!                usleep(15 * 1000);
!                if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) < 0) {
! 	       perror ("unable to send diseqc cmd\n");
! 	       }
!                usleep(15 * 1000);
!                if (ioctl(fd_frontend, FE_DISEQC_SEND_BURST, (diseqc / 4) % 2 ? SEC_MINI_B : SEC_MINI_A) < 0) {
! 		 perror ("unable to send tone\n");
! 		 }
!                usleep(15 * 1000);
! 	      }
  #else
        if (diseqc > 0) {
--- 531,537 ----
  #ifdef NEWSTRUCT
  	      if (diseqc > 0) {
! 		do_diseqc(fd_frontend, diseqc-1,voltage,tone);
! 		sleep(1);
!               }
  #else
        if (diseqc > 0) {

[dvbtools-cvs] dvbtune dvbtune.c,1.18,1.19

From: <lin...@us...> - 2003-10-09 18:20:56

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv11252

Modified Files:
	dvbtune.c 
Log Message:
Process more SI descriptors

Index: dvbtune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/dvbtune.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dvbtune.c	28 Jan 2003 19:55:46 -0000	1.18
--- dvbtune.c	9 Oct 2003 18:20:52 -0000	1.19
***************
*** 72,75 ****
--- 72,76 ----
  #define IRDETO_CA_SYSTEM	0x602
  #define BETA_CA_SYSTEM		0x1702
+ #define NAGRA_CA_SYSTEM		0x1800
  
  int fd_demuxv,fd_demuxa,fd_demuxtt,fd_demuxsi,fd_demuxrec,fd_demuxd;
***************
*** 467,481 ****
               switch(k) {
                 case SECA_CA_SYSTEM:
!                  for (j=2;j<descriptor_length;j+=15) {
!                    pid=(buf[i+j]&0x1f<<8)|buf[i+j+1];
!                    id=(buf[i+j+2]<<8) | buf[i+j+3];
!                    printf("ecm_pid=\"0x%04x\" ecm_id=\"0x%04x\"/>\n",pid,id);
!                  }
!                  break;
                 case VIACCESS_1_CA_SYSTEM:
                   for (j=2;j<descriptor_length;j+=15) {
!                    pid=(buf[i+j]&0x1f<<8)|buf[i+j+1];
                     id=(buf[i+j+2]<<8) | buf[i+j+3];
!                    printf("ecm_pid=\"0x%04x\" ecm_id=\"0x%04x\"/>\n",pid,id);
                   }
                   break;
--- 468,478 ----
               switch(k) {
                 case SECA_CA_SYSTEM:
!                case NAGRA_CA_SYSTEM:
                 case VIACCESS_1_CA_SYSTEM:
                   for (j=2;j<descriptor_length;j+=15) {
!                    pid=((buf[i+j]&0x1f)<<8)|buf[i+j+1];
                     id=(buf[i+j+2]<<8) | buf[i+j+3];
!                    printf("ecm_pid=\"%d\" ecm_id=\"%d\" ",pid,id);
!                    printf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x />\n",buf[i],buf[i+1],buf[i+2],buf[i+3],buf[i+4],buf[i+5],buf[i+6],buf[i+7],buf[i+8],buf[i+9],buf[i+10],buf[i+11],buf[i+12],buf[i+13],buf[i+14]);
                   }
                   break;

[dvbtools-cvs] dvbtune xml2vdr.c,1.3,1.4

From: <lin...@us...> - 2003-10-09 18:09:14

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv8396

Modified Files:
	xml2vdr.c 
Log Message:
Add new style diseqc paramater - currently hard-coded to S28.2E

Index: xml2vdr.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/xml2vdr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xml2vdr.c	7 Jul 2002 10:29:26 -0000	1.3
--- xml2vdr.c	9 Oct 2003 18:09:08 -0000	1.4
***************
*** 43,47 ****
  int freq;
  char pol;
! int diseqc=0;
  int srate;
  int vpid;
--- 43,47 ----
  int freq;
  char pol;
! char diseqc[]="S28.2E";
  int srate;
  int vpid;
***************
*** 219,223 ****
    } else if (strcmp(name,"canal_radio")==0) {
  //     if (ca==0) printf("%s:RADIO:%s:%d:%c:%d:%d:%d:%d:%d:%d:%d\n",provider_name,service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
!     if ((ca==0) || (fta==0)) printf("%s (RADIO):%d:%c:%d:%d:%d:%d:%d:%d:%d\n",service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
       n_apids=0;
       n_ca=0;
--- 219,223 ----
    } else if (strcmp(name,"canal_radio")==0) {
  //     if (ca==0) printf("%s:RADIO:%s:%d:%c:%d:%d:%d:%d:%d:%d:%d\n",provider_name,service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
!     if ((ca==0) || (fta==0)) printf("%s (RADIO):%d:%c:%s:%d:%d:%d:%d:%d:%d\n",service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
       n_apids=0;
       n_ca=0;
***************
*** 228,233 ****
         /* Only print service if at least 1 PID is non-zero */
         if (((ca==0) || (fta==0)) && (((vpid!=0) || (n_apids>0) || (tpid!=0)))) {
! //         printf("%s:%s:%s:%d:%c:%d:%d:%d:",provider_name,((vpid==0) ? "RADIO" : "TV"),service_name,freq,pol,diseqc,srate,vpid);
!          printf("%s (%s):%d:%c:%d:%d:%d:",service_name,((vpid==0) ? "RADIO" : "TV"),freq,pol,diseqc,srate,vpid);
           x=0;
           for (i=0;i<n_apids;i++) {
--- 228,233 ----
         /* Only print service if at least 1 PID is non-zero */
         if (((ca==0) || (fta==0)) && (((vpid!=0) || (n_apids>0) || (tpid!=0)))) {
! //         printf("%s:%s:%s:%d:%c:%s:%d:%d:",provider_name,((vpid==0) ? "RADIO" : "TV"),service_name,freq,pol,diseqc,srate,vpid);
!          printf("%s (%s):%d:%c:%s:%d:%d:",service_name,((vpid==0) ? "RADIO" : "TV"),freq,pol,diseqc,srate,vpid);
           x=0;
           for (i=0;i<n_apids;i++) {
***************
*** 276,280 ****
      freq=0;
      pol=0;
-     diseqc=0;
      srate=0;
    }
--- 276,279 ----

[dvbtools-cvs] dvbstream dvbstream.c,1.8,1.9

From: <lin...@us...> - 2003-09-30 13:30:39

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv24147

Modified Files:
	dvbstream.c 
Log Message:
DISEQC change

Index: dvbstream.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/dvbstream.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dvbstream.c	13 Oct 2002 18:44:09 -0000	1.8
--- dvbstream.c	30 Sep 2003 13:30:35 -0000	1.9
***************
*** 498,505 ****
            }
          }
!       } else if (strcmp(argv[i],"-s")==0) {
          i++;
          srate=atoi(argv[i])*1000UL;
!       } else if (strcmp(argv[i],"-o")==0) {
          to_stdout = 1;
        } else if (strcmp(argv[i],"-n")==0) {
--- 498,514 ----
            }
          }
!       } 
!       else if (strcmp(argv[i],"-s")==0) {
          i++;
          srate=atoi(argv[i])*1000UL;
!       } 
!       else if (strcmp(argv[i],"-D")==0) 
!       {
!         i++;
!         diseqc=atoi(argv[i]);
! 	if(diseqc < 0 || diseqc > 4)
! 		diseqc = 0;	
!       } 
!       else if (strcmp(argv[i],"-o")==0) {
          to_stdout = 1;
        } else if (strcmp(argv[i],"-n")==0) {

[dvbtools-cvs] dvbtune tune.c,1.15,1.16

From: <jt...@us...> - 2003-08-14 05:09:51

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv14110

Modified Files:
	tune.c 
Log Message:
add diseqc capabilities for NEWSTRUCT


Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tune.c	16 Jan 2003 07:49:44 -0000	1.15
--- tune.c	14 Aug 2003 04:15:44 -0000	1.16
***************
*** 485,489 ****
  
  #ifdef NEWSTRUCT
!   #warning DISEQC is unimplemented for NEWSTRUCT
  #else
        if (diseqc > 0) {
--- 485,508 ----
  
  #ifdef NEWSTRUCT
! 	      if (diseqc > 0) {
!             struct dvb_diseqc_master_cmd cmd = { {0xE0, 0x10, 0x38, 0xF0, 0x00, 0x00}, 4};
!             cmd.msg[3] = 0xF0 | ((((diseqc - 1) * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (voltage == SEC_VOLTAGE_18 ? 2 : 0));
! 
!                if (ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF) < 0) {
! 	         perror ("FE_SET_TONE\n");
! 	       }
!                if (ioctl(fd_frontend, FE_SET_VOLTAGE, voltage) < 0) {
! 	       perror ("FE_SET_VOLTAGE\n");
! 	       }
!                usleep(15 * 1000);
!                if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) < 0) {
! 	       perror ("unable to send diseqc cmd\n");
! 	       }
!                usleep(15 * 1000);
!                if (ioctl(fd_frontend, FE_DISEQC_SEND_BURST, (diseqc / 4) % 2 ? SEC_MINI_B : SEC_MINI_A) < 0) {
! 		 perror ("unable to send tone\n");
! 		 }
!                usleep(15 * 1000);
! 	      }
  #else
        if (diseqc > 0) {

[dvbtools-cvs] dvbtext Makefile,1.1.1.1,1.2 dvbtext.c,1.1.1.1,1.2

From: <lin...@us...> - 2003-07-18 07:05:14

Update of /cvsroot/dvbtools/dvbtext
In directory sc8-pr-cvs1:/tmp/cvs-serv18898

Modified Files:
	Makefile dvbtext.c 
Log Message:
Updated to use NEWSTRUCT versions (i.e. post October 2002) DVB driver

Index: Makefile
===================================================================
RCS file: /cvsroot/dvbtools/dvbtext/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	17 May 2002 07:14:00 -0000	1.1.1.1
--- Makefile	18 Jul 2003 07:05:09 -0000	1.2
***************
*** 1,8 ****
! INCS=-I ../DVB/ost/include
  
  all: dvbtext
  
  dvbtext: dvbtext.c tables.h
! 	gcc -Wall $(INCS) -o dvbtext dvbtext.c
  
  clean:
--- 1,23 ----
! INCS=
! CFLAGS= -Wall
! CC=gcc
  
  all: dvbtext
  
+ # Delete the following line if you are not using a
+ # "NEWSTRUCT" driver.  If you are using a "NEWSTRUCT"
+ # driver, it must be later than October 10th 2002
+ 
+ NEWSTRUCT=1
+ 
+ ifdef NEWSTRUCT
+   CFLAGS += -DNEWSTRUCT
+   INCS += -I ../DVB/include
+ else
+   INCS += -I ../DVB/ost/include
+ endif
+ 
  dvbtext: dvbtext.c tables.h
! 	$(CC) $(CFLAGS) $(INCS) -o dvbtext dvbtext.c
  
  clean:

Index: dvbtext.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtext/dvbtext.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dvbtext.c	17 May 2002 07:14:00 -0000	1.1.1.1
--- dvbtext.c	18 Jul 2003 07:05:09 -0000	1.2
***************
*** 35,39 ****
--- 35,43 ----
  #include <fcntl.h>
  #include <unistd.h>
+ #ifdef NEWSTRUCT
+ #include <linux/dvb/dmx.h>
+ #else
  #include <ost/dmx.h>
+ #endif
  #include "tables.h"
  
***************
*** 129,132 ****
--- 133,153 ----
  }
  
+ #ifdef NEWSTRUCT
+ void set_tt_filt(int fd,uint16_t tt_pid)
+ {
+ 	struct dmx_pes_filter_params pesFilterParams;
+ 
+ 	pesFilterParams.pid     = tt_pid;
+ 	pesFilterParams.input   = DMX_IN_FRONTEND;
+ 	pesFilterParams.output  = DMX_OUT_TS_TAP;
+         pesFilterParams.pes_type = DMX_PES_OTHER;
+ 	pesFilterParams.flags   = DMX_IMMEDIATE_START;
+ 
+ 	if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0)  {
+                 fprintf(stderr,"FILTER %i: ",tt_pid);
+ 		perror("DMX SET PES FILTER");
+         }
+ }
+ #else
  void set_tt_filt(int fd,uint16_t tt_pid)
  {
***************
*** 136,141 ****
  	pesFilterParams.input   = DMX_IN_FRONTEND;
  	pesFilterParams.output  = DMX_OUT_TS_TAP;
!         pesFilterParams.pesType = DMX_PES_TELETEXT;
! 	pesFilterParams.flags   = DMX_IMMEDIATE_START|DMX_ONESHOT;
  
  	if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0)  {
--- 157,162 ----
  	pesFilterParams.input   = DMX_IN_FRONTEND;
  	pesFilterParams.output  = DMX_OUT_TS_TAP;
!         pesFilterParams.pesType = DMX_PES_OTHER;
! 	pesFilterParams.flags   = DMX_IMMEDIATE_START;
  
  	if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0)  {
***************
*** 144,147 ****
--- 165,169 ----
          }
  }
+ #endif
  
  int main(int argc, char **argv)

[dvbtools-cvs] dvbtune dvbtune.c,1.17,1.18

From: <lin...@us...> - 2003-01-28 19:55:52

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv22844

Modified Files:
	dvbtune.c 
Log Message:
bugfix for network device name by Andreas Oberritter

Index: dvbtune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/dvbtune.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dvbtune.c	16 Jan 2003 07:49:44 -0000	1.17
--- dvbtune.c	28 Jan 2003 19:55:46 -0000	1.18
***************
*** 1400,1406 ****
  
  #ifdef NEWSTRUCT
-     sprintf(devnamen,"/dev/ost/net%d",dev);
- #else
      sprintf(devnamen,"/dev/dvb/adapter%d/net0",dev);
  #endif
      //printf("Trying to open %s\n",devnamen);
--- 1400,1406 ----
  
  #ifdef NEWSTRUCT
      sprintf(devnamen,"/dev/dvb/adapter%d/net0",dev);
+ #else
+     sprintf(devnamen,"/dev/ost/net%d",dev);
  #endif
      //printf("Trying to open %s\n",devnamen);

[dvbtools-cvs] dvbstream tune.c,1.9,1.10

From: <lin...@us...> - 2003-01-16 07:51:44

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1:/tmp/cvs-serv14463a

Modified Files:
	tune.c 
Log Message:
Ignore EOVERFLOW errors - patch by Andrew de Quincey

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tune.c	13 Oct 2002 18:39:53 -0000	1.9
--- tune.c	16 Jan 2003 07:51:41 -0000	1.10
***************
*** 27,30 ****
--- 27,31 ----
  #include <unistd.h>
  #include <error.h>
+ #include <errno.h>
  
  #ifdef NEWSTRUCT
***************
*** 175,178 ****
--- 176,180 ----
    struct dvb_frontend_info fe_info;
    struct pollfd pfd[1];
+   int status;
  
    if (ioctl(fd_frontend,FE_SET_FRONTEND,feparams) < 0) {
***************
*** 190,196 ****
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ( ioctl(fd_frontend, FE_GET_EVENT, &event) < 0){
!           perror("FE_GET_EVENT");
!           return -1;
          }
        }
--- 192,200 ----
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if (status = ioctl(fd_frontend, FE_GET_EVENT, &event) < 0){
! 	  if (status != -EOVERFLOW) {
! 	    perror("FE_GET_EVENT");
! 	    return -1;
! 	  }
          }
        }

[dvbtools-cvs] dvbtune dvbtune.c,1.16,1.17 tune.c,1.14,1.15

From: <lin...@us...> - 2003-01-16 07:49:47

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv14331

Modified Files:
	dvbtune.c tune.c 
Log Message:
Increase timeouts and ignore EOVERFLOW errors - patch by Andrew de Quincey

Index: dvbtune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/dvbtune.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dvbtune.c	22 Oct 2002 17:32:39 -0000	1.16
--- dvbtune.c	16 Jan 2003 07:49:44 -0000	1.17
***************
*** 698,702 ****
    ufd.fd=fd_nit;
    ufd.events=POLLPRI;
!   if (poll(&ufd,1,5000) < 0 ) {
      fprintf(stderr,"TIMEOUT on read from fd_nit\n");
      close(fd_nit);
--- 698,702 ----
    ufd.fd=fd_nit;
    ufd.events=POLLPRI;
!   if (poll(&ufd,1,10000) < 0 ) {
      fprintf(stderr,"TIMEOUT on read from fd_nit\n");
      close(fd_nit);
***************
*** 777,781 ****
    ufd.fd=fd_pmt;
    ufd.events=POLLPRI;
!   if (poll(&ufd,1,2000) < 0) {
       fprintf(stderr,"TIMEOUT reading from fd_pmt\n");
       close(fd_pmt);
--- 777,781 ----
    ufd.fd=fd_pmt;
    ufd.events=POLLPRI;
!   if (poll(&ufd,1,10000) < 0) {
       fprintf(stderr,"TIMEOUT reading from fd_pmt\n");
       close(fd_pmt);
***************
*** 865,869 ****
    ufd.fd=fd_pat;
    ufd.events=POLLPRI;
!   if (poll(&ufd,1,2000) < 0) {
       fprintf(stderr,"TIMEOUT reading from fd_pat\n");
       close(fd_pat);
--- 865,869 ----
    ufd.fd=fd_pat;
    ufd.events=POLLPRI;
!   if (poll(&ufd,1,10000) < 0) {
       fprintf(stderr,"TIMEOUT reading from fd_pat\n");
       close(fd_pat);

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tune.c	12 Oct 2002 11:59:31 -0000	1.14
--- tune.c	16 Jan 2003 07:49:44 -0000	1.15
***************
*** 27,30 ****
--- 27,31 ----
  #include <unistd.h>
  #include <error.h>
+ #include <errno.h>
  
  #ifdef NEWSTRUCT
***************
*** 175,178 ****
--- 176,180 ----
    struct dvb_frontend_info fe_info;
    struct pollfd pfd[1];
+   int status;
  
    if (ioctl(fd_frontend,FE_SET_FRONTEND,feparams) < 0) {
***************
*** 190,196 ****
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ( ioctl(fd_frontend, FE_GET_EVENT, &event) < 0){
!           perror("FE_GET_EVENT");
!           return -1;
          }
        }
--- 192,200 ----
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if (status = ioctl(fd_frontend, FE_GET_EVENT, &event) < 0){
! 	  if (status != -EOVERFLOW) {
! 	    perror("FE_GET_EVENT");
! 	    return -1;
! 	  }
          }
        }

[dvbtools-cvs] dvbsubs README,1.3,1.4

From: <lin...@us...> - 2002-11-07 07:47:30

Update of /cvsroot/dvbtools/dvbsubs
In directory usw-pr-cvs1:/tmp/cvs-serv7627

Modified Files:
	README 
Log Message:
More information

Index: README
===================================================================
RCS file: /cvsroot/dvbtools/dvbsubs/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README	27 Jul 2002 08:56:12 -0000	1.3
--- README	7 Nov 2002 07:47:26 -0000	1.4
***************
*** 2,6 ****
  -------
  
! Program to decode DVB subtitles (ETS 300 743).
  
  This program is still an alpha version (i.e. incomplete) and attempts
--- 2,7 ----
  -------
  
! Program to decode DVB subtitles (ETS 300 743).  This standard can be
! freely downloaded from http://www.etsi.org/
  
  This program is still an alpha version (i.e. incomplete) and attempts
***************
*** 20,23 ****
--- 21,29 ----
  to read a PES stream from a DVB card and decode the subtitles.
  
+ For testing, you can use either my "pesdump" program to save a
+ subtitle stream to a pes file, or:
+ 
+ dvbstream [options] -o PID > file.ts
+ mpegtools/ts2pes PID < file.ts > file.pes
  
  Copyright

[dvbtools-cvs] dvbtune dvbtune.c,1.15,1.16

From: <lin...@us...> - 2002-10-22 17:32:42

Update of /cvsroot/dvbtools/dvbtune
In directory usw-pr-cvs1:/tmp/cvs-serv19100

Modified Files:
	dvbtune.c 
Log Message:
fixed name of network device

Index: dvbtune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/dvbtune.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dvbtune.c	12 Oct 2002 11:59:31 -0000	1.15
--- dvbtune.c	22 Oct 2002 17:32:39 -0000	1.16
***************
*** 1399,1403 ****
--- 1399,1407 ----
      netif.if_num = 0;  // always choosen the next free number
  
+ #ifdef NEWSTRUCT
      sprintf(devnamen,"/dev/ost/net%d",dev);
+ #else
+     sprintf(devnamen,"/dev/dvb/adapter%d/net0",dev);
+ #endif
      //printf("Trying to open %s\n",devnamen);
      if((fdn = open(devnamen,O_RDWR|O_NONBLOCK)) < 0) {

[dvbtools-cvs] dvbtune/scripts scan_uk-t.sh,1.2,1.3

From: <lin...@us...> - 2002-10-18 22:58:10

Update of /cvsroot/dvbtools/dvbtune/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv21961

Modified Files:
	scan_uk-t.sh 
Log Message:
Mux 1 has changed to QAM 16

Index: scan_uk-t.sh
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/scripts/scan_uk-t.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scan_uk-t.sh	12 Oct 2002 15:59:29 -0000	1.2
--- scan_uk-t.sh	18 Oct 2002 22:58:05 -0000	1.3
***************
*** 18,26 ****
  echo '<?xml version="1.0"?>'
  echo '<satellite>'
! $DVBTUNE -c $CARD -f 505833 -i
! $DVBTUNE -c $CARD -f 481833 -i
! $DVBTUNE -c $CARD -f 561833 -i
! $DVBTUNE -c $CARD -f 529833 -qam 16 -cr 3_4 -i
! $DVBTUNE -c $CARD -f 578166 -qam 16 -cr 3_4 -i
! $DVBTUNE -c $CARD -f 537833 -qam 16 -cr 3_4 -i
  echo '</satellite>'
--- 18,26 ----
  echo '<?xml version="1.0"?>'
  echo '<satellite>'
! $DVBTUNE -c $CARD -f 505833333 -qam 16 -cr 3_4 -i
! $DVBTUNE -c $CARD -f 481833333 -i
! $DVBTUNE -c $CARD -f 561833333 -i
! $DVBTUNE -c $CARD -f 529833333 -qam 16 -cr 3_4 -i
! $DVBTUNE -c $CARD -f 578166667 -qam 16 -cr 3_4 -i
! $DVBTUNE -c $CARD -f 537833333 -qam 16 -cr 3_4 -i
  echo '</satellite>'

[dvbtools-cvs] dvbtune tune.h,1.5,1.6

From: <lin...@us...> - 2002-10-13 18:46:33

Update of /cvsroot/dvbtools/dvbtune
In directory usw-pr-cvs1:/tmp/cvs-serv4086

Modified Files:
	tune.h 
Log Message:
More NEWSTRUCT changes

Index: tune.h
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tune.h	12 Oct 2002 15:55:43 -0000	1.5
--- tune.h	13 Oct 2002 18:46:29 -0000	1.6
***************
*** 20,23 ****
--- 20,24 ----
  #define dmx_pes_filter_params dmxPesFilterParams
  #define dmx_sct_filter_params dmxSctFilterParams
+ #define dmx_pes_type_t dmxPesType_t
  #endif

[dvbtools-cvs] dvbstream tune.h,1.4,1.5

From: <lin...@us...> - 2002-10-13 18:46:06

Update of /cvsroot/dvbtools/dvbstream
In directory usw-pr-cvs1:/tmp/cvs-serv3937

Modified Files:
	tune.h 
Log Message:
More NEWSTRUCT changes

Index: tune.h
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tune.h	13 Oct 2002 18:39:53 -0000	1.4
--- tune.h	13 Oct 2002 18:46:03 -0000	1.5
***************
*** 20,23 ****
--- 20,24 ----
  #define dmx_pes_filter_params dmxPesFilterParams
  #define dmx_sct_filter_params dmxSctFilterParams
+ #define dmx_pes_type_t dmxPesType_t
  #endif

[dvbtools-cvs] dvbstream dvbstream.c,1.7,1.8

From: <lin...@us...> - 2002-10-13 18:44:13

Update of /cvsroot/dvbtools/dvbstream
In directory usw-pr-cvs1:/tmp/cvs-serv3492

Modified Files:
	dvbstream.c 
Log Message:
Rename 'record for n seconds'  option -n

Index: dvbstream.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/dvbstream.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dvbstream.c	13 Oct 2002 18:39:53 -0000	1.7
--- dvbstream.c	13 Oct 2002 18:44:09 -0000	1.8
***************
*** 452,455 ****
--- 452,456 ----
      fprintf(stderr,"-r          IP multicast port\n");
      fprintf(stderr,"-o          Stream to stdout instead of network\n");
+     fprintf(stderr,"-n secs     Stop after secs seconds\n");
      fprintf(stderr,"-ps         Convert stream to Program Stream format (needs exactly 2 pids)\n");
      fprintf(stderr,"-v vpid     Decode video PID (full cards only)\n");
***************
*** 502,506 ****
        } else if (strcmp(argv[i],"-o")==0) {
          to_stdout = 1;
!       } else if (strcmp(argv[i],"-t")==0) {
          i++;
          secs=atoi(argv[i]);
--- 503,507 ----
        } else if (strcmp(argv[i],"-o")==0) {
          to_stdout = 1;
!       } else if (strcmp(argv[i],"-n")==0) {
          i++;
          secs=atoi(argv[i]);

[dvbtools-cvs] dvbstream Makefile,1.4,1.5 tune.c,1.8,1.9 tune.h,1.3,1.4 dvbstream.c,1.6,1.7 rtpfeed.c,1.2,1.3

From: <lin...@us...> - 2002-10-13 18:39:57

Update of /cvsroot/dvbtools/dvbstream
In directory usw-pr-cvs1:/tmp/cvs-serv2186

Modified Files:
	Makefile tune.c tune.h dvbstream.c rtpfeed.c 
Log Message:
NEWSTRUCT changes

Index: Makefile
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	27 Aug 2002 06:53:31 -0000	1.4
--- Makefile	13 Oct 2002 18:39:53 -0000	1.5
***************
*** 1,3 ****
! INCS=-I ../DVB/ost/include
  CC=gcc
  CFLAGS =  -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--- 1,8 ----
! # Delete the following line if you are not using a 
! # "NEWSTRUCT" driver.  If you are using a "NEWSTRUCT"
! # driver, it must be later than October 10th 2002
! 
! NEWSTRUCT=1
! 
  CC=gcc
  CFLAGS =  -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
***************
*** 6,9 ****
--- 11,17 ----
  ifdef NEWSTRUCT
    CFLAGS += -DNEWSTRUCT
+   INCS=-I ../DVB/include
+ else
+   INCS=-I ../DVB/ost/include
  endif
  

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tune.c	27 Aug 2002 08:13:57 -0000	1.8
--- tune.c	13 Oct 2002 18:39:53 -0000	1.9
***************
*** 26,29 ****
--- 26,30 ----
  #include <sys/poll.h>
  #include <unistd.h>
+ #include <error.h>
  
  #ifdef NEWSTRUCT
***************
*** 149,153 ****
  #endif
  
! void print_status(FILE* fd,FrontendStatus festatus) {
    fprintf(fd,"FE_STATUS:");
    if (festatus & FE_HAS_SIGNAL) fprintf(fd," FE_HAS_SIGNAL");
--- 150,154 ----
  #endif
  
! void print_status(FILE* fd,fe_status_t festatus) {
    fprintf(fd,"FE_STATUS:");
    if (festatus & FE_HAS_SIGNAL) fprintf(fd," FE_HAS_SIGNAL");
***************
*** 170,174 ****
    int i,res;
    int32_t strength;
!   FrontendStatus festatus;
    struct dvb_frontend_event event;
    struct dvb_frontend_info fe_info;
--- 171,175 ----
    int i,res;
    int32_t strength;
!   fe_status_t festatus;
    struct dvb_frontend_event event;
    struct dvb_frontend_info fe_info;
***************
*** 189,193 ****
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ( ioctl(fd_frontend, FE_GET_EVENT, &event) == -EBUFFEROVERFLOW){
            perror("FE_GET_EVENT");
            return -1;
--- 190,194 ----
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ( ioctl(fd_frontend, FE_GET_EVENT, &event) < 0){
            perror("FE_GET_EVENT");
            return -1;
***************
*** 243,247 ****
    int i,res;
    int32_t strength;
!   FrontendStatus festatus;
    FrontendEvent event;
    FrontendInfo fe_info;
--- 244,248 ----
    int i,res;
    int32_t strength;
!   fe_status_t festatus;
    FrontendEvent event;
    FrontendInfo fe_info;
***************
*** 261,265 ****
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ( ioctl(fd_frontend, FE_GET_EVENT, &event) == -EBUFFEROVERFLOW){
            perror("FE_GET_EVENT");
            return -1;
--- 262,266 ----
        if (pfd[0].revents & POLLIN){
          fprintf(stderr,"Getting frontend event\n");
!         if ( ioctl(fd_frontend, FE_GET_EVENT, &event) < 0) {
            perror("FE_GET_EVENT");
            return -1;
***************
*** 348,357 ****
  #endif
  
! int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, SpectralInversion specInv, unsigned int diseqc,Modulation modulation,CodeRate HP_CodeRate,TransmitMode TransmissionMode,GuardInterval guardInterval, BandWidth bandWidth) {
    int res;
  #ifdef NEWSTRUCT
    struct dvb_frontend_parameters feparams;
    struct dvb_frontend_info fe_info;
!   SecVoltage voltage;
  #else
    FrontendParameters feparams;
--- 349,358 ----
  #endif
  
! int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, fe_spectral_inversion_t specInv, unsigned int diseqc,fe_modulation_t modulation,fe_code_rate_t HP_CodeRate,fe_transmit_mode_t TransmissionMode,fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth) {
    int res;
  #ifdef NEWSTRUCT
    struct dvb_frontend_parameters feparams;
    struct dvb_frontend_info fe_info;
!   fe_sec_voltage_t voltage;
  #else
    FrontendParameters feparams;
***************
*** 389,397 ****
    switch(fe_info.type) {
      case FE_OFDM:
-       fprintf(stderr,"tuning DVB-T (%s) to %d\n",DVB_T_LOCATION,freq);
  #ifdef NEWSTRUCT
        feparams.frequency=freq;
        feparams.inversion=INVERSION_OFF;
!       feparams.u.ofdm.bandwidth=bandWidth;
        feparams.u.ofdm.code_rate_HP=HP_CodeRate;
        feparams.u.ofdm.code_rate_LP=LP_CODERATE_DEFAULT;
--- 390,398 ----
    switch(fe_info.type) {
      case FE_OFDM:
  #ifdef NEWSTRUCT
+       if (freq < 1000000) freq*=1000UL;
        feparams.frequency=freq;
        feparams.inversion=INVERSION_OFF;
!       feparams.u.ofdm.bandwidth=bandwidth;
        feparams.u.ofdm.code_rate_HP=HP_CodeRate;
        feparams.u.ofdm.code_rate_LP=LP_CODERATE_DEFAULT;
***************
*** 401,407 ****
        feparams.u.ofdm.hierarchy_information=HIERARCHY_DEFAULT;
  #else
        feparams.Frequency=freq;
        feparams.Inversion=INVERSION_OFF;
!       feparams.u.ofdm.bandWidth=bandWidth;
        feparams.u.ofdm.HP_CodeRate=HP_CodeRate;
        feparams.u.ofdm.LP_CodeRate=LP_CODERATE_DEFAULT;
--- 402,409 ----
        feparams.u.ofdm.hierarchy_information=HIERARCHY_DEFAULT;
  #else
+       if (freq < 1000000) freq*=1000UL;
        feparams.Frequency=freq;
        feparams.Inversion=INVERSION_OFF;
!       feparams.u.ofdm.bandWidth=bandwidth;
        feparams.u.ofdm.HP_CodeRate=HP_CodeRate;
        feparams.u.ofdm.LP_CodeRate=LP_CODERATE_DEFAULT;
***************
*** 411,414 ****
--- 413,417 ----
        feparams.u.ofdm.HierarchyInformation=HIERARCHY_DEFAULT;
  #endif
+       fprintf(stderr,"tuning DVB-T (%s) to %d Hz\n",DVB_T_LOCATION,freq);
        break;
      case FE_QPSK:

Index: tune.h
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tune.h	6 Jul 2002 08:43:12 -0000	1.3
--- tune.h	13 Oct 2002 18:39:53 -0000	1.4
***************
*** 2,9 ****
  #define _TUNE_H
  
! #include <ost/frontend.h>
  #include "dvb_defaults.h"
  
! int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, SpectralInversion specInv, unsigned int diseqc,Modulation modulation,CodeRate HP_CodeRate,TransmitMode TransmissionMode,GuardInterval guardInterval, BandWidth bandwidth);
  
  #endif
--- 2,28 ----
  #define _TUNE_H
  
! #ifdef NEWSTRUCT
!   #include <linux/dvb/frontend.h>
! #else
! 
! // The following defines make the "OLDSTRUCT" driver more compatible with NEWSTRUCT.
! 
!   #include <ost/frontend.h>
! 
! #define fe_status_t FrontendStatus
! #define fe_spectral_inversion_t SpectralInversion
! #define fe_modulation_t Modulation
! #define fe_code_rate_t CodeRate
! #define fe_transmit_mode_t TransmitMode
! #define fe_guard_interval_t GuardInterval
! #define fe_bandwidth_t BandWidth
! #define fe_sec_voltage_t SecVoltage
! #define dmx_pes_filter_params dmxPesFilterParams
! #define dmx_sct_filter_params dmxSctFilterParams
! #endif
! 
  #include "dvb_defaults.h"
  
! int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, fe_spectral_inversion_t specInv, unsigned int diseqc,fe_modulation_t modulation,fe_code_rate_t HP_CodeRate,fe_transmit_mode_t TransmissionMode,fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth);
  
  #endif

Index: dvbstream.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/dvbstream.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dvbstream.c	27 Aug 2002 07:05:32 -0000	1.6
--- dvbstream.c	13 Oct 2002 18:39:53 -0000	1.7
***************
*** 91,101 ****
  
  int Interrupted=0;
! SpectralInversion specInv=INVERSION_AUTO;
  int tone=-1;
! Modulation modulation=CONSTELLATION_DEFAULT;
! TransmitMode TransmissionMode=TRANSMISSION_MODE_DEFAULT;
! BandWidth bandWidth=BANDWIDTH_DEFAULT;
! GuardInterval guardInterval=GUARD_INTERVAL_DEFAULT;
! CodeRate HP_CodeRate=HP_CODERATE_DEFAULT;
  unsigned int diseqc=0;
  char pol=0;
--- 91,101 ----
  
  int Interrupted=0;
! fe_spectral_inversion_t specInv=INVERSION_AUTO;
  int tone=-1;
! fe_modulation_t modulation=CONSTELLATION_DEFAULT;
! fe_transmit_mode_t TransmissionMode=TRANSMISSION_MODE_DEFAULT;
! fe_bandwidth_t bandWidth=BANDWIDTH_DEFAULT;
! fe_guard_interval_t guardInterval=GUARD_INTERVAL_DEFAULT;
! fe_code_rate_t HP_CodeRate=HP_CODERATE_DEFAULT;
  unsigned int diseqc=0;
  char pol=0;
***************
*** 136,147 ****
  #define MAX_CHANNELS 8
  
! void set_ts_filt(int fd,uint16_t pid, dmxPesType_t pestype)
  {
!   struct dmxPesFilterParams pesFilterParams;
  
    pesFilterParams.pid     = pid;
    pesFilterParams.input   = DMX_IN_FRONTEND;
    pesFilterParams.output  = DMX_OUT_TS_TAP;
    pesFilterParams.pesType = pestype;
    pesFilterParams.flags   = DMX_IMMEDIATE_START;
  
--- 136,151 ----
  #define MAX_CHANNELS 8
  
! void set_ts_filt(int fd,uint16_t pid, dmx_pes_type_t pestype)
  {
!   struct dmx_pes_filter_params pesFilterParams;
  
    pesFilterParams.pid     = pid;
    pesFilterParams.input   = DMX_IN_FRONTEND;
    pesFilterParams.output  = DMX_OUT_TS_TAP;
+ #ifdef NEWSTRUCT
+   pesFilterParams.pes_type = pestype;
+ #else
    pesFilterParams.pesType = pestype;
+ #endif
    pesFilterParams.flags   = DMX_IMMEDIATE_START;
  
***************
*** 202,206 ****
    int i;
    char* ch;
!   dmxPesType_t pestype;
    unsigned long freq=0;
    unsigned long srate=0;
--- 206,210 ----
    int i;
    char* ch;
!   dmx_pes_type_t pestype;
    unsigned long freq=0;
    unsigned long srate=0;
***************
*** 419,423 ****
    int count;
    char* ch;
!   dmxPesType_t pestype;
    int bytes_read;
    unsigned char* free_bytes;
--- 423,427 ----
    int count;
    char* ch;
!   dmx_pes_type_t pestype;
    int bytes_read;
    unsigned char* free_bytes;

Index: rtpfeed.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/rtpfeed.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rtpfeed.c	27 Jun 2002 19:11:31 -0000	1.2
--- rtpfeed.c	13 Oct 2002 18:39:53 -0000	1.3
***************
*** 40,45 ****
--- 40,51 ----
  
  // DVB includes:
+ #ifdef NEWSTRUCT
+ #include <linux/dvb/dmx.h>
+ #include <linux/dvb/frontend.h>
+ #else
  #include <ost/dmx.h>
  #include <ost/frontend.h>
+ #define dmx_pes_filter_params dmxPesFilterParams
+ #endif
  
  
***************
*** 64,74 ****
  void set_ts_filt(int fd,uint16_t pid, int type)
  {
!   struct dmxPesFilterParams pesFilterParams;
  
    pesFilterParams.pid     = pid;
    pesFilterParams.input   = DMX_IN_DVR;
    pesFilterParams.output  = DMX_OUT_DECODER;
    if (type==1) pesFilterParams.pesType = DMX_PES_VIDEO;
    if (type==2) pesFilterParams.pesType = DMX_PES_AUDIO;
    pesFilterParams.flags   = DMX_IMMEDIATE_START;
  
--- 70,85 ----
  void set_ts_filt(int fd,uint16_t pid, int type)
  {
!   struct dmx_pes_filter_params pesFilterParams;
  
    pesFilterParams.pid     = pid;
    pesFilterParams.input   = DMX_IN_DVR;
    pesFilterParams.output  = DMX_OUT_DECODER;
+ #ifdef NEWSTRUCT
+   if (type==1) pesFilterParams.pes_type = DMX_PES_VIDEO;
+   if (type==2) pesFilterParams.pes_type = DMX_PES_AUDIO;
+ #else
    if (type==1) pesFilterParams.pesType = DMX_PES_VIDEO;
    if (type==2) pesFilterParams.pesType = DMX_PES_AUDIO;
+ #endif
    pesFilterParams.flags   = DMX_IMMEDIATE_START;

[dvbtools-cvs] dvbtune tune.c,1.12,1.13

From: <lin...@us...> - 2002-10-10 07:50:24

Update of /cvsroot/dvbtools/dvbtune
In directory usw-pr-cvs1:/tmp/cvs-serv9918

Modified Files:
	tune.c 
Log Message:
allow DVB-T tuning in KHz

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tune.c	28 Aug 2002 23:09:59 -0000	1.12
--- tune.c	10 Oct 2002 07:50:22 -0000	1.13
***************
*** 389,394 ****
    switch(fe_info.type) {
      case FE_OFDM:
-       fprintf(stderr,"tuning DVB-T (%s) to %d\n",DVB_T_LOCATION,freq);
  #ifdef NEWSTRUCT
        feparams.frequency=freq;
        feparams.inversion=INVERSION_OFF;
--- 389,394 ----
    switch(fe_info.type) {
      case FE_OFDM:
  #ifdef NEWSTRUCT
+       if (freq < 1000000) freq*=1000UL;
        feparams.frequency=freq;
        feparams.inversion=INVERSION_OFF;
***************
*** 401,404 ****
--- 401,405 ----
        feparams.u.ofdm.hierarchy_information=HIERARCHY_DEFAULT;
  #else
+       if (freq < 1000000) freq*=1000UL;
        feparams.Frequency=freq;
        feparams.Inversion=INVERSION_OFF;
***************
*** 411,414 ****
--- 412,416 ----
        feparams.u.ofdm.HierarchyInformation=HIERARCHY_DEFAULT;
  #endif
+       fprintf(stderr,"tuning DVB-T (%s) to %d Hz\n",DVB_T_LOCATION,freq);
        break;
      case FE_QPSK:

Flat | Threaded

<< < 1 .. 3 4 5 6 7 8 > >> (Page 5 of 8)