[BACK]Return to global.h CVS log [TXT] [DIR] Up to [DVB] / multiplexer

Diff for /multiplexer/global.h between versions 1.13 and 1.14

version 1.13, 2001/07/20 16:49:55 version 1.14, 2001/08/01 08:23:18
Line 190  typedef struct { Line 190  typedef struct {
   
 /* Release a chained list completely */  /* Release a chained list completely */
 #define releasechain(typ,root) \  #define releasechain(typ,root) \
   { register typ *n, *p = root; \    { register typ *relchn_n, *relchn_p = root; \
     while (p != NULL) { \      while (relchn_p != NULL) { \
       n = p->next; free (p); p = n; \        relchn_n = relchn_p->next; free (relchn_p); relchn_p = relchn_n; \
   } }    } }
   
 /* Supported input file types */  /* Supported input file types */
Line 310  typedef struct { Line 310  typedef struct {
   } u;    } u;
 } file_descr;  } file_descr;
   
   /* Descriptors, data and reference index list */
   typedef struct {
     byte *refx[NUMBER_ELEMD];
     byte data[MAX_PSI_SIZE];
   } descr_descr;
   
   /* Stream entry in target PMT, without corresponding input stream.
    * This is used to manually denote si streams, that are brought in
    * via --si and have to be mentioned in PMT in some way.
    */
   typedef struct stumpdescr {
     struct stumpdescr *next;
     int program_number;
     short pid;
     byte stream_type;
     descr_descr manudescr;
   } stump_descr;
   
 /* Target program */  /* Target program */
 typedef struct {  typedef struct {
   int program_number;    int program_number;
Line 321  typedef struct { Line 339  typedef struct {
   short pat_section;    short pat_section;
   short streams;    short streams;
   struct streamdescr *stream[MAX_STRPERPRG];    struct streamdescr *stream[MAX_STRPERPRG];
     stump_descr *stump; /* just entries in PMT, not really data streams */
 } prog_descr;  } prog_descr;
   
 /* Single data or map stream */  /* Single data or map stream */
Line 330  typedef struct streamdescr { Line 349  typedef struct streamdescr {
   file_descr *fdescr;    file_descr *fdescr;
   short sourceid; /* index into fdescr->u.xx.stream[] */    short sourceid; /* index into fdescr->u.xx.stream[] */
   byte stream_id; /* elementary stream id, table 2-35, etc */    byte stream_id; /* elementary stream id, table 2-35, etc */
   byte stream_type;    byte stream_type; /* table 2-29 */
   byte version;    byte version;
   byte conticnt;    byte conticnt;
   byte endaction;    byte endaction;
   byte *elemdvld[NUMBER_ELEMD]; /* as valid for out */    descr_descr *autodescr; /* Descriptors copied from input stream */
   byte elemdescr[MAX_PSI_SIZE];    descr_descr *manudescr; /* Descriptors manually added */
 /*what if a stream is leftupper corner in one prog, but elsewhere in another?*/  /*what if a stream is leftupper corner in one prog, but elsewhere in another?*/
   streamdata_type streamdata;    streamdata_type streamdata;
   union {    union {
     struct {      struct {
       struct streamdescr *mapstream;  
       t_msec next_clockref;  
       t_msec delta;  
       conversion_base conv;  
       t_msec lasttime;  
       short pid; /* splicets: 0010..1FFE, spliceps: ...FF */        short pid; /* splicets: 0010..1FFE, spliceps: ...FF */
       boolean discontinuity;        boolean discontinuity;
       boolean trigger;        boolean trigger;
       boolean mention;        boolean mention;
       boolean has_clockref; /* in output */        boolean has_clockref; /* in output */
       boolean has_opcr; /* in input */        boolean has_opcr; /* in input */
         struct streamdescr *mapstream;
         t_msec next_clockref;
         t_msec delta;
         conversion_base conv;
         t_msec lasttime;
       short progs;        short progs;
       prog_descr *pdescr[MAX_PRGFORSTR];        prog_descr *pdescr[MAX_PRGFORSTR];
     } d;      } d;
Removed from v.1.13  
changed lines
  Added in v.1.14

LinuxTV legacy CVS <linuxtv.org/cvs>