OSDN Git Service

Cygwin: Patches for xvid and mpeg4ip Updated to work with new nasm 2.x.x
[handbrake-jp/handbrake-jp-git.git] / libhb / stream.c
index b168308..109864f 100755 (executable)
@@ -16,10 +16,11 @@ typedef enum { hb_stream_type_unknown = 0, hb_stream_type_transport, hb_stream_t
  
 #define kMaxNumberDecodeStreams 8
 #define kMaxNumberVideoPIDS 16
-#define kMaxNumberAudioPIDS 32
+#define kMaxNumberAudioPIDS 16
 //#define kVideoStream 0
 //#define kAudioStream 1
 #define kNumDecodeBuffers 2
+#define kMaxNumberPMTStreams 32
 
 #define CLOCKRATE              ((int64_t)27000000)                     // MPEG System clock rate
 #define STREAMRATE             ((int64_t)2401587)                      // Original HD stream rate 19.2 Mbps
@@ -54,7 +55,6 @@ struct hb_stream_s
        
        int                              ts_number_video_pids;
        int                              ts_number_audio_pids;
-       int                              ts_selected_audio_pid_index;
        
        unsigned char*   ts_packetbuf[kMaxNumberDecodeStreams];
        int                              ts_packetpos[kMaxNumberDecodeStreams];
@@ -65,7 +65,33 @@ struct hb_stream_s
        int                              ts_streamid[kMaxNumberDecodeStreams];
        int                              ts_audio_stream_type[kMaxNumberAudioPIDS];
        
-       FILE                     *debug_output;
+       struct 
+       {
+               unsigned short program_number;
+               unsigned short program_map_PID;
+       } pat_info[kMaxNumberPMTStreams];
+       int      ts_number_pat_entries;
+       
+       struct
+       {
+               int reading;
+               unsigned char *tablebuf;
+               unsigned int tablepos;
+               unsigned char current_continuity_counter;
+               
+               int section_length;
+               int program_number;
+               unsigned int PCR_PID;
+               int program_info_length;
+               unsigned char *progam_info_descriptor_data;
+               struct
+               {
+                       unsigned char stream_type;
+                       unsigned short elementary_PID;
+                       unsigned short ES_info_length;
+                       unsigned char *es_info_descriptor_data;
+               } pmt_stream_info[kMaxNumberPMTStreams];
+       } pmt_info;
 };
 
 /***********************************************************************
@@ -77,67 +103,90 @@ static void hb_ts_stream_find_pids(hb_stream_t *stream);
 static void hb_ts_stream_decode(hb_stream_t *stream);
 static void hb_ts_stream_reset(hb_stream_t *stream);
 static void hb_stream_put_back(hb_stream_t *stream, int i);
-static void hb_stream_set_audio_id_and_codec(hb_stream_t *stream, hb_audio_t *audio);
+static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream,
+                                                       int aud_pid_index);
+static void hb_ps_stream_find_audio_ids(hb_stream_t *stream, hb_title_t *title);
+static off_t align_to_next_packet(FILE* f);
+
+/*
+ * streams have a bunch of state that's learned during the scan. We don't
+ * want to throw away the state when scan does a close then relearn
+ * everything when reader does an open. So we basically ignore
+ * a stream close, remember the most recent stream we've opened and only
+ * delete it when a stream of a different name is opened.
+ */
+static hb_stream_t *current_stream;
+
+
+static inline int check_ps_sync(const uint8_t *buf)
+{
+    // a legal MPEG program stream must start with a Pack header in the
+    // first four bytes.
+    return (buf[0] == 0x00) && (buf[1] == 0x00) &&
+           (buf[2] == 0x01) && (buf[3] == 0xba);
+}
 
-int hb_stream_is_stream_type( char * path )
+static inline int check_ts_sync(const uint8_t *buf)
 {
-  if ((strstr(path,".mpg") != NULL) ||
-      (strstr(path,".vob") != NULL) || 
-      (strstr(path, ".VOB") != NULL) ||
-      (strstr(path, ".mpeg") != NULL) ||
-      (strstr(path,".ts") != NULL) || 
-      (strstr(path, ".m2t") != NULL) ||
-      (strstr(path, ".TS") != NULL))
-  {
-    return 1;
-  }
-  else
-    return 0;
+    // must have initial sync byte, no scrambling & a legal adaptation ctrl
+    return (buf[0] == 0x47) && ((buf[3] >> 6) == 0) && ((buf[3] >> 4) > 0);
 }
 
-/***********************************************************************
- * hb_stream_open
- ***********************************************************************
- *
- **********************************************************************/
-hb_stream_t * hb_stream_open( char * path )
+static inline int have_ts_sync(const uint8_t *buf)
 {
-    hb_stream_t * d;
+    return check_ts_sync(&buf[0*188]) && check_ts_sync(&buf[1*188]) &&
+           check_ts_sync(&buf[2*188]) && check_ts_sync(&buf[3*188]) &&
+           check_ts_sync(&buf[4*188]) && check_ts_sync(&buf[5*188]) &&
+           check_ts_sync(&buf[6*188]) && check_ts_sync(&buf[7*188]);
+}
 
-    d = calloc( sizeof( hb_stream_t ), 1 );
+static int hb_stream_check_for_ts(const uint8_t *buf)
+{
+    // transport streams should have a sync byte every 188 bytes.
+    // search the first KB of buf looking for at least 8 consecutive
+    // correctly located sync patterns.
+    int offset = 0;
 
-    /* Open device */
-    if( !( d->file_handle = fopen( path, "rb" ) ) )
+    for ( offset = 0; offset < 1024; ++offset )
     {
-        hb_log( "hb_stream_open: fopen failed (%s)", path );
-        goto fail;
+        if ( have_ts_sync( &buf[offset]) )
+            return 1;
     }
+    return 0;
+}
 
-    d->path = strdup( path );
+static int hb_stream_check_for_ps(const uint8_t *buf)
+{
+    // program streams should have a Pack header every 2048 bytes.
+    // check that we have 4 of these.
+    return check_ps_sync(&buf[0*2048]) && check_ps_sync(&buf[1*2048]) &&
+           check_ps_sync(&buf[2*2048]) && check_ps_sync(&buf[3*2048]);
+}
 
-       if ( ( strstr(d->path,".ts") != NULL) || ( strstr(d->path,".m2t") != NULL) || ( strstr(d->path,".TS") != NULL) )
-       {
-               d->stream_type = hb_stream_type_transport;
-               hb_ts_stream_init(d);
-       }
-       else if (( strstr(d->path,".mpg") != NULL) || ( strstr(d->path,".vob") != NULL) || ( strstr(d->path,".mpeg") != NULL) || ( strstr(d->path,".VOB") != NULL))
-       {
-               d->stream_type = hb_stream_type_program;
-       }
-       
-    return d;
+static int hb_stream_get_type(hb_stream_t *stream)
+{
+    uint8_t buf[2048*4];
 
-fail:
-    free( d );
-    return NULL;
+    if ( fread(buf, 1, sizeof(buf), stream->file_handle) == sizeof(buf) )
+    {
+        if ( hb_stream_check_for_ts(buf) != 0 )
+        {
+            hb_log("file is MPEG Transport Stream");
+            stream->stream_type = hb_stream_type_transport;
+            hb_ts_stream_init(stream);
+            return 1;
+        }
+        if ( hb_stream_check_for_ps(buf) != 0 )
+        {
+            hb_log("file is MPEG Program Stream");
+            stream->stream_type = hb_stream_type_program;
+            return 1;
+        }
+    }
+    return 0;
 }
 
-/***********************************************************************
- * hb_stream_close
- ***********************************************************************
- * Closes and frees everything
- **********************************************************************/
-void hb_stream_close( hb_stream_t ** _d )
+static void hb_stream_delete( hb_stream_t ** _d )
 {
     hb_stream_t * d = *_d;
 
@@ -147,12 +196,6 @@ void hb_stream_close( hb_stream_t ** _d )
                d->file_handle = NULL;
     }
 
-       if (d->debug_output)
-       {
-               fclose(d->debug_output);
-               d->debug_output = NULL;
-       }
-       
        int i=0;
        for (i = 0; i < kNumDecodeBuffers; i++)
        {
@@ -171,12 +214,79 @@ void hb_stream_close( hb_stream_t ** _d )
                        d->ts_packetbuf[i] = NULL;
                }
        }
-       
+    free( d->path );
     free( d );
     *_d = NULL;
 }
 
 /***********************************************************************
+ * hb_stream_open
+ ***********************************************************************
+ *
+ **********************************************************************/
+hb_stream_t * hb_stream_open( char * path )
+{
+    if (current_stream)
+    {
+        if (strcmp( path, current_stream->path ) == 0 )
+        {
+            hb_stream_seek( current_stream, 0. );
+            return current_stream;
+        }
+        hb_stream_delete( &current_stream );
+    }
+    hb_stream_t *d = calloc( sizeof( hb_stream_t ), 1 );
+
+    /* open the file and see if it's a type we know about. return a stream
+     * reference structure if we can deal with it & NULL otherwise. */
+    if( ( d->file_handle = fopen( path, "rb" ) ) )
+    {
+        d->path = strdup( path );
+        if (d->path != NULL &&  hb_stream_get_type( d ) != 0 )
+        {
+            current_stream = d;
+            return d;
+        }
+        fclose( d->file_handle );
+        if (d->path)
+            free( d->path );
+    }
+    hb_log( "hb_stream_open: open %s failed", path );
+    free( d );
+    return NULL;
+}
+
+/***********************************************************************
+ * hb_stream_close
+ ***********************************************************************
+ * Closes and frees everything
+ **********************************************************************/
+void hb_stream_close( hb_stream_t ** _d )
+{
+}
+
+/* when the file was first opened we made entries for all the audio elementary
+ * streams we found in it. Streams that were later found during the preview scan
+ * now have an audio codec, type, rate, etc., associated with them. At the end
+ * of the scan we delete all the audio entries that weren't found by the scan
+ * or don't have a format we support. This routine deletes audio entry 'indx'
+ * by copying all later entries down one slot. */
+static void hb_stream_delete_audio_entry(hb_stream_t *stream, int indx)
+{
+    int i;
+
+    for (i = indx+1; i < stream->ts_number_audio_pids; ++i)
+    {
+        stream->ts_audio_pids[indx] = stream->ts_audio_pids[i];
+        stream->ts_audio_stream_type[indx] = stream->ts_audio_stream_type[i];
+        stream->ts_streamid[stream->ts_number_video_pids + indx] =
+            stream->ts_streamid[stream->ts_number_video_pids + i];
+        ++indx;
+    }
+    --stream->ts_number_audio_pids;
+}
+
+/***********************************************************************
  * hb_ps_stream_title_scan
  ***********************************************************************
  *
@@ -185,6 +295,7 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream)
 {
     // 'Barebones Title'
     hb_title_t *aTitle = hb_title_init( stream->path, 0 );
+    aTitle->index = 1;
 
        // Copy part of the stream path to the title name
        char *sep = strrchr(stream->path, '/');
@@ -208,154 +319,212 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream)
     chapter->seconds = aTitle->seconds;
     hb_list_add( aTitle->list_chapter, chapter );
     
-       int i=0, num_audio_tracks = 1;
-       
+    // Figure out how many audio streams we really have:
+    // - For transport streams, for each PID listed in the PMT (whether
+    //   or not it was an audio stream type) read the bitstream until we
+    //   find an packet from that PID containing a PES header and see if
+    //   the elementary stream is an audio type.
+    // - For program streams read the first 4MB and take every unique
+    //   audio stream we find.
        if (stream->stream_type == hb_stream_type_transport)
        {
-               num_audio_tracks = stream->ts_number_audio_pids;
-       }
-       
-       for (i=0; i < num_audio_tracks ; i++)
-       {
-               // Basic AC-3 Audio track
-               hb_audio_t * audio;
-               audio = calloc( sizeof( hb_audio_t ), 1 );
+        int i;
 
-               audio->source_pid = stream->ts_audio_pids[i];
-               
-               hb_stream_set_audio_id_and_codec(stream, audio);
-               
-               hb_list_add( aTitle->list_audio, audio );
+        for (i=0; i < stream->ts_number_audio_pids; i++)
+        {
+            hb_audio_t *audio = hb_ts_stream_set_audio_id_and_codec(stream, i);
+            if (audio->codec)
+                hb_list_add( aTitle->list_audio, audio );
+            else
+            {
+                free(audio);
+                hb_stream_delete_audio_entry(stream, i);
+                --i;
+            }
+        }
        }
-       
+    else
+    {
+        hb_ps_stream_find_audio_ids(stream, aTitle);
+    }
+
   return aTitle;
 }
 
+/*
+ * scan the next MB of 'stream' to find the next start packet for
+ * the Packetized Elementary Stream associated with TS PID 'pid'.
+ */
+static const uint8_t *hb_ts_stream_getPEStype(hb_stream_t *stream, uint32_t pid)
+{
+    static uint8_t buf[188];
+    int npack = 100000; // max packets to read
+
+    while (--npack >= 0)
+    {
+        if (fread(buf, 1, 188, stream->file_handle) != 188)
+        {
+            hb_log("hb_ts_stream_getPEStype: EOF while searching for PID 0x%x", pid);
+            return 0;
+        }
+        if (buf[0] != 0x47)
+        {
+            hb_log("hb_ts_stream_getPEStype: lost sync while searching for PID 0x%x", pid);
+            align_to_next_packet(stream->file_handle);
+            continue;
+        }
+
+        /*
+         * The PES header is only in TS packets with 'start' set so we check
+         * that first then check for the right PID.
+         */
+        if ((buf[1] & 0x40) == 0 || (buf[1] & 0x1f) != (pid >> 8) ||
+            buf[2] != (pid & 0xff))
+        {
+            // not a start packet or not the pid we want
+            continue;
+        }
+
+        /* skip over the TS hdr to return a pointer to the PES hdr */
+        int udata = 4;
+        switch (buf[3] & 0x30)
+        {
+            case 0x00: // illegal
+            case 0x20: // fill packet
+                continue;
+
+            case 0x30: // adaptation
+                if (buf[4] > 182)
+                {
+                    hb_log("hb_ts_stream_getPEStype: invalid adaptation field length %d for PID 0x%x", buf[4], pid);
+                    continue;
+                }
+                udata += buf[4] + 1;
+                break;
+        }
+        return &buf[udata];
+    }
+
+    /* didn't find it */
+    return 0;
+}
+
+static uint64_t hb_ps_stream_getVideoPTS(hb_stream_t *stream)
+{
+    hb_buffer_t *buf  = hb_buffer_init(HB_DVD_READ_BUFFER_SIZE);
+    hb_list_t *list = hb_list_init();
+    // how many blocks we read while searching for a video PES header
+    int blksleft = 1024;
+    uint64_t pts = 0;
+
+    while (--blksleft >= 0 && hb_stream_read(stream, buf) == 1)
+    {
+        hb_buffer_t *es;
+
+        // 'buf' contains an MPEG2 PACK - get a list of all it's elementary streams
+        hb_demux_ps(buf, list);
+
+        while ( ( es = hb_list_item( list, 0 ) ) )
+        {
+            hb_list_rem( list, es );
+            if ( es->id == 0xe0 )
+            {
+                // this PES contains video - if there's a PTS we're done
+                // hb_demux_ps left the PTS in buf_es->start.
+                if ( es->start != ~0 )
+                {
+                    pts = es->start;
+                    blksleft = 0;
+                    break;
+                }
+            }
+            hb_buffer_close( &es );
+        }
+    }
+    hb_list_empty( &list );
+    hb_buffer_close(&buf);
+    return pts;
+}
+
 /***********************************************************************
  * hb_stream_duration
  ***********************************************************************
  *
  **********************************************************************/
-void hb_stream_duration(hb_stream_t *stream, hb_title_t *inTitle)
+struct pts_pos {
+    uint64_t pos;   /* file position of this PTS sample */
+    uint64_t pts;   /* PTS from video stream */
+};
+
+static struct pts_pos hb_sample_pts(hb_stream_t *stream, uint64_t fpos)
 {
-       // VOB Files often have exceedingly unusual PTS values in them - they will progress for a while
-       // and then reset without warning ! 
-       if  (strstr(stream->path,".vob") != NULL) 
-       {
-               // So we'll use a 'fake duration' that should give enough time !
-               int64_t duration = 4 * 3600 * 90000;
-               inTitle->duration = duration; //90LL * dvdtime2msec( &d->pgc->playback_time );
-               inTitle->hours    = inTitle->duration / 90000 / 3600;
-               inTitle->minutes  = ( ( inTitle->duration / 90000 ) % 3600 ) / 60;
-               inTitle->seconds  = ( inTitle->duration / 90000 ) % 60;
-               return;
-       }
+    struct pts_pos pp = { 0, 0 };
 
-    unsigned char *buf = (unsigned char *) malloc(4096);
-    int done = 0;
-    off_t cur_pos;
-    int64_t first_pts = 0, last_pts = 0;
-    
-    // To calculate the duration we look for the first and last presentation time stamps in the stream for video data
-    // and then use the delta
-    while (!done)
+    if ( stream->stream_type == hb_stream_type_program )
     {
-      cur_pos = ftello(stream->file_handle);
-      if (fread(buf, 4096, 1, stream->file_handle) == 1)
-      {
-        int i=0;
-        for (i=0; (i <= 4092) && !done; i++)
+        // round address down to nearest dvd sector start
+        fpos &=~ ( HB_DVD_READ_BUFFER_SIZE - 1 );
+        fseeko( stream->file_handle, fpos, SEEK_SET );
+        pp.pts = hb_ps_stream_getVideoPTS( stream );
+    }
+    else
+    {
+        const uint8_t *buf;
+        fseeko( stream->file_handle, fpos, SEEK_SET );
+        align_to_next_packet( stream->file_handle );
+        buf = hb_ts_stream_getPEStype( stream, stream->ts_video_pids[0] );
+        if ( buf == NULL )
         {
-          if ((buf[i] == 0x00) && (buf[i+1] == 0x00) && (buf[i+2] == 0x01) && (buf[i+3]  == 0xe0))    // Found a Video Stream
-          {
-              // Now look for a PTS field - we need to make sure we have enough space so we back up a little and read
-              // some more data
-              fseeko(stream->file_handle, cur_pos + i, SEEK_SET);
-              if (fread(buf, 4096, 1, stream->file_handle) == 1)
-              {
-                  int has_pts             = ( ( buf[7] >> 6 ) & 0x2 ) ? 1 : 0;
-                  if (has_pts)
-                  {
-                    first_pts = ( ( ( (uint64_t) buf[9] >> 1 ) & 0x7 ) << 30 ) +
-                          ( buf[10] << 22 ) +
-                          ( ( buf[11] >> 1 ) << 15 ) +
-                          ( buf[12] << 7 ) +
-                          ( buf[13] >> 1 );
-                    done = 1;
-                  }
-                  else
-                  {
-                    fseeko(stream->file_handle, cur_pos, SEEK_SET);
-                    fread(buf, 4096, 1, stream->file_handle);
-                  }
-              }
-          }
+            hb_log("hb_sample_pts: couldn't find video packet near %llu", fpos);
+            return pp;
         }
-      }
-      else
-        done = 1;    // End of data;
+        if ( ( buf[7] >> 7 ) != 1 )
+        {
+            hb_log("hb_sample_pts: no PTS in video packet near %llu", fpos);
+            return pp;
+        }
+        pp.pts = ( ( (uint64_t)buf[9] >> 1 ) & 7 << 30 ) |
+                 ( (uint64_t)buf[10] << 22 ) |
+                 ( ( (uint64_t)buf[11] >> 1 ) << 15 ) |
+                 ( (uint64_t)buf[12] << 7 ) |
+                 ( (uint64_t)buf[13] >> 1 );
     }
+    pp.pos = ftello(stream->file_handle);
+    hb_log("hb_sample_pts: pts %lld at %llu", pp.pts, pp.pos );
+    return pp;
+}
 
-    // Now work back from the end of the stream
-    fseeko(stream->file_handle,0 ,SEEK_END);
-    
-    done = 0;
-    while (!done)
+static void hb_stream_duration(hb_stream_t *stream, hb_title_t *inTitle)
+{
+    // To calculate the duration we get video presentation time stamps
+    // at a couple places in the file then use their difference scaled
+    // by the ratio of the distance between our measurement points &
+    // the size of the file. The issue is that our video file may have
+    // chunks from several different program fragments (main feature,
+    // commercials, station id, trailers, etc.) all with their own base
+    // pts value. We need to difference two pts's from the same program
+    // fragment. Since extraneous material is very likely at the beginning
+    // and end of the content, for now we take a time stamp from 25%
+    // into the file & 75% into the file then double their difference
+    // to get the total duration.
+    struct pts_pos first_pts, last_pts;
+
+    fseeko(stream->file_handle, 0, SEEK_END);
+    uint64_t fsize = ftello(stream->file_handle);
+    first_pts = hb_sample_pts(stream, fsize >> 2);
+    last_pts = hb_sample_pts(stream, fsize - (fsize >> 2) );
+
+    if ( first_pts.pos && last_pts.pos && first_pts.pos != last_pts.pos )
     {
-      // Back up a little
-      if (fseeko(stream->file_handle, -4096, SEEK_CUR) < 0)
-      {
-        done = 1;
-        break;
-      }
-      
-      cur_pos = ftello(stream->file_handle);
-      if (fread(buf, 4096, 1, stream->file_handle) == 1)
-      {
-        int i=0;
-        for (i=4092; (i >= 0) && !done; i--)
-        {
-          if ((buf[i] == 0x00) && (buf[i+1] == 0x00) && (buf[i+2] == 0x01) && (buf[i+3] == 0xe0))    // Found a Video Stream
-          {
-              // Now look for a PTS field - we need to make sure we have enough space so we back up a little and read
-              // some more data
-              fseeko(stream->file_handle, cur_pos + i, SEEK_SET);
-              fread(buf, 1, 4096, stream->file_handle);
-
-              unsigned char pts_dts_flag = buf[7];
-              
-              int has_pts             = ( ( buf[7] >> 6 ) & 0x2 ) ? 1 : 0;
-              if (has_pts)
-              {
-                last_pts = ( ( ( (uint64_t) buf[9] >> 1 ) & 0x7 ) << 30 ) +
-                      ( buf[10] << 22 ) +
-                      ( ( buf[11] >> 1 ) << 15 ) +
-                      ( buf[12] << 7 ) +
-                      ( buf[13] >> 1 );
-                
-                done = 1;
-              }
-              else
-              {
-                // Re Read the original data and carry on (i is still valid in the old buffer)
-                fseeko(stream->file_handle, cur_pos, SEEK_SET);
-                fread(buf, 4096, 1, stream->file_handle);
-              }
-          }
-        }
-        fseeko(stream->file_handle, -4096, SEEK_CUR);   // 'Undo' the last read
-      }
-      else
-        done = 1;    // End of data;
+        uint64_t dur = ( ( last_pts.pts - first_pts.pts ) * fsize ) /
+                       ( last_pts.pos - first_pts.pos );
+        inTitle->duration = dur;
+        dur /= 90000;
+        inTitle->hours    = dur / 3600;
+        inTitle->minutes  = ( dur % 3600 ) / 60;
+        inTitle->seconds  = dur % 60;
     }
-    free(buf);
-    
-    int64_t duration = last_pts - first_pts;
-    inTitle->duration = duration; //90LL * dvdtime2msec( &d->pgc->playback_time );
-    inTitle->hours    = inTitle->duration / 90000 / 3600;
-    inTitle->minutes  = ( ( inTitle->duration / 90000 ) % 3600 ) / 60;
-    inTitle->seconds  = ( inTitle->duration / 90000 ) % 60;
-    
+    rewind(stream->file_handle);
 }
 
 /***********************************************************************
@@ -381,9 +550,14 @@ int hb_stream_read( hb_stream_t * src_stream, hb_buffer_t * b )
        // Transport streams are a little more complex  - we might be able to just
        // read from the transport stream conversion buffer (if there's enough data)
        // or we may need to transfer what's left and fill it again.
-       if (src_stream->ps_decode_buffer[read_buffer_index].len - src_stream->ps_decode_buffer[read_buffer_index].read_pos > HB_DVD_READ_BUFFER_SIZE)
+       if (src_stream->ps_decode_buffer[read_buffer_index].len
+          - src_stream->ps_decode_buffer[read_buffer_index].read_pos
+        >= HB_DVD_READ_BUFFER_SIZE)
        {
-               memcpy(b->data, src_stream->ps_decode_buffer[read_buffer_index].data + src_stream->ps_decode_buffer[read_buffer_index].read_pos,HB_DVD_READ_BUFFER_SIZE);
+               memcpy(b->data,
+               src_stream->ps_decode_buffer[read_buffer_index].data +
+                 src_stream->ps_decode_buffer[read_buffer_index].read_pos,
+               HB_DVD_READ_BUFFER_SIZE);
                src_stream->ps_decode_buffer[read_buffer_index].read_pos += HB_DVD_READ_BUFFER_SIZE;
                return 1;
        }
@@ -395,9 +569,9 @@ int hb_stream_read( hb_stream_t * src_stream, hb_buffer_t * b )
                int amt_avail_to_transfer = src_stream->ps_decode_buffer[read_buffer_index].len - src_stream->ps_decode_buffer[read_buffer_index].read_pos;
                memcpy(b->data, src_stream->ps_decode_buffer[read_buffer_index].data + src_stream->ps_decode_buffer[read_buffer_index].read_pos, amt_avail_to_transfer);
                transfer_size -= amt_avail_to_transfer;
-               src_stream->ps_decode_buffer[read_buffer_index].read_pos += amt_avail_to_transfer;
-               
+
                // Give up this buffer - decoding may well need it, and we're done
+               src_stream->ps_decode_buffer[read_buffer_index].read_pos = 0;
                src_stream->ps_decode_buffer[read_buffer_index].write_pos = 0;
                src_stream->ps_decode_buffer[read_buffer_index].len = 0;
                
@@ -437,6 +611,7 @@ int hb_stream_seek( hb_stream_t * src_stream, float f )
   fseeko(src_stream->file_handle,0 ,SEEK_END);
   stream_size = ftello(src_stream->file_handle);
   new_pos = (off_t) ((double) (stream_size) * pos_ratio);
+  new_pos &=~ (HB_DVD_READ_BUFFER_SIZE - 1);
   int r = fseeko(src_stream->file_handle, new_pos, SEEK_SET);
   
   if (r == -1)
@@ -477,72 +652,131 @@ int hb_stream_seek( hb_stream_t * src_stream, float f )
   return 1;
 }
 
-/***********************************************************************
- * hb_stream_set_audio_id_and_codec
- ***********************************************************************
- *
- **********************************************************************/
-void hb_stream_set_audio_id_and_codec(hb_stream_t *stream, hb_audio_t *audio)
+static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream,
+                                                       int aud_pid_index)
 {
-       off_t cur_pos;
-       cur_pos = ftello(stream->file_handle);
-       int done = 0;
-       hb_buffer_t *buf  = NULL;
+    off_t cur_pos = ftello(stream->file_handle);
+    hb_audio_t *audio = calloc( sizeof( hb_audio_t ), 1 );
+    const uint8_t *buf;
 
-        int cur_audio_pid_index = stream->ts_selected_audio_pid_index;
+    fseeko(stream->file_handle, 0, SEEK_SET);
+    align_to_next_packet(stream->file_handle);
+    buf = hb_ts_stream_getPEStype(stream, stream->ts_audio_pids[aud_pid_index]);
 
-       if (stream->stream_type == hb_stream_type_transport)
-       {
-               int i=0;
-               for (i=0; i < stream->ts_number_audio_pids; i++)
-               {
-                       if (stream->ts_audio_pids[i] == audio->source_pid)
-                       {
-                               stream->ts_selected_audio_pid_index = i;
-                               break;
-                       }
-               }
+    /* check that we found a PES header */
+    if (buf && buf[0] == 0x00 && buf[1] == 0x00 && buf[2] == 0x01)
+    {
+        if (buf[3] == 0xbd)
+        {
+            audio->id = 0x80bd | (aud_pid_index << 8);
+            audio->codec = HB_ACODEC_AC3;
+            hb_log("transport stream pid 0x%x (type 0x%x) is AC-3 audio id 0x%x",
+                   stream->ts_audio_pids[aud_pid_index],
+                   stream->ts_audio_stream_type[aud_pid_index],
+                   audio->id);
+            stream->ts_audio_stream_type[aud_pid_index] = 0x81;
+            stream->ts_streamid[stream->ts_number_video_pids + aud_pid_index] = buf[3];
+        }
+        else if ((buf[3] & 0xe0) == 0xc0)
+        {
+            audio->id = buf[3] | aud_pid_index;
+            audio->codec = HB_ACODEC_MPGA;
+            hb_log("transport stream pid 0x%x (type 0x%x) is MPEG audio id 0x%x",
+                   stream->ts_audio_pids[aud_pid_index],
+                   stream->ts_audio_stream_type[aud_pid_index],
+                   audio->id);
+            stream->ts_audio_stream_type[aud_pid_index] = 0x03;
+            stream->ts_streamid[stream->ts_number_video_pids + aud_pid_index] = buf[3];
+        }
+    }
+    fseeko(stream->file_handle, cur_pos, SEEK_SET);
+    if (! audio->codec)
+    {
+        hb_log("transport stream pid 0x%x (type 0x%x) isn't audio",
+                stream->ts_audio_pids[aud_pid_index],
+                stream->ts_audio_stream_type[aud_pid_index]);
        }
+    return audio;
+}
+
+static void add_audio_to_title(hb_title_t *title, int id)
+{
+    hb_audio_t *audio = calloc( sizeof( hb_audio_t ), 1 );
+
+    audio->id = id;
+    switch ( id >> 12 )
+    {
+        case 0x0:
+            audio->codec = HB_ACODEC_MPGA;
+            hb_log("add_audio_to_title: added MPEG audio stream 0x%x", id);
+            break;
+        case 0x2:
+            // type 2 is a DVD subtitle stream - just ignore it */
+            free( audio );
+            return;
+        case 0x8:
+            audio->codec = HB_ACODEC_AC3;
+            hb_log("add_audio_to_title: added AC3 audio stream 0x%x", id);
+            break;
+        case 0xa:
+            audio->codec = HB_ACODEC_LPCM;
+            hb_log("add_audio_to_title: added LPCM audio stream 0x%x", id);
+            break;
+        default:
+            hb_log("add_audio_to_title: unknown audio stream type 0x%x", id);
+            free( audio );
+            return;
+
+    }
+    hb_list_add( title->list_audio, audio );
+}
 
-      //Start at the beginning of the stream
-      hb_stream_seek(stream, 0.0f);
-//             fseeko(stream->file_handle,0 ,SEEK_SET);
+static void hb_ps_stream_find_audio_ids(hb_stream_t *stream, hb_title_t *title)
+{
+    off_t cur_pos = ftello(stream->file_handle);
+    hb_buffer_t *buf  = hb_buffer_init(HB_DVD_READ_BUFFER_SIZE);
+    hb_list_t *list = hb_list_init();
+    // how many blocks we read while searching for audio streams
+    int blksleft = 4096;
+    // there can be at most 16 unique streams in an MPEG PS (8 in a DVD)
+    // so we use a bitmap to keep track of the ones we've already seen.
+    // Bit 'i' of smap is set if we've already added the audio for
+    // audio substream id 'i' to the title's audio list.
+    uint32_t smap = 0;
+
+    // start looking 20% into the file since there's occasionally no
+    // audio at the beginning (particularly for vobs).
+    hb_stream_seek(stream, 0.2f);
                
-      // Now we must scan forwards for a valid audio start code (0x000001xx)
-      buf = hb_buffer_init(HB_DVD_READ_BUFFER_SIZE);
-      while (!done)
-      {
-//                     if (fread(buf->data,4096,1,stream->file_handle) == 1)
-              if (hb_stream_read(stream, buf) == 1)
-              {
-                int i=0;
-                for (i=0; (i <= HB_DVD_READ_BUFFER_SIZE-4) && (!done); i++)
+    while (--blksleft >= 0 && hb_stream_read(stream, buf) == 1)
+    {
+        hb_buffer_t *es;
+
+        // 'buf' contains an MPEG2 PACK - get a list of all it's elementary streams
+        hb_demux_ps(buf, list);
+
+        while ( ( es = hb_list_item( list, 0 ) ) )
+        {
+            hb_list_rem( list, es );
+            if ( (es->id & 0xff) == 0xbd || (es->id & 0xe0) == 0xc0 )
+            {
+                // this PES contains some kind of audio - get the substream id
+                // and check if we've seen it already.
+                int ssid = (es->id > 0xff ? es->id >> 8 : es->id) & 0xf;
+                if ( (smap & (1 << ssid)) == 0 )
                 {
-                      if ((buf->data[i] == 0x00) && (buf->data[i+1] == 0x00) && (buf->data[i+2] == 0x01))
-                      {
-                        if (buf->data[i+3] == 0xbd)
-                        {
-                              audio->id = 0x80bd;
-                              audio->codec = HB_ACODEC_AC3;
-                              done = 1;
-                        }
-                        else if ((buf->data[i+3] & 0xe0) == 0xc0)
-                        {
-                              audio->id = buf->data[i+3];
-                              audio->codec = HB_ACODEC_MPGA;
-                              done = 1;
-                        } 
-                      }
+                    // we haven't seen this stream before - add it to the
+                    // title's list of audio streams.
+                    smap |= (1 << ssid);
+                    add_audio_to_title(title, es->id);
                 }
-              }
-              else
-                done = 1;    // End of data;
-      }
-      hb_buffer_close(&buf);
-
-      fseeko(stream->file_handle, cur_pos, SEEK_SET);
-      
-      stream->ts_selected_audio_pid_index = cur_audio_pid_index;
+            }
+            hb_buffer_close( &es );
+        }
+    }
+    hb_list_empty( &list );
+    hb_buffer_close(&buf);
+    fseeko(stream->file_handle, cur_pos, SEEK_SET);
 }
 
 /***********************************************************************
@@ -554,80 +788,92 @@ void hb_stream_update_audio(hb_stream_t *stream, hb_audio_t *audio)
 {
        iso639_lang_t *lang;
        
-       if (stream->stream_type == hb_stream_type_program)
-       {
-               lang = lang_for_code(0x0000);
-       }
-       else if (stream->stream_type == hb_stream_type_transport)
+    if (stream->stream_type == hb_stream_type_transport)
        {
-               // Find the audio stream info for this PID
-               int i=0;
-               for (i=0; i < stream->ts_number_audio_pids; i++)
-               {
-                       if (stream->ts_audio_pids[i] == audio->source_pid)
-                               break;
-               }
-               if (i == stream->ts_number_audio_pids)
+        // Find the audio stream info for this PID. The stream index is
+        // the subchannel id which is in the bottom four bits for MPEG audio
+        // and the bottom four bits of the upper byte for everything else.
+        int i = ( audio->id >= 0xd0 ? audio->id >> 8 : audio->id ) & 0xf;
+        if (i >= stream->ts_number_audio_pids)
                {
-                       hb_log("hb_stream_update_audio - cannot find PID 0x%x (%d) in ts_audio_pids list !", audio->source_pid, audio->source_pid);
+            hb_log("hb_stream_update_audio: no PID for audio stream 0x%x",
+                    audio->id);
                        return;
                }
+        if (audio->id < 0xd0)
+        {
+            /* XXX fake mpeg audio sample rate & bps */
+            stream->a52_info[i].flags = A52_STEREO;
+            stream->a52_info[i].rate = 48000 /*Hz*/;
+            stream->a52_info[i].bitrate = 384000 /*Bps*/;
+        }
                
                lang = lang_for_code(stream->a52_info[i].lang_code);
-               audio->rate = stream->a52_info[i].rate;
-               audio->bitrate = stream->a52_info[i].bitrate;
-               audio->config.a52.ac3flags = audio->ac3flags = stream->a52_info[i].flags;
+               if (!audio->rate)
+                       audio->rate = stream->a52_info[i].rate;
+               if (!audio->bitrate)
+                       audio->bitrate = stream->a52_info[i].bitrate;
+               if (!audio->config.a52.ac3flags)
+                       audio->config.a52.ac3flags = audio->ac3flags = stream->a52_info[i].flags;
 
        }
+    else
+    {
+        // XXX should try to get language code from the AC3 bitstream
+        lang = lang_for_code(0x0000);
+    }
        
-       switch( audio->ac3flags & A52_CHANNEL_MASK )
+       if (!audio->input_channel_layout)
        {
-               /* mono sources */
-               case A52_MONO:
-               case A52_CHANNEL1:
-               case A52_CHANNEL2:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_MONO;
-                       break;
-               /* stereo input */
-               case A52_CHANNEL:
-               case A52_STEREO:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
-                       break;
-               /* dolby (DPL1 aka Dolby Surround = 4.0 matrix-encoded) input */
-               case A52_DOLBY:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_DOLBY;
-                       break;
-               /* 3F/2R input */
-               case A52_3F2R:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_3F2R;
-                       break;
-               /* 3F/1R input */
-               case A52_3F1R:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_3F1R;
-                       break;
-               /* other inputs */
-               case A52_3F:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_3F;
-                       break;
-               case A52_2F1R:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_2F1R;
-                       break;
-               case A52_2F2R:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_2F2R;
-                       break;
-               /* unknown */
-               default:
-                       audio->input_channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
-       }
+               switch( audio->ac3flags & A52_CHANNEL_MASK )
+               {
+                       /* mono sources */
+                       case A52_MONO:
+                       case A52_CHANNEL1:
+                       case A52_CHANNEL2:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_MONO;
+                               break;
+                       /* stereo input */
+                       case A52_CHANNEL:
+                       case A52_STEREO:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
+                               break;
+                       /* dolby (DPL1 aka Dolby Surround = 4.0 matrix-encoded) input */
+                       case A52_DOLBY:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_DOLBY;
+                               break;
+                       /* 3F/2R input */
+                       case A52_3F2R:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_3F2R;
+                               break;
+                       /* 3F/1R input */
+                       case A52_3F1R:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_3F1R;
+                               break;
+                       /* other inputs */
+                       case A52_3F:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_3F;
+                               break;
+                       case A52_2F1R:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_2F1R;
+                               break;
+                       case A52_2F2R:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_2F2R;
+                               break;
+                       /* unknown */
+                       default:
+                               audio->input_channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
+               }
 
-       /* add in our own LFE flag if the source has LFE */
-       if (audio->ac3flags & A52_LFE)
-       {
-               audio->input_channel_layout = audio->input_channel_layout | HB_INPUT_CH_LAYOUT_HAS_LFE;
+               /* add in our own LFE flag if the source has LFE */
+               if (audio->ac3flags & A52_LFE)
+               {
+                       audio->input_channel_layout = audio->input_channel_layout | HB_INPUT_CH_LAYOUT_HAS_LFE;
+               }
        }
-
+       
        snprintf( audio->lang, sizeof( audio->lang ), "%s (%s)", strlen(lang->native_name) ? lang->native_name : lang->eng_name,
-         audio->codec == HB_ACODEC_AC3 ? "AC3" : ( audio->codec == HB_ACODEC_MPGA ? "MPEG" : "LPCM" ) );
+         audio->codec == HB_ACODEC_AC3 ? "AC3" : ( audio->codec == HB_ACODEC_MPGA ? "MPEG" : ( audio->codec == HB_ACODEC_DCA ? "DTS" : "LPCM" ) ) );
        snprintf( audio->lang_simple, sizeof( audio->lang_simple ), "%s", strlen(lang->native_name) ? lang->native_name : lang->eng_name );
        snprintf( audio->iso639_2, sizeof( audio->iso639_2 ), "%s", lang->iso639_2);
 
@@ -646,11 +892,6 @@ void hb_stream_update_audio(hb_stream_t *stream, hb_audio_t *audio)
 
 }
 
-void            hb_stream_set_selected_audio_pid_index(hb_stream_t *stream, int i)
-{
-       stream->ts_selected_audio_pid_index = i;
-}
-
 /***********************************************************************
  * hb_stream_put_back
  ***********************************************************************
@@ -709,13 +950,6 @@ static void hb_ts_stream_init(hb_stream_t *stream)
        stream->ps_current_write_buffer_index = 0;
        stream->ps_current_read_buffer_index = 1;
        
-       // This is the index (in ts_audio_pids) of the selected
-       // output stream. It should not be set until after all the 
-       // pids in the stream have been discovered.
-       stream->ts_selected_audio_pid_index = -1;
-       
-       stream->debug_output = fopen("/Users/awk/Desktop/hb_debug.mpg", "wb");
-       
        // Find the audio and video pids in the stream
        hb_ts_stream_find_pids(stream);
        
@@ -729,13 +963,12 @@ static void hb_ts_stream_init(hb_stream_t *stream)
        for (i = stream->ts_number_video_pids; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
        {
                stream->ts_packetbuf[i] = (unsigned char *) malloc(1024 * 1024);
-               stream->ts_streamid[i] = 0xBD;          // Stream 1 is AC-3 Audio
        }
 }
 
 // ------------------------------------------------------------------------------------
 
-off_t align_to_next_packet(FILE* f)
+static off_t align_to_next_packet(FILE* f)
 {
        unsigned char buf[188*20];
 
@@ -767,7 +1000,7 @@ off_t align_to_next_packet(FILE* f)
        if (pos == 188)
                pos = 0;                // failed to find anything!!!!!?
 
-       fseek(f, start+pos, SEEK_SET);
+    fseeko(f, start+pos, SEEK_SET);
 
        return pos;
 }
@@ -849,16 +1082,120 @@ static inline unsigned int get_bits(int bits)
        return val;
 }
 
-// ------------------------------------------------------------------------------------
+// extract what useful information we can from the elementary stream
+// descriptor list at 'dp' and add it to the stream at 'esindx'.
+// Descriptors with info we don't currently use are ignored.
+// The descriptor list & descriptor item formats are defined in
+// ISO 13818-1 (2000E) section 2.6 (pg. 62).
+static void decode_element_descriptors(hb_stream_t* stream, int esindx,
+                                       const uint8_t *dp, uint8_t dlen)
+{
+    const uint8_t *ep = dp + dlen;
+
+    while (dp < ep)
+    {
+        switch (dp[0])
+        {
+            case 10:    // ISO_639_language descriptor
+                stream->a52_info[esindx].lang_code = lang_to_code(lang_for_code2((const char *)&dp[2]));
+                break;
+
+            default:
+                break;
+        }
+        dp += dp[1] + 2;
+    }
+}
 
-int decode_program_map(unsigned char *buf, hb_stream_t *stream)
+int decode_program_map(hb_stream_t* stream)
 {
-    unsigned char tablebuf[1024];
-    unsigned int tablepos = 0;
-    
-    int reading = 0;
+       set_buf(stream->pmt_info.tablebuf, stream->pmt_info.tablepos, 0);
+
+    get_bits(8);  // table_id
+    get_bits(4);
+    unsigned int section_length = get_bits(12);
+    stream->pmt_info.section_length = section_length;
+
+    unsigned int program_number = get_bits(16);
+    stream->pmt_info.program_number = program_number;
+    get_bits(2);
+    get_bits(5);  // version_number
+    get_bits(1);
+    get_bits(8);  // section_number
+    get_bits(8);  // last_section_number
+    get_bits(3);
+    unsigned int PCR_PID = get_bits(13);
+    stream->pmt_info.PCR_PID = PCR_PID;
+    get_bits(4);
+    unsigned int program_info_length = get_bits(12);
+    stream->pmt_info.program_info_length = program_info_length;
 
+       int i=0;
+       unsigned char *descriptor_buf = (unsigned char *) malloc(program_info_length);
+       for (i = 0; i < program_info_length; i++)
+       {
+         descriptor_buf[i] = get_bits(8);
+       }                                 
+       
+       int cur_pos =  9 /* data after the section length field*/ + program_info_length;
+       int done_reading_stream_types = 0;
+       while (!done_reading_stream_types)
+       {
+         unsigned char stream_type = get_bits(8);
+                 get_bits(3);
+         unsigned int elementary_PID = get_bits(13);
+                 get_bits(4);
+         unsigned int ES_info_length = get_bits(12);
+         
+         int i=0;
+         unsigned char *ES_info_buf = (unsigned char *) malloc(ES_info_length);
+         for (i=0; i < ES_info_length; i++)
+         {
+               ES_info_buf[i] = get_bits(8);
+         }
+       
+         if (stream_type == 0x02)
+         {
+               if (stream->ts_number_video_pids <= kMaxNumberVideoPIDS)
+                 stream->ts_number_video_pids++;
+               stream->ts_video_pids[stream->ts_number_video_pids-1] = elementary_PID;
+         }
+      else
+      {
+        // Defined audio stream types are 0x81 for AC-3/A52 audio and 0x03
+        // for mpeg audio. But content producers seem to use other
+        // values (0x04 and 0x06 have both been observed) so at this point
+        // we say everything that isn't a video pid is audio then at the end
+        // of hb_stream_title_scan we'll figure out which are really audio
+        // by looking at the PES headers.
+        i = stream->ts_number_audio_pids;
+        if (i < kMaxNumberAudioPIDS)
+            stream->ts_number_audio_pids++;
+        stream->ts_audio_pids[i] = elementary_PID;
+        stream->ts_audio_stream_type[i] = stream_type;
+               
+               if (ES_info_length > 0)
+               {
+            decode_element_descriptors(stream, i, ES_info_buf, ES_info_length);
+               }
+         }
+
+         cur_pos += 5 /* stream header */ + ES_info_length;
+         
+         free(ES_info_buf);
+         
+         if (cur_pos >= section_length - 4 /* stop before the CRC */)
+               done_reading_stream_types = 1;
+       }
+                                                        
+       free(descriptor_buf);
+       return 1;
+}
+
+// ------------------------------------------------------------------------------------
 
+int build_program_map(unsigned char *buf, hb_stream_t *stream)
+{
     // Get adaption header info
     int adapt_len = 0;
     int adaption = (buf[3] & 0x30) >> 4;
@@ -871,120 +1208,56 @@ int decode_program_map(unsigned char *buf, hb_stream_t *stream)
     if (adapt_len > 184)
             return 0;
 
-    // Get pointer length
-    int pointer_len = buf[4 + adapt_len] + 1;
-
     // Get payload start indicator
     int start;
     start = (buf[1] & 0x40) != 0;
 
-    if (start)
-            reading = 1;
+    // Get pointer length - only valid in packets with a start flag
+    int pointer_len = 0;
+       if (start && stream->pmt_info.reading)
+       {
+               // We just finished a bunch of packets - parse the program map details
+               int decode_ok = 0;
+               if (stream->pmt_info.tablebuf[0] == 0x02)
+                       decode_ok = decode_program_map(stream);
+               free(stream->pmt_info.tablebuf);
+               stream->pmt_info.tablebuf = NULL;
+               stream->pmt_info.tablepos = 0;
+        stream->pmt_info.reading = 0;
+        if (decode_ok)
+                       return decode_ok;
+       }
 
-    // Add the payload for this packet to the current buffer
-    if (reading && (184 - adapt_len) > 0)
-    {
-            if (tablepos + 184 - adapt_len - pointer_len > 1024)
-            {
-                    hb_log("decode_program_map - Bad program section length (> 1024)");
-                    return 0;
-            }
-            memcpy(tablebuf + tablepos, buf + 4 + adapt_len + pointer_len, 184 - adapt_len - pointer_len);
-            tablepos += 184 - adapt_len - pointer_len;
-    }
+       if (start)
+       {
+               pointer_len = buf[4 + adapt_len] + 1;
+               stream->pmt_info.tablepos = 0;
+       }       
+       // Get Continuity Counter
+       int continuity_counter = buf[3] & 0x0f;
+       if (!start && (stream->pmt_info.current_continuity_counter + 1 != continuity_counter))
+       {
+               hb_log("build_program_map - Continuity Counter %d out of sequence - expected %d", continuity_counter, stream->pmt_info.current_continuity_counter+1);
+               return 0;
+       }
+       stream->pmt_info.current_continuity_counter = continuity_counter;
+       stream->pmt_info.reading |= start;
 
-    if (start && reading)
+    // Add the payload for this packet to the current buffer
+       int amount_to_copy = 184 - adapt_len - pointer_len;
+    if (stream->pmt_info.reading && (amount_to_copy > 0))
     {
-            int done_reading_stream_types = 0;
-            
-            memcpy(tablebuf + tablepos, buf + 4 + adapt_len + 1, pointer_len - 1);
-
-            unsigned int pos = 0;
-            set_buf(tablebuf + pos, tablepos - pos, 0);
-
-            unsigned char section_id   = get_bits(8);
-                                                                      get_bits(4);
-            unsigned int section_length = get_bits(12);
-            unsigned int program_number = get_bits(16);
-                                                                        get_bits(2);
-            unsigned char version_number = get_bits(5);
-                                                                      get_bits(1);
-            unsigned char section_number = get_bits(8);
-            unsigned char last_section_number = get_bits(8);
-                                                                      get_bits(3);
-            unsigned int PCR_PID = get_bits(13);
-                                                                      get_bits(4);
-            unsigned int program_info_length = get_bits(12);
-            int i=0;
-            unsigned char *descriptor_buf = (unsigned char *) malloc(program_info_length);
-            for (i = 0; i < program_info_length; i++)
-            {
-              descriptor_buf[i] = get_bits(8);
-            }                                 
-            
-            int cur_pos =  9 /* data so far */ + program_info_length;
-            done_reading_stream_types = 0;
-            while (!done_reading_stream_types)
-            {
-              unsigned char stream_type = get_bits(8);
-                  get_bits(3);
-              unsigned int elementary_PID = get_bits(13);
-                  get_bits(4);
-              unsigned int ES_info_length = get_bits(12);
-              
-              int i=0;
-              unsigned char *ES_info_buf = (unsigned char *) malloc(ES_info_length);
-              for (i=0; i < ES_info_length; i++)
-              {
-                ES_info_buf[i] = get_bits(8);
-              }
-            
-              if (stream_type == 0x02)
-              {
-                if (stream->ts_number_video_pids <= kMaxNumberVideoPIDS)
-                  stream->ts_number_video_pids++;
-                stream->ts_video_pids[stream->ts_number_video_pids-1] = elementary_PID;
-              }
-              if ((stream_type == 0x04) || (stream_type == 0x81) || (stream_type == 0x03) || (stream_type == 0x06))    // ATSC Defines stream type 0x81 for AC-3/A52 audio, there's also some evidence of streams using type 6 for AC-3 audio too
-              {
-                if (stream->ts_number_audio_pids <= kMaxNumberAudioPIDS)
-                  stream->ts_number_audio_pids++;
-                stream->ts_audio_pids[stream->ts_number_audio_pids-1] =  elementary_PID;
-
-                stream->a52_info[stream->ts_number_audio_pids-1].lang_code = 'e' << 8 | 'n';
-                               stream->ts_audio_stream_type[stream->ts_number_audio_pids-1] = stream_type;
+                       stream->pmt_info.tablebuf = realloc(stream->pmt_info.tablebuf, stream->pmt_info.tablepos + amount_to_copy);
                                
-                if (ES_info_length > 0)
-                {
-                  hb_log("decode_program_map - Elementary Stream Info Present, decode language codes ?");
-                }
-
-              }
-
-              cur_pos += 5 /* stream header */ + ES_info_length;
-              
-              free(ES_info_buf);
-              
-              if (cur_pos >= section_length - 4 /* stop before the CRC */)
-                done_reading_stream_types = 1;
-            }
-                                     
-            free(descriptor_buf);
+            memcpy(stream->pmt_info.tablebuf + stream->pmt_info.tablepos, buf + 4 + adapt_len + pointer_len, amount_to_copy);
+            stream->pmt_info.tablepos += amount_to_copy;
     }
-    
-    return 1;
+
+    return 0;
 }
 
-int decode_PAT(unsigned char *buf, unsigned int *program_num, unsigned int *network_PID, unsigned int *program_map_PID)
+int decode_PAT(unsigned char *buf, hb_stream_t *stream)
 {
-//    int maxchannels = 8;
-//    static ATSC_CHANNEL_INFO* channels;
-//
-//    if (channels == NULL)
-//      channels = (ATSC_CHANNEL_INFO*) malloc(maxchannels * sizeof(ATSC_CHANNEL_INFO));
-//      
-//    int numchannels;
-
     unsigned char tablebuf[1024];
     unsigned int tablepos = 0;
     
@@ -1029,21 +1302,21 @@ int decode_PAT(unsigned char *buf, unsigned int *program_num, unsigned int *netw
     {
             memcpy(tablebuf + tablepos, buf + 4 + adapt_len + 1, pointer_len - 1);
 
+                       
             unsigned int pos = 0;
             //while (pos < tablepos)
             {
                     set_buf(tablebuf + pos, tablepos - pos, 0);
 
                     unsigned char section_id   = get_bits(8);
-                                                                              get_bits(4);
+                    get_bits(4);
                     unsigned int section_len   = get_bits(12);
-                    unsigned int transport_id  = get_bits(16);
-                                                                              get_bits(2);
-                    unsigned int version_num   = get_bits(5);
-                    unsigned int current_next  = get_bits(1);
-                    unsigned int section_num   = get_bits(8);
-                    unsigned int last_section  = get_bits(8);
-//                    unsigned int protocol_ver        = get_bits(8);
+                    get_bits(16); // transport_id
+                    get_bits(2);
+                    get_bits(5);  // version_num
+                    get_bits(1);  // current_next
+                    get_bits(8);  // section_num
+                    get_bits(8);  // last_section
 
                     switch (section_id)
                     {
@@ -1053,29 +1326,24 @@ int decode_PAT(unsigned char *buf, unsigned int *program_num, unsigned int *netw
                           section_len -= 5;    // Already read transport stream ID, version num, section num, and last section num
                           section_len -= 4;   // Ignore the CRC
                           int curr_pos = 0;
-                          while (curr_pos < section_len)
+                                                 stream->ts_number_pat_entries = 0;
+                          while ((curr_pos < section_len) && (stream->ts_number_pat_entries < kMaxNumberPMTStreams))
                           {
                             unsigned int pkt_program_num = get_bits(16);
-                            if (program_num)
-                              *program_num = pkt_program_num;
+                                                       stream->pat_info[stream->ts_number_pat_entries].program_number = pkt_program_num;
                               
                             get_bits(3);  // Reserved
                             if (pkt_program_num == 0)
                             {
-                              unsigned int pkt_network_PID = get_bits(13);
-//                              printf("PAT - Transport ID = 0x%x (%d) program_num 0x%x (%d) network_PID = 0x%x (%d)\n", transport_id, transport_id, pkt_program_num, pkt_program_num, pkt_network_PID, pkt_network_PID);
-                              if (network_PID)
-                                *network_PID = pkt_network_PID;
-                                
+                              get_bits(13); // pkt_network_id
                             }
                             else
                             {
                               unsigned int pkt_program_map_PID = get_bits(13);
-//                              printf("PAT - Transport ID = 0x%x (%d) program_num 0x%x (%d) program_map_PID = 0x%x (%d)\n", transport_id, transport_id, pkt_program_num, pkt_program_num, pkt_program_map_PID, pkt_program_map_PID);
-                              if (program_map_PID)
-                                *program_map_PID = pkt_program_map_PID;
+                                stream->pat_info[stream->ts_number_pat_entries].program_map_PID = pkt_program_map_PID;
                             }
                             curr_pos += 4;
+                                                       stream->ts_number_pat_entries++;
                           }
                         }
                         break;
@@ -1101,11 +1369,6 @@ static int flushbuf(hb_stream_t *stream)
 {
        int old_write_index = stream->ps_current_write_buffer_index;
 
-       if (stream->debug_output)
-       {
-               fwrite(stream->ps_decode_buffer[stream->ps_current_write_buffer_index].data, stream->ps_decode_buffer[stream->ps_current_write_buffer_index].len, 1, stream->debug_output);
-       }
-       
        // Flip the buffers and start moving on to the next
        stream->ps_current_write_buffer_index++;
        if (stream->ps_current_write_buffer_index > kNumDecodeBuffers-1)
@@ -1290,12 +1553,13 @@ int generate_output_data(hb_stream_t *stream, int write_ac3, int curstream, int
                        
                        if (write_ac3)
                        {
-                               // Make a four byte ac3 streamid
-                               ac3_substream_id[0] = 0x80;     // Four byte AC3 CODE??
-                               ac3_substream_id[1] = 0x01;
-                               ac3_substream_id[2] = 0x00;     // WHY???  OH WHY??
-                               ac3_substream_id[3] = 0x02;
-                               ac3len = 4;
+                // Make a four byte DVD ac3 stream header
+                int ssid = (curstream - stream->ts_number_video_pids) & 0xf;
+                ac3_substream_id[0] = 0x80 | ssid;  // substream id
+                ac3_substream_id[1] = 0x01;         // number of sync words
+                ac3_substream_id[2] = 0x00;         // first offset (16 bits)
+                ac3_substream_id[3] = 0x02;
+                ac3len = 4;
                        }
                        
                        int written = 0;        // Bytes we've written to output file
@@ -1303,7 +1567,6 @@ int generate_output_data(hb_stream_t *stream, int write_ac3, int curstream, int
                        
                        for (;;)
                        {
-//                             int64_t fpos = ftell64(fout);
                                if ((stream->ps_decode_buffer[stream->ps_current_write_buffer_index].len % HB_DVD_READ_BUFFER_SIZE) != 0)
                                {
                                        hb_log("write_output_stream - Packet's not falling on read buffer size boundries!");
@@ -1330,25 +1593,8 @@ int generate_output_data(hb_stream_t *stream, int write_ac3, int curstream, int
                                        return 1;
                                }
 
-//                             if (pid == stream->ts_audio_pids[0])
-//                                     stream->ts_packetbuf[curstream][pos + 3] = stream->ts_streamid[kAudioStream];
-//                             else
-//                                     stream->ts_packetbuf[curstream][pos + 3] = stream->ts_streamid[kVideoStream];
-                               int index_of_selected_pid = -1;
-                               if ((index_of_selected_pid = index_of_video_pid(pid,stream)) < 0)
-                               {
-                                       if ((index_of_selected_pid = index_of_audio_pid(pid,stream)) < 0)
-                                       {
-                                               hb_log("generate_output_data - cannot find pid 0x%x (%d) in selected audio or video pids", pid, pid);
-                                               return 0;
-                                       }
-                                       else
-                                       {
-                                               stream->ts_packetbuf[curstream][pos + 3] = stream->ts_streamid[stream->ts_number_video_pids + index_of_selected_pid];
-                                       }
-                               }
-                               else
-                                       stream->ts_packetbuf[curstream][pos + 3] = stream->ts_streamid[index_of_selected_pid];
+                stream->ts_packetbuf[curstream][pos + 3] =
+                    stream->ts_streamid[curstream];
 
                                // Packet length..
                                // Subtract pack size (14) and pes id and len (6) from lenth
@@ -1402,10 +1648,12 @@ int generate_output_data(hb_stream_t *stream, int write_ac3, int curstream, int
 
                                // Add pes header for next packet
                                pos -= 9;
-//                             make_pes_header(stream->ts_packetbuf[curstream] + pos, (pid == stream->ts_video_pids[0] ? stream->ts_streamid[kVideoStream] : stream->ts_streamid[kAudioStream]), 0, -1, -1);
                                make_pes_header(stream->ts_packetbuf[curstream] + pos, stream->ts_streamid[curstream], 0, -1, -1);
                        }
 
+                       stream->ts_packetpos[curstream] = 0;
+                       stream->ts_streamcont[curstream] = -1;
+
                        // Write padding
                        if ((written % HB_DVD_READ_BUFFER_SIZE) != 0)
                        {
@@ -1419,9 +1667,6 @@ int generate_output_data(hb_stream_t *stream, int write_ac3, int curstream, int
                                }
                        }
 
-                       stream->ts_packetpos[curstream] = 0;
-                       stream->ts_streamcont[curstream] = -1;
-
        return 0;
 }
 
@@ -1464,9 +1709,7 @@ static int hb_ts_handle_ac3_audio(hb_stream_t *stream, int curstream, unsigned c
 
        // Check the next packet to make sure IT starts with a 0x0b77
        int plen = 0;
-//                                     if (buf[4 + adapt_len] == 0 && buf[4 + adapt_len + 1] == 0 &&           // Starting with an mpeg header?
-//                                             buf[4 + adapt_len + 2] == 1 && buf[4 + adapt_len + 3] == 0xBD)
-                       plen = 9 + buf[4 + adapt_len + 8];
+    plen = 9 + buf[4 + adapt_len + 8];
        int pstart = 4 + adapt_len + plen;
        if (buf[pstart] != 0x0b || buf[pstart + 1] != 0x77)
        {
@@ -1510,12 +1753,6 @@ static int hb_ts_handle_ac3_audio(hb_stream_t *stream, int curstream, unsigned c
 static void hb_ts_stream_find_pids(hb_stream_t *stream)
 {
        unsigned char buf[188];
-       int curstream = 0;
-
-       // Stream ID info
-       unsigned int program_num = 0;
-       unsigned int network_PID = 0;
-       unsigned int program_map_PID = 0;
 
        // align to first packet
        align_to_next_packet(stream->file_handle);
@@ -1539,66 +1776,65 @@ static void hb_ts_stream_find_pids(hb_stream_t *stream)
                }
                else
                {
-//                     curfilepos += bytesRead;
                        bytesReadInPacket = 0;
                }
 
                // Check sync byte
                if ((buf[0] != 0x47) && (buf[0] != 0x72) && (buf[0] != 0x29))
                {
-//                     __int64 pos = ftell64(fin);
                        hb_log("hb_ts_stream_find_pids - Bad transport packet (no sync byte 0x47)!");
                        int i = 0;
                        for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
                                stream->ts_skipbad[i] = 1;
-//                     stream->ts_skipbad[kAudioStream] = stream->ts_skipbad[kVideoStream] = 1;
                        continue;
                }
 
                // Get pid
                int pid = (((buf[1] & 0x1F) << 8) | buf[2]) & 0x1FFF;
                 
-                if ((pid == 0x0000) && (program_num == 0))
-                {
-                  decode_PAT(buf, &program_num, &network_PID, &program_map_PID);
-                  continue;
-                }
-                
-                if (pid == 0x1ffb)
-                {
-                  printf("Need to decode PSIP data !\n");
-                  continue;
-                }
-                
-                if ((network_PID > 0) && (pid == network_PID))
-                {
-                  printf("Need to Decode network PID section !\n");
-                  continue;
-                }
-                
-                if ((program_map_PID > 0) && (pid == program_map_PID))
-                {
-                  decode_program_map(buf, stream);
-                  break;;
-                }
-                
-                // Skip until we have a complete set of PIDs
-                if ((stream->ts_number_video_pids == 0) || (stream->ts_number_audio_pids == 0))
-                  continue;
-               }
-               
-               hb_log("hb_ts_stream_find_pids - found the following PIDS");
-               hb_log("    Video PIDS : ");
-               int i=0;
-               for (i=0; i < stream->ts_number_video_pids; i++)
+        if ((pid == 0x0000) && (stream->ts_number_pat_entries == 0))
                {
-                       hb_log("      0x%x (%d)", stream->ts_video_pids[i], stream->ts_video_pids[i]);
+                 decode_PAT(buf, stream);
+                 continue;
                }
-               hb_log("    Audio PIDS : ");
-               for (i = 0; i < stream->ts_number_audio_pids; i++)
+               
+               int pat_index = 0;
+               for (pat_index = 0; pat_index < stream->ts_number_pat_entries; pat_index++)
                {
-                       hb_log("      0x%x (%d)", stream->ts_audio_pids[i], stream->ts_audio_pids[i]);
+                       // There are some streams where the PAT table has multiple entries as if their are
+                       // multiple programs in the same transport stream, and yet there's actually only one
+                       // program really in the stream. This seems to be true for transport streams that
+                       // originate in the HDHomeRun but have been output by EyeTV's export utility. What I think
+                       // is happening is that the HDHomeRun is sending the entire transport stream as broadcast, 
+                       // but the EyeTV is only recording a single (selected) program number and not rewriting the 
+                       // PAT info on export to match what's actually on the stream.
+                       // Until we have a way of handling multiple programs per transport stream elegantly we'll match
+                       // on the first pat entry for which we find a matching program map PID.  The ideal solution would
+                       // be to build a title choice popup from the PAT program number details and then select from
+                       // their - but right now the API's not capable of that.
+                       if (pid == stream->pat_info[pat_index].program_map_PID)
+                       {
+                         if (build_program_map(buf, stream) > 0)
+                               break;
+                       }
                }
+               // Keep going  until we have a complete set of PIDs
+               if ((stream->ts_number_video_pids > 0) && (stream->ts_number_audio_pids > 0))
+                 break;
+       }
+       
+       hb_log("hb_ts_stream_find_pids - found the following PIDS");
+       hb_log("    Video PIDS : ");
+       int i=0;
+       for (i=0; i < stream->ts_number_video_pids; i++)
+       {
+               hb_log("      0x%x (%d)", stream->ts_video_pids[i], stream->ts_video_pids[i]);
+       }
+       hb_log("    Audio PIDS : ");
+       for (i = 0; i < stream->ts_number_audio_pids; i++)
+       {
+               hb_log("      0x%x (%d)", stream->ts_audio_pids[i], stream->ts_audio_pids[i]);
+       }
  }
 
 int index_of_video_pid(int pid, hb_stream_t *stream)
@@ -1617,21 +1853,6 @@ int index_of_audio_pid(int pid, hb_stream_t *stream)
 {
        int i = 0, found_pid = -1;
 
-       // If a selected audio pid index has been set it indicates
-       // which of the potential pids we need to output so only return
-       // that index for the appropriate pid. Other pids should just
-       // be ignored.
-       if (stream->ts_selected_audio_pid_index >= 0) 
-       {
-               if (pid == stream->ts_audio_pids[stream->ts_selected_audio_pid_index])
-                       return stream->ts_selected_audio_pid_index;
-               else
-                       return -1;
-       }
-       
-       // If no specific pid index is set then we're probably just gathering
-       // pid and/or stream information (during DecodePreviews for example)
-       // so return the appropriate index
        for (i = 0; (i < stream->ts_number_audio_pids) && (found_pid < 0); i++)
        {
                if (pid == stream->ts_audio_pids[i])
@@ -1679,35 +1900,25 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                return;
        }
        
-       int bytesReadInPacket = 0;
        int curr_write_buffer_index = stream->ps_current_write_buffer_index;
        
        // Write output data until a buffer switch occurs.
        while (curr_write_buffer_index == stream->ps_current_write_buffer_index)
        {
-               // Try to read packet..
-               int bytesRead;
-               if ((bytesRead = fread(buf+bytesReadInPacket, 1, 188-bytesReadInPacket, stream->file_handle)) != 188-bytesReadInPacket)
-               {
-                       if (bytesRead < 0)
-                               bytesRead = 0;
-                       bytesReadInPacket += bytesRead;
-
-                       // Flush any outstanding output data - we're done here.
-                       flushbuf(stream);
-                       break;
-               }
-               else
+      if ((fread(buf, 188, 1, stream->file_handle)) != 1)
                {
-//                     curfilepos += bytesRead;
-                       bytesReadInPacket = 0;
+            // end of file - we didn't finish filling our ps write buffer
+            // so just discard the remainder (the partial buffer is useless)
+            hb_log("hb_ts_stream_decode - eof");
+            stream->ps_decode_buffer[stream->ps_current_write_buffer_index].len = 0;
+         return;
                }
 
                // Check sync byte
                if ((buf[0] != 0x47) && (buf[0] != 0x72) && (buf[0] != 0x29))
                {
-//                     __int64 pos = ftell64(fin);
-                       hb_log("hb_ts_stream_decode - Bad transport packet (no sync byte 0x47)!");
+            off_t pos = ftello(stream->file_handle);
+            hb_log("hb_ts_stream_decode - no sync byte 0x47 @ %lld",  pos);
                        for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
                        {
                //      stream->ts_skipbad[kAudioStream] = stream->ts_skipbad[kVideoStream] = 1;
@@ -1719,40 +1930,24 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                // Get pid
                int pid = (((buf[1] & 0x1F) << 8) | buf[2]) & 0x1FFF;
 
-               // Skip this block
-               if (index_of_pid(pid, stream) < 0)
-                       continue;
-//             if (pid != stream->ts_audio_pids[0] && pid != stream->ts_video_pids[0])
-//                     continue;
-
                // Get the pos and buf - we organize our streams as 'n' video streams then 'm' audio streams
-               int index_of_selected_pid = -1;
+      int index_of_selected_pid;
                if ((index_of_selected_pid = index_of_video_pid(pid,stream)) < 0)
                {
                        // Not a video PID perhaps audio ?
                        if ((index_of_selected_pid = index_of_audio_pid(pid,stream)) < 0)
                        {
-                               hb_log("hb_ts_stream_decode - Unknown pid 0x%x (%d)", pid, pid);
+            // not a pid we want
                                continue;
                        }
                        else
                        {
                                curstream = stream->ts_number_video_pids + index_of_selected_pid;
-                               if (curstream > kMaxNumberDecodeStreams)
-                               {
-                                       hb_log("hb_ts_stream_decode - Too many streams %d", curstream);
-                                       continue;
-                               }
                        }
                }
                else
                        curstream = index_of_selected_pid;
                
-//             if (pid == stream->ts_video_pids[0])
-//                     curstream = 0;
-//             else
-//                     curstream = 1;
-
                // Get start code
                int start;
                start = (buf[1] & 0x40) != 0;
@@ -1774,8 +1969,9 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                int adapt_len = 0;
 
                // Get continuity
+        // Continuity only increments for adaption values of 0x3 or 0x01
                int continuity = (buf[3] & 0xF);
-               if ((stream->ts_streamcont[curstream] != -1) && (adaption & 0x01 == 0x01))              // Continuity only increments for adaption values of 0x3 or 0x01
+        if ((stream->ts_streamcont[curstream] != -1) && ((adaption & 0x01) != 0))
                {
                        if (continuity != ((stream->ts_streamcont[curstream] + 1) & 0xF))
                        {
@@ -1794,7 +1990,6 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                        {
                                stream->ts_skipbad[i] = 1;
                        }
-               //      stream->ts_skipbad[kAudioStream] = stream->ts_skipbad[kVideoStream] = 1;
                        continue;
                }
                else if (adaption == 0x2)
@@ -1804,19 +1999,19 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                        adapt_len = buf[4] + 1;
                        if (adapt_len > 184)
                        {
-                               hb_log("hb_ts_stream_decode - Invalid adapt len (was > 183)!");
+                               hb_log("hb_ts_stream_decode - Invalid adapt len %d", adapt_len);
                                for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
                                {
                                        stream->ts_skipbad[i] = 1;
                                }
-//                             stream->ts_skipbad[kAudioStream] = stream->ts_skipbad[kVideoStream] = 1;
                        }
                }
 
                // HBO is slick, it doesn't bother to sync AC3 packets with PES elementary stream packets.. so
                // we have to swizzle them together!  (ARGHH!)
-//             if (pid == stream->ts_audio_pids[0] && start)
-               if ((index_of_audio_pid(pid, stream) >= 0) && start)
+               if (start && curstream >= stream->ts_number_video_pids &&
+            stream->ts_audio_stream_type[curstream - stream->ts_number_video_pids]
+              != 0x03)
                {
                        // Is there an AC3 packet start 0b77 code in this packet??
                        int sync_found = 0;
@@ -1834,35 +2029,17 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                        // Couldn't find an AC3 sync start in this packet.. don't make a PES packet!
                        if (!sync_found)
                        {
-//                                     int pos = ftell(fin);
-//                                     error("AC3 packet sync not found in start frame");
-//                                     return 1;
-                               adapt_len += 9 + buf[4 + adapt_len + 8];        
+                               adapt_len = 184;        
                                start = 0;
                        }
                }
 
-               // Get PCR
-               if (start && (adaption & 0x2) && (buf[5] & 0x10))
-               {
-                       int64_t PCR_base = ((int64_t)buf[6] << 25) | ((int64_t)buf[7] << 17) | 
-                                 ((int64_t)buf[8] << 9) | ((int64_t)buf[9] << 1) | ((int64_t)buf[10] >> 7);
-                       int64_t PCR_ext = ((int64_t)(buf[10] & 0x1) << 8) | ((int64_t)buf[11]);
-                       int64_t PCR = PCR_base * 300 + PCR_ext;
-               }
-
-               // Get random
-//             bool random = false;
-//             if (start && (adaption & 0x2))
-//                     random = (buf[5] & 0x40) != 0;          // BUG: SOME TS STREAMS DON'T HAVE THE RANDOM BIT (ABC!! ALIAS)
-
                // Found a random access point (now we can start a frame/audio packet..)
                if (start)
                {
                        // Check to see if this is an i_frame (group of picture start)
                        if (pid == stream->ts_video_pids[0])
                        {
-//                                printf("Found Video Start for pid 0x%x\n", pid);
                                // Look for the Group of Pictures packet.. indicates this is an I-Frame packet..
                                doing_iframe = 0;
                                unsigned int strid = 0;
@@ -1884,8 +2061,6 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                                                // picture_header, let's see if it's an I-frame
                                                if (i<187)
                                                {
-//                                                     int pic_start_code = (buf[i+2] >> 3) & 0x07;
-//                                                     hb_log("hb_ts_stream_decode - picture_start_code header value = 0x%x (%d)", pic_start_code, pic_start_code);
                                                        // check if picture_coding_type == 1
                                                        if ((buf[i+2] & (0x7 << 3)) == (1 << 3))
                                                        {
@@ -1930,20 +2105,17 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                {
                        // Save the substream id block so we can added it to subsequent blocks
                        int write_ac3 = 0;
-//                     if (pid == stream->ts_audio_pids[0] /*&& audstreamid == 0xBD*/)
-                       if (index_of_audio_pid(pid, stream) >= 0)
+            if (curstream >= stream->ts_number_video_pids)
                        {
-                               if ((stream->ts_audio_stream_type[curstream] == 0x04) || (stream->ts_audio_stream_type[curstream] == 0x81))
-                               {
-                                       write_ac3 = hb_ts_handle_ac3_audio(stream, curstream, buf, adapt_len);
-                               }
-                               else if (stream->ts_audio_stream_type[curstream] == 0x03)
+                               // Curstream is a zero based index of streams and includes both video and audio streams, so we must subtract the numver of video streams
+                               // from the indes value used here since ts_audio_stream_type is indexed only by audio streams.
+                if (stream->ts_audio_stream_type[curstream - stream->ts_number_video_pids] == 0x03)
                                {
                                        hb_ts_handle_mpeg_audio(stream, curstream, buf, adapt_len);
                                }
                                else
                                {
-                                       hb_log("hb_ts_stream_decode - Unknown Audio Stream type ! 0x%x (%d)", stream->ts_audio_stream_type[curstream], stream->ts_audio_stream_type[curstream]);
+                    write_ac3 = hb_ts_handle_ac3_audio(stream, curstream, buf, adapt_len);
                                }
                        }
                
@@ -1952,8 +2124,17 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
                }
 
                // Add the payload for this packet to the current buffer
-               if (stream->ts_foundfirst[curstream] && (184 - adapt_len) > 0)
+               if (!stream->ts_skipbad[curstream] && stream->ts_foundfirst[curstream] &&
+            (184 - adapt_len) > 0)
                {
+            // XXX this shouldn't happen but we'll be paranoid
+            if (stream->ts_packetpos[curstream] + 184 - adapt_len > 1024*1024)
+            {
+                hb_log("hb_ts_stream_decode: ts_packetbuf overflow, pos = %d ,"
+                       "len = %d", stream->ts_packetpos[curstream],
+                       184 - adapt_len );
+                return;
+            }
                        memcpy(stream->ts_packetbuf[curstream] + stream->ts_packetpos[curstream], buf + 4 + adapt_len, 184 - adapt_len);
                        stream->ts_packetpos[curstream] += 184 - adapt_len;
                }