OSDN Git Service

Provide more feedback as to the types of the streams in an MPEG Transport stream
[handbrake-jp/handbrake-jp-git.git] / libhb / stream.c
index 0af712c..478aef1 100755 (executable)
 
 #define min(a, b) a < b ? a : b
 
-typedef enum { hb_stream_type_unknown = 0, hb_stream_type_transport, hb_stream_type_program } hb_stream_type_t;
-
-#define kMaxNumberDecodeStreams 8
-#define kMaxNumberVideoPIDS 16
-#define kMaxNumberAudioPIDS 16
-//#define kVideoStream 0
-//#define kAudioStream 1
-#define kNumDecodeBuffers 2
+typedef enum {
+    hb_stream_type_unknown = 0,
+    hb_stream_type_transport,
+    hb_stream_type_program
+} hb_stream_type_t;
+
+#define kMaxNumberVideoPIDS 1
+#define kMaxNumberAudioPIDS 15
+#define kMaxNumberDecodeStreams (kMaxNumberVideoPIDS+kMaxNumberAudioPIDS)
 #define kMaxNumberPMTStreams 32
 
-#define CLOCKRATE              ((int64_t)27000000)                     // MPEG System clock rate
-#define STREAMRATE             ((int64_t)2401587)                      // Original HD stream rate 19.2 Mbps
-#define DEMUX                  (((int)STREAMRATE * 8) / 50)// Demux value for HD content STREAMRATE / 50
 
 struct hb_stream_s
 {
-    char         * path;
-       FILE             * file_handle;
-       hb_stream_type_t stream_type;
-
-       int                              ps_current_write_buffer_index;
-       int                              ps_current_read_buffer_index;
-
-       struct {
-               int                              size;
-               int                              len;
-               int                              read_pos;
-               int                              write_pos;
-               unsigned char *  data;
-       } ps_decode_buffer[kNumDecodeBuffers];
-
-       struct {
-               int lang_code;
-               int flags;
-               int rate;
-               int bitrate;
-       } a52_info[kMaxNumberAudioPIDS];
-
-       int                              ts_video_pids[kMaxNumberVideoPIDS];
-       int                              ts_audio_pids[kMaxNumberAudioPIDS];
-
-       int                              ts_number_video_pids;
-       int                              ts_number_audio_pids;
-
-       unsigned char*   ts_packetbuf[kMaxNumberDecodeStreams];
-       int                              ts_packetpos[kMaxNumberDecodeStreams];
-//     int                              ts_bufpackets[kMaxNumberDecodeStreams];
-       int                              ts_foundfirst[kMaxNumberDecodeStreams];
-       int                              ts_skipbad[kMaxNumberDecodeStreams];
-       int                              ts_streamcont[kMaxNumberDecodeStreams];
-       int                              ts_streamid[kMaxNumberDecodeStreams];
-       int                              ts_audio_stream_type[kMaxNumberAudioPIDS];
-
-       struct
-       {
-               unsigned short program_number;
-               unsigned short program_map_PID;
-       } pat_info[kMaxNumberPMTStreams];
-       int      ts_number_pat_entries;
+    int     frames;             /* video frames so far */
+    int     errors;             /* total errors so far */
+    int     last_error_frame;   /* frame # at last error message */
+    int     last_error_count;   /* # errors at last error message */
+
+    int64_t ts_lastpcr;         /* the last pcr we found in the TS stream */
+    int64_t ts_nextpcr;         /* the next pcr to put in a PS packet */
+
+    uint8_t *ts_buf[kMaxNumberDecodeStreams];
+    int     ts_pos[kMaxNumberDecodeStreams];
+    int8_t  ts_foundfirst[kMaxNumberDecodeStreams];
+    int8_t  ts_skipbad[kMaxNumberDecodeStreams];
+    int8_t  ts_streamcont[kMaxNumberDecodeStreams];
+    int8_t  ts_start[kMaxNumberDecodeStreams];
+
+    uint8_t *fwrite_buf;        /* PS buffer (set by hb_ts_stream_decode) */
+    uint8_t *fwrite_buf_orig;   /* PS buffer start (set by hb_ts_stream_decode) */
+
+    /*
+     * Stuff before this point is dynamic state updated as we read the
+     * stream. Stuff after this point is stream description state that
+     * we learn during the initial scan but cache so it can be
+     * reused during the conversion read.
+     */
+    int16_t ts_video_pids[kMaxNumberVideoPIDS];
+    int16_t ts_audio_pids[kMaxNumberAudioPIDS];
+
+    uint8_t ts_number_video_pids;
+    uint8_t ts_number_audio_pids;
+
+    uint8_t ts_streamid[kMaxNumberDecodeStreams];
+    uint8_t ts_video_stream_type[kMaxNumberDecodeStreams];
+    uint8_t ts_audio_stream_type[kMaxNumberDecodeStreams];
+
+    char    *path;
+    FILE    *file_handle;
+    hb_stream_type_t stream_type;
+    int     opentype;
+
+    struct {
+        int lang_code;
+        int flags;
+        int rate;
+        int bitrate;
+    } a52_info[kMaxNumberAudioPIDS];
+
+    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;
+    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;
 };
 
 /***********************************************************************
@@ -100,9 +107,8 @@ struct hb_stream_s
 static void hb_stream_duration(hb_stream_t *stream, hb_title_t *inTitle);
 static void hb_ts_stream_init(hb_stream_t *stream);
 static void hb_ts_stream_find_pids(hb_stream_t *stream);
-static void hb_ts_stream_decode(hb_stream_t *stream);
+static int hb_ts_stream_decode(hb_stream_t *stream, uint8_t *obuf);
 static void hb_ts_stream_reset(hb_stream_t *stream);
-static void hb_stream_put_back(hb_stream_t *stream, int i);
 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);
@@ -111,12 +117,35 @@ 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.
+ * everything when reader does an open. So we save the stream state on
+ * the close following a scan and reuse it when 'reader' does an open.
  */
-static hb_stream_t *current_stream;
+static hb_list_t *stream_state_list;
+
+static hb_stream_t *hb_stream_lookup( const char *path )
+{
+    if ( stream_state_list == NULL )
+        return NULL;
+
+    hb_stream_t *ss;
+    int i = 0;
+
+    while ( ( ss = hb_list_item( stream_state_list, i++ ) ) != NULL )
+    {
+        if ( strcmp( path, ss->path ) == 0 )
+        {
+            break;
+        }
+    }
+    return ss;
+}
 
+static void hb_stream_state_delete( hb_stream_t *ss )
+{
+    hb_list_rem( stream_state_list, ss );
+    free( ss->path );
+    free( ss );
+}
 
 static inline int check_ps_sync(const uint8_t *buf)
 {
@@ -186,10 +215,8 @@ static int hb_stream_get_type(hb_stream_t *stream)
     return 0;
 }
 
-static void hb_stream_delete( hb_stream_t ** _d )
+static void hb_stream_delete_dynamic( hb_stream_t *d )
 {
-    hb_stream_t * d = *_d;
-
     if( d->file_handle )
     {
         fclose( d->file_handle );
@@ -197,26 +224,22 @@ static void hb_stream_delete( hb_stream_t ** _d )
     }
 
        int i=0;
-       for (i = 0; i < kNumDecodeBuffers; i++)
-       {
-               if (d->ps_decode_buffer[i].data)
-               {
-                       free(d->ps_decode_buffer[i].data);
-                       d->ps_decode_buffer[i].data = NULL;
-               }
-       }
 
        for (i = 0; i < kMaxNumberDecodeStreams; i++)
        {
-               if (d->ts_packetbuf[i])
+               if (d->ts_buf[i])
                {
-                       free(d->ts_packetbuf[i]);
-                       d->ts_packetbuf[i] = NULL;
+                       free(d->ts_buf[i]);
+                       d->ts_buf[i] = NULL;
                }
        }
+}
+
+static void hb_stream_delete( hb_stream_t *d )
+{
+    hb_stream_delete_dynamic( d );
     free( d->path );
     free( d );
-    *_d = NULL;
 }
 
 /***********************************************************************
@@ -224,32 +247,83 @@ static void hb_stream_delete( hb_stream_t ** _d )
  ***********************************************************************
  *
  **********************************************************************/
-hb_stream_t * hb_stream_open( char * path )
+hb_stream_t * hb_stream_open( char *path, int opentype )
 {
-    if (current_stream)
+
+    FILE *f = fopen( path, "r" );
+    if ( f == NULL )
     {
-        if (strcmp( path, current_stream->path ) == 0 )
-        {
-            hb_stream_seek( current_stream, 0. );
-            return current_stream;
-        }
-        hb_stream_delete( &current_stream );
+        hb_log( "hb_stream_open: open %s failed", path );
+        return NULL;
     }
+
     hb_stream_t *d = calloc( sizeof( hb_stream_t ), 1 );
+    if ( d == NULL )
+    {
+        fclose( f );
+        hb_log( "hb_stream_open: can't allocate space for %s stream state", path );
+        return NULL;
+    }
 
-    /* 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" ) ) )
+    /*
+     * if we're opening the stream to read & convert, we need
+     * the state we saved when we scanned the stream. if we're
+     * opening the stream to scan it we want to rebuild the state
+     * (even if we have saved state, the stream may have changed).
+     */
+    hb_stream_t *ss = hb_stream_lookup( path );
+    if ( opentype == 1 )
     {
+        /* opening to read - we must have saved state */
+        if ( ss == NULL )
+        {
+            hb_log( "hb_stream_open: error: re-opening %s but no scan state", path );
+            fclose( f );
+            free( d );
+            return NULL;
+        }
+        /*
+         * copy the saved state since we might be encoding the same stream
+         * multiple times.
+         */
+        memcpy( d, ss, sizeof(*d) );
+        d->file_handle = f;
+        d->opentype = opentype;
         d->path = strdup( path );
-        if (d->path != NULL &&  hb_stream_get_type( d ) != 0 )
+
+        if ( d->stream_type == hb_stream_type_transport )
         {
-            current_stream = d;
-            return d;
+            int i = 0;
+            for ( ; i < d->ts_number_video_pids + d->ts_number_audio_pids; i++)
+            {
+                d->ts_buf[i] = malloc( HB_DVD_READ_BUFFER_SIZE );
+            }
+            hb_stream_seek( d, 0. );
         }
-        fclose( d->file_handle );
-        if (d->path)
-            free( d->path );
+        return d;
+    }
+
+    /*
+     * opening for scan - delete any saved state then (re)scan the stream.
+     * If it's something we can deal with (MPEG2 PS or TS) return a stream
+     * reference structure & null otherwise.
+     */
+
+    if ( ss != NULL )
+    {
+        hb_stream_state_delete( ss );
+    }
+    d->file_handle = f;
+    d->opentype = opentype;
+    d->path = strdup( path );
+    if (d->path != NULL &&  hb_stream_get_type( d ) != 0 )
+    {
+        return d;
+    }
+    fclose( d->file_handle );
+    if (d->path)
+    {
+        free( d->path );
     }
     hb_log( "hb_stream_open: open %s failed", path );
     free( d );
@@ -263,6 +337,31 @@ hb_stream_t * hb_stream_open( char * path )
  **********************************************************************/
 void hb_stream_close( hb_stream_t ** _d )
 {
+    hb_stream_t *stream = * _d;
+    if ( stream->frames )
+    {
+        hb_log( "stream: %d good frames, %d errors (%.0f%%)", stream->frames,
+                stream->errors, (double)stream->errors * 100. /
+                (double)stream->frames );
+    }
+    /*
+     * if the stream was opened for a scan, cache the result, otherwise delete
+     * the state.
+     */
+    if ( stream->opentype == 0 )
+    {
+        hb_stream_delete_dynamic( stream );
+        if ( stream_state_list == NULL )
+        {
+            stream_state_list = hb_list_init();
+        }
+        hb_list_add( stream_state_list, stream );
+    }
+    else
+    {
+        hb_stream_delete( stream );
+    }
+    *_d = NULL;
 }
 
 /* when the file was first opened we made entries for all the audio elementary
@@ -278,14 +377,27 @@ static void hb_stream_delete_audio_entry(hb_stream_t *stream, int indx)
     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];
+        stream->ts_audio_stream_type[1 + indx] = stream->ts_audio_stream_type[1+i];
+        stream->ts_streamid[1 + indx] = stream->ts_streamid[1 + i];
         ++indx;
     }
     --stream->ts_number_audio_pids;
 }
 
+static int index_of_pid(int pid, hb_stream_t *stream)
+{
+    int i;
+
+    if ( pid == stream->ts_video_pids[0] )
+        return 0;
+
+    for ( i = 0; i < stream->ts_number_audio_pids; ++i )
+        if ( pid == stream->ts_audio_pids[i] )
+            return i + 1;
+
+    return -1;
+}
+
 /***********************************************************************
  * hb_ps_stream_title_scan
  ***********************************************************************
@@ -333,7 +445,7 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream)
         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)
+            if (audio->config.in.codec)
                 hb_list_add( aTitle->list_audio, audio );
             else
             {
@@ -342,6 +454,13 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream)
                 --i;
             }
         }
+
+        // add the PCR PID if we don't already have it
+        if ( index_of_pid( stream->pmt_info.PCR_PID, stream ) < 0 )
+        {
+            stream->ts_audio_pids[stream->ts_number_audio_pids++] =
+                stream->pmt_info.PCR_PID;
+        }
        }
     else
     {
@@ -539,7 +658,7 @@ static double compute_stream_rate( struct pts_pos *pp, int n )
     for ( i = 0; i < n-1; ++i )
     {
         // Bias the median filter by not including pairs that are "far"
-        // frome one another. This is to handle cases where the file is
+        // from one another. This is to handle cases where the file is
         // made of roughly equal size pieces where a symmetric choice of
         // pairs results in having the same number of intra-piece &
         // inter-piece rate estimates. This would mean that the median
@@ -597,68 +716,13 @@ static void hb_stream_duration(hb_stream_t *stream, hb_title_t *inTitle)
  **********************************************************************/
 int hb_stream_read( hb_stream_t * src_stream, hb_buffer_t * b )
 {
-  if (src_stream->stream_type == hb_stream_type_program)
-  {
-         size_t amt_read;
-         amt_read = fread(b->data, HB_DVD_READ_BUFFER_SIZE, 1, src_stream->file_handle);
-         if (amt_read > 0)
-               return 1;
-         else
-               return 0;
-  }
-  else if  (src_stream->stream_type == hb_stream_type_transport)
-  {
-       int read_buffer_index = src_stream->ps_current_read_buffer_index;
-
-       // 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)
-       {
-               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;
-       }
-       else
-       {
-               // Not quite enough data in the buffer - transfer what is present, fill the buffer and then
-               // transfer what's still needed.
-               int transfer_size = HB_DVD_READ_BUFFER_SIZE;
-               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;
-
-               // 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;
-
-               // Fill the buffer
-               hb_ts_stream_decode(src_stream);
-
-               // Decoding will almost certainly have changed the current read buffer index
-               read_buffer_index = src_stream->ps_current_read_buffer_index;
-
-               if (src_stream->ps_decode_buffer[read_buffer_index].len == 0)
-               {
-                       hb_log("hb_stream_read - buffer after decode has zero length data");
-                       return 0;
-               }
-
-               // Read the bit we still need
-               memcpy(b->data+amt_avail_to_transfer, src_stream->ps_decode_buffer[read_buffer_index].data + src_stream->ps_decode_buffer[read_buffer_index].read_pos,transfer_size);
-               src_stream->ps_decode_buffer[read_buffer_index].read_pos += transfer_size;
-
-               return 1;
-       }
-  }
-  else
-       return 0;
+    if ( src_stream->stream_type == hb_stream_type_program )
+    {
+        size_t amt_read = fread(b->data, HB_DVD_READ_BUFFER_SIZE, 1,
+                                src_stream->file_handle);
+        return (amt_read > 0);
+    }
+    return hb_ts_stream_decode( src_stream, b->data );
 }
 
 /***********************************************************************
@@ -690,31 +754,29 @@ int hb_stream_seek( hb_stream_t * src_stream, float f )
        hb_ts_stream_reset(src_stream);
   }
 
-  // Now we must scan forwards for a valid start code (0x000001BA)
-  int done = 0;
-  hb_buffer_t *buf = hb_buffer_init(HB_DVD_READ_BUFFER_SIZE);
-  while (!done)
-  {
-    if (hb_stream_read(src_stream,buf) == 1)
-    {
-      int i=0;
-      for (i=0; (i <= HB_DVD_READ_BUFFER_SIZE-4) && (!done); i++)
-      {
-        if ((buf->data[i] == 0x00) && (buf->data[i+1] == 0x00) && (buf->data[i+2] == 0x01) && (buf->data[i+3] == 0xba))
-        {
-          done = 1;
-                 // 'Put Back' the data we've just read (up to this point)
-                 hb_stream_put_back(src_stream, i);
-        }
-      }
-    }
-    else
-      done = 1;    // End of data;
-  }
-  hb_buffer_close(&buf);
   return 1;
 }
 
+static void set_audio_description( hb_audio_t *audio, iso639_lang_t *lang )
+{
+    /* XXX
+     * This is a duplicate of code in dvd.c - it should get factored out
+     * into a common routine. We probably should only be putting the lang
+     * code or a lang pointer into the audio config & let the common description
+     * formatting routine in scan.c do all the stuff below.
+     */
+    snprintf( audio->config.lang.description,
+              sizeof( audio->config.lang.description ), "%s (%s)",
+              strlen(lang->native_name) ? lang->native_name : lang->eng_name,
+              audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" :
+                  audio->config.in.codec == HB_ACODEC_DCA ? "DTS" :
+                      audio->config.in.codec == HB_ACODEC_MPGA ? "MPEG" : "LPCM" );
+    snprintf( audio->config.lang.simple, sizeof( audio->config.lang.simple ), "%s",
+              strlen(lang->native_name) ? lang->native_name : lang->eng_name );
+    snprintf( audio->config.lang.iso639_2, sizeof( audio->config.lang.iso639_2 ),
+              "%s", lang->iso639_2);
+}
+
 static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream,
                                                        int aud_pid_index)
 {
@@ -732,32 +794,37 @@ static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream,
         if (buf[3] == 0xbd)
         {
             audio->id = 0x80bd | (aud_pid_index << 8);
-            audio->codec = HB_ACODEC_AC3;
+            audio->config.in.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],
+                   stream->ts_audio_stream_type[1 + 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];
+            stream->ts_audio_stream_type[1 + aud_pid_index] = 0x81;
+            stream->ts_streamid[1 + aud_pid_index] = buf[3];
         }
         else if ((buf[3] & 0xe0) == 0xc0)
         {
             audio->id = buf[3] | aud_pid_index;
-            audio->codec = HB_ACODEC_MPGA;
+            audio->config.in.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],
+                   stream->ts_audio_stream_type[1 + 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];
+            stream->ts_audio_stream_type[1 + aud_pid_index] = 0x03;
+            stream->ts_streamid[1 + aud_pid_index] = buf[3];
         }
     }
     fseeko(stream->file_handle, cur_pos, SEEK_SET);
-    if (! audio->codec)
+    if ( audio->config.in.codec )
+    {
+               set_audio_description( audio,
+                  lang_for_code( stream->a52_info[aud_pid_index].lang_code ) );
+    }
+    else
     {
         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]);
+                stream->ts_audio_stream_type[1 + aud_pid_index]);
        }
     return audio;
 }
@@ -770,7 +837,7 @@ static void add_audio_to_title(hb_title_t *title, int id)
     switch ( id >> 12 )
     {
         case 0x0:
-            audio->codec = HB_ACODEC_MPGA;
+            audio->config.in.codec = HB_ACODEC_MPGA;
             hb_log("add_audio_to_title: added MPEG audio stream 0x%x", id);
             break;
         case 0x2:
@@ -778,11 +845,11 @@ static void add_audio_to_title(hb_title_t *title, int id)
             free( audio );
             return;
         case 0x8:
-            audio->codec = HB_ACODEC_AC3;
+            audio->config.in.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;
+            audio->config.in.codec = HB_ACODEC_LPCM;
             hb_log("add_audio_to_title: added LPCM audio stream 0x%x", id);
             break;
         default:
@@ -791,6 +858,7 @@ static void add_audio_to_title(hb_title_t *title, int id)
             return;
 
     }
+    set_audio_description( audio, lang_for_code( 0 ) );
     hb_list_add( title->list_audio, audio );
 }
 
@@ -843,189 +911,34 @@ static void hb_ps_stream_find_audio_ids(hb_stream_t *stream, hb_title_t *title)
 }
 
 /***********************************************************************
- * hb_stream_update_audio
- ***********************************************************************
- *
- **********************************************************************/
-void hb_stream_update_audio(hb_stream_t *stream, hb_audio_t *audio)
-{
-       iso639_lang_t *lang;
-
-    if (stream->stream_type == hb_stream_type_transport)
-       {
-        // 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: 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);
-               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);
-    }
-
-       if (!audio->input_channel_layout)
-       {
-               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;
-               }
-       }
-
-       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" : ( 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);
-
-       if ( (audio->ac3flags & A52_CHANNEL_MASK) == A52_DOLBY ) {
-               sprintf( audio->lang + strlen( audio->lang ),
-                        " (Dolby Surround)" );
-       } else {
-               sprintf( audio->lang + strlen( audio->lang ),
-                        " (%d.%d ch)",
-                       HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT(audio->input_channel_layout) +
-                       HB_INPUT_CH_LAYOUT_GET_DISCRETE_REAR_COUNT(audio->input_channel_layout),
-                       HB_INPUT_CH_LAYOUT_GET_DISCRETE_LFE_COUNT(audio->input_channel_layout));
-       }
-
-       hb_log( "hb_stream_update_audio: id=%x, lang=%s, 3cc=%s, rate = %d, bitrate = %d, flags = 0x%x (%d)", audio->id, audio->lang, audio->iso639_2, audio->rate, audio->bitrate, audio->ac3flags, audio->ac3flags );
-
-}
-
-/***********************************************************************
- * hb_stream_put_back
- ***********************************************************************
- *
- **********************************************************************/
-static void hb_stream_put_back(hb_stream_t *stream, int i)
-{
-       if (stream->stream_type == hb_stream_type_program)
-       {
-               // Program streams are pretty easy - we just reposition the source file
-               // pointer
-               fseeko(stream->file_handle, -(HB_DVD_READ_BUFFER_SIZE-i), SEEK_CUR);
-       }
-       else if (stream->stream_type == hb_stream_type_transport)
-       {
-               int read_buffer_index = stream->ps_current_read_buffer_index;
-
-               // Transport streams are a little more tricky - so long as the
-               // amount to back up is still within the current decode buffer
-               // we can just adjust the read pos.
-               if (stream->ps_decode_buffer[read_buffer_index].read_pos - i > 0)
-               {
-                       stream->ps_decode_buffer[read_buffer_index].read_pos -= i;
-               }
-               else
-                 hb_error("hb_stream_put_back - trying to step beyond the start of the buffer, read_pos = %d amt to put back = %d\n", stream->ps_decode_buffer[read_buffer_index].read_pos, i);
-       }
-}
-
-
-/***********************************************************************
  * hb_ts_stream_init
  ***********************************************************************
  *
  **********************************************************************/
- #define PS_DECODE_BUFFER_SIZE ( 1024 * 1024 * 4)
 
 static void hb_ts_stream_init(hb_stream_t *stream)
 {
-       // Output Program Stream
-       int i=0;
-       for (i=0; i < kNumDecodeBuffers; i++)
-       {
-               stream->ps_decode_buffer[i].data = (unsigned char *) malloc(PS_DECODE_BUFFER_SIZE);
-               stream->ps_decode_buffer[i].read_pos = 0;
-               stream->ps_decode_buffer[i].size = PS_DECODE_BUFFER_SIZE;
-               stream->ps_decode_buffer[i].len = 0;
-               stream->ps_decode_buffer[i].write_pos = 0;
-       }
+       int i;
 
        for (i=0; i < kMaxNumberDecodeStreams; i++)
        {
                stream->ts_streamcont[i] = -1;
        }
-
-       stream->ps_current_write_buffer_index = 0;
-       stream->ps_current_read_buffer_index = 1;
+       stream->ts_video_pids[0] = -1;
+    for ( i = 0; i < stream->ts_number_audio_pids; i++ )
+    {
+        stream-> ts_audio_pids[i] = -1;
+    }
 
        // Find the audio and video pids in the stream
        hb_ts_stream_find_pids(stream);
 
-       for (i=0; i < stream->ts_number_video_pids; i++)
-       {
-               // In progress audio/video data during the transport stream -> program stream processing
-               stream->ts_packetbuf[i] = (unsigned char *) malloc(1024 * 1024);
-               stream->ts_streamid[i] = 0xE0;          // Stream is Video
-       }
+    stream->ts_streamid[0] = 0xE0;             // stream 0 must be video
 
-       for (i = stream->ts_number_video_pids; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
+       for (i = 0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
        {
-               stream->ts_packetbuf[i] = (unsigned char *) malloc(1024 * 1024);
+        // demuxing buffer for TS to PS conversion
+               stream->ts_buf[i] = malloc( HB_DVD_READ_BUFFER_SIZE );
        }
 }
 
@@ -1068,77 +981,57 @@ static off_t align_to_next_packet(FILE* f)
        return pos;
 }
 
-// ------------------------------------------------------------------------------------
 
-int bitpos = 0;
-unsigned int bitval = 0;
-unsigned char* bitbuf = NULL;
-unsigned int bitmask[] = {
+typedef struct {
+    uint8_t *buf;
+    uint32_t val;
+    int pos;
+} bitbuf_t;
+
+static const unsigned int bitmask[] = {
        0x0,0x1,0x3,0x7,0xf,0x1f,0x3f,0x7f,0xff,
        0x1ff,0x3ff,0x7ff,0xfff,0x1fff,0x3fff,0x7fff,0xffff,
        0x1ffff,0x3ffff,0x7ffff,0xfffff,0x1fffff,0x3fffff,0x7fffff,0xffffff,
        0x1ffffff,0x3ffffff,0x7ffffff,0xfffffff,0x1fffffff,0x3fffffff,0x7fffffff,0xffffffff};
 
-static inline void set_buf(unsigned char* buf, int bufsize, int clear)
+static inline void set_buf(bitbuf_t *bb, uint8_t* buf, int bufsize, int clear)
 {
-       bitpos = 0;
-       bitbuf = buf;
-       bitval = (bitbuf[0] << 24) | (bitbuf[1] << 16) | (bitbuf[2] << 8) | bitbuf[3];
+       bb->pos = 0;
+       bb->buf = buf;
+       bb->val = (bb->buf[0] << 24) | (bb->buf[1] << 16) |
+              (bb->buf[2] << 8) | bb->buf[3];
        if (clear)
-               memset(bitbuf, 0, bufsize);
+               memset(bb->buf, 0, bufsize);
 }
 
-static inline int buf_size()
+static inline int buf_size(bitbuf_t *bb)
 {
-       return bitpos >> 3;
-}
-
-static inline void set_bits(unsigned int val, int bits)
-{
-       val &= bitmask[bits];
-
-       while (bits > 0)
-       {
-               int bitsleft = (8 - (bitpos & 7));
-               if (bits >= bitsleft)
-               {
-                       bitbuf[bitpos >> 3] |= val >> (bits - bitsleft);
-                       bitpos += bitsleft;
-                       bits -= bitsleft;
-                       val &= bitmask[bits];
-               }
-               else
-               {
-                       bitbuf[bitpos >> 3] |= val << (bitsleft - bits);
-                       bitpos += bits;
-                       bits = 0;
-               }
-       }
+       return bb->pos >> 3;
 }
 
-static inline unsigned int get_bits(int bits)
+static inline unsigned int get_bits(bitbuf_t *bb, int bits)
 {
        unsigned int val;
-       int left = 32 - (bitpos & 31);
+       int left = 32 - (bb->pos & 31);
 
        if (bits < left)
        {
-               val = (bitval >> (left - bits)) & bitmask[bits];
-               bitpos += bits;
+               val = (bb->val >> (left - bits)) & bitmask[bits];
+               bb->pos += bits;
        }
        else
        {
-               val = (bitval & bitmask[left]) << (bits - left);
-               bitpos += left;
+               val = (bb->val & bitmask[left]) << (bits - left);
+               bb->pos += left;
                bits -= left;
 
-               int pos = bitpos >> 3;
-               bitval = (bitbuf[pos] << 24) | (bitbuf[pos + 1] << 16) | (bitbuf[pos + 2] << 8) | bitbuf[pos + 3];
+               int pos = bb->pos >> 3;
+               bb->val = (bb->buf[pos] << 24) | (bb->buf[pos + 1] << 16) | (bb->buf[pos + 2] << 8) | bb->buf[pos + 3];
 
                if (bits > 0)
                {
-                       val |= (bitval >> (32 - bits)) & bitmask[bits];
-                       bitpos += bits;
+                       val |= (bb->val >> (32 - bits)) & bitmask[bits];
+                       bb->pos += bits;
                }
        }
 
@@ -1170,79 +1063,150 @@ static void decode_element_descriptors(hb_stream_t* stream, int esindx,
     }
 }
 
+/*
+ * Get the name of the stream from the type - thanks to VLC for this.
+ */
+static const char *get_stream_name (unsigned char stream_type)
+{
+    switch( stream_type )
+    {
+    case 0x01:  /* MPEG-1 video */
+    case 0x02:  /* MPEG-2 video */
+    case 0x80:  /* MPEG-2 MOTO video */
+        return("MPEG 1/2 Video");
+        break;
+    case 0x03:  /* MPEG-1 audio */
+    case 0x04:  /* MPEG-2 audio */
+        return("MPEG Audio");
+        break;
+    case 0x11:  /* MPEG4 (audio) */
+    case 0x0f:  /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
+        return("MPEG-4 Audio");
+        break;
+    case 0x10:  /* MPEG4 (video) */
+        return("MPEG-4 Video");
+        break;
+    case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
+        return("H.264 Video");
+        break;
+        
+    case 0x81:  /* A52 (audio) */
+        return("A52/AC-3 Audio");
+        break;
+    case 0x82:  /* DVD_SPU (sub) */
+        return("Subtitle");
+        break;
+    case 0x83:  /* LPCM (audio) */
+        return("LPCM Audio");
+        break;
+    case 0x84:  /* SDDS (audio) */
+        return("SDDS Audio");
+        break;
+    case 0x85:  /* DTS (audio) */
+        return("DTS Audio");
+        break;
+        
+    case 0x91:  /* A52 vls (audio) */
+        return("A52b/AC-3 Audio");
+        break;
+    case 0x92:  /* DVD_SPU vls (sub) */
+        return("Subtitle");
+        break;
+        
+    case 0x94:  /* SDDS (audio) */
+        return("SDDS Audio");
+        break;
+        
+    case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
+        return("MSCODEC Video");
+        break;
+        
+    case 0x06:  /* PES_PRIVATE  (fixed later) */
+    case 0x12:  /* MPEG-4 generic (sub/scene/...) (fixed later) */
+    case 0xEA:  /* Privately managed ES (VC-1) (fixed later */
+    default:
+        return("Other");
+        break;
+    }
+}
+
 int decode_program_map(hb_stream_t* stream)
 {
-       set_buf(stream->pmt_info.tablebuf, stream->pmt_info.tablepos, 0);
+    bitbuf_t bb;
+       set_buf(&bb, stream->pmt_info.tablebuf, stream->pmt_info.tablepos, 0);
 
-    get_bits(8);  // table_id
-    get_bits(4);
-    unsigned int section_length = get_bits(12);
+    get_bits(&bb, 8);  // table_id
+    get_bits(&bb, 4);
+    unsigned int section_length = get_bits(&bb, 12);
     stream->pmt_info.section_length = section_length;
 
-    unsigned int program_number = get_bits(16);
+    unsigned int program_number = get_bits(&bb, 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);
+    get_bits(&bb, 2);
+    get_bits(&bb, 5);  // version_number
+    get_bits(&bb, 1);
+    get_bits(&bb, 8);  // section_number
+    get_bits(&bb, 8);  // last_section_number
+    get_bits(&bb, 3);
+    unsigned int PCR_PID = get_bits(&bb, 13);
     stream->pmt_info.PCR_PID = PCR_PID;
-    get_bits(4);
-    unsigned int program_info_length = get_bits(12);
+    get_bits(&bb, 4);
+    unsigned int program_info_length = get_bits(&bb, 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);
+         descriptor_buf[i] = get_bits(&bb, 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);
+         unsigned char stream_type = get_bits(&bb, 8);
+                 get_bits(&bb, 3);
+         unsigned int elementary_PID = get_bits(&bb, 13);
+                 get_bits(&bb, 4);
+         unsigned int ES_info_length = get_bits(&bb, 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);
+               ES_info_buf[i] = get_bits(&bb, 8);
          }
 
-         if (stream_type == 0x02)
+
+         if (stream_type == 0x02 || stream_type == 0x10 || stream_type == 0x1B)
          {
-               if (stream->ts_number_video_pids <= kMaxNumberVideoPIDS)
+              /* MPEG-2/MPEG-4/H.264 */
+              if (stream->ts_number_video_pids <= kMaxNumberVideoPIDS)
                  stream->ts_number_video_pids++;
-               stream->ts_video_pids[stream->ts_number_video_pids-1] = elementary_PID;
+              stream->ts_video_pids[stream->ts_number_video_pids-1] = elementary_PID;
+              stream->ts_video_stream_type[stream->ts_number_video_pids-1] = stream_type;
          }
-      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);
-               }
+          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[1 + 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);
@@ -1369,17 +1333,18 @@ int decode_PAT(unsigned char *buf, hb_stream_t *stream)
             unsigned int pos = 0;
             //while (pos < tablepos)
             {
-                    set_buf(tablebuf + pos, tablepos - pos, 0);
-
-                    unsigned char section_id   = get_bits(8);
-                    get_bits(4);
-                    unsigned int section_len   = get_bits(12);
-                    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
+                    bitbuf_t bb;
+                    set_buf(&bb, tablebuf + pos, tablepos - pos, 0);
+
+                    unsigned char section_id   = get_bits(&bb, 8);
+                    get_bits(&bb, 4);
+                    unsigned int section_len   = get_bits(&bb, 12);
+                    get_bits(&bb, 16); // transport_id
+                    get_bits(&bb, 2);
+                    get_bits(&bb, 5);  // version_num
+                    get_bits(&bb, 1);  // current_next
+                    get_bits(&bb, 8);  // section_num
+                    get_bits(&bb, 8);  // last_section
 
                     switch (section_id)
                     {
@@ -1392,17 +1357,17 @@ int decode_PAT(unsigned char *buf, hb_stream_t *stream)
                                                  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);
+                            unsigned int pkt_program_num = get_bits(&bb, 16);
                                                        stream->pat_info[stream->ts_number_pat_entries].program_number = pkt_program_num;
 
-                            get_bits(3);  // Reserved
+                            get_bits(&bb, 3);  // Reserved
                             if (pkt_program_num == 0)
                             {
-                              get_bits(13); // pkt_network_id
+                              get_bits(&bb, 13); // pkt_network_id
                             }
                             else
                             {
-                              unsigned int pkt_program_map_PID = get_bits(13);
+                              unsigned int pkt_program_map_PID = get_bits(&bb, 13);
                                 stream->pat_info[stream->ts_number_pat_entries].program_map_PID = pkt_program_map_PID;
                             }
                             curr_pos += 4;
@@ -1428,427 +1393,48 @@ int decode_PAT(unsigned char *buf, hb_stream_t *stream)
     return 1;
 }
 
-static int flushbuf(hb_stream_t *stream)
+static void hb_ts_stream_find_pids(hb_stream_t *stream)
 {
-       int old_write_index = stream->ps_current_write_buffer_index;
-
-       // 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)
-               stream->ps_current_write_buffer_index = 0;
-
-       if ( (stream->ps_decode_buffer[stream->ps_current_write_buffer_index].len != 0) || (stream->ps_decode_buffer[stream->ps_current_write_buffer_index].write_pos != 0) )
-       {
-               hb_log("flushbuf - new buffer (index %d) has non zero length and write position !", stream->ps_current_write_buffer_index);
-               return 0;
-       }
-
-       stream->ps_current_read_buffer_index = old_write_index;
-       stream->ps_decode_buffer[stream->ps_current_read_buffer_index].read_pos = 0;
-
-       return 1;
-}
+       unsigned char buf[188];
 
-static int fwrite64(void* buf, int elsize, int elnum, hb_stream_t* stream)
-{
-       int size = elsize;
-       if (elnum > 1)
-               size *= elnum;
+       // align to first packet
+       align_to_next_packet(stream->file_handle);
 
-       int written = 0;
-       int current_write_index = stream->ps_current_write_buffer_index;
+       // Read the Transport Stream Packets (188 bytes each) looking at first for PID 0 (the PAT PID), then decode that
+       // to find the program map PID and then decode that to get the list of audio and video PIDs
 
-       if (size <= stream->ps_decode_buffer[current_write_index].size - stream->ps_decode_buffer[current_write_index].write_pos)
-       {
-               memcpy(stream->ps_decode_buffer[current_write_index].data + stream->ps_decode_buffer[current_write_index].write_pos, buf, size);
-               stream->ps_decode_buffer[current_write_index].write_pos += size;
-               stream->ps_decode_buffer[current_write_index].len = stream->ps_decode_buffer[current_write_index].write_pos;
-               written = size;
-       }
-       else
+       int bytesReadInPacket = 0;
+       for (;;)
        {
-               memcpy(stream->ps_decode_buffer[current_write_index].data + stream->ps_decode_buffer[current_write_index].write_pos, buf, stream->ps_decode_buffer[current_write_index].size - stream->ps_decode_buffer[current_write_index].write_pos);
-               written += stream->ps_decode_buffer[current_write_index].size - stream->ps_decode_buffer[current_write_index].write_pos;
-               stream->ps_decode_buffer[current_write_index].write_pos += stream->ps_decode_buffer[current_write_index].size - stream->ps_decode_buffer[current_write_index].write_pos;
-               stream->ps_decode_buffer[current_write_index].len = stream->ps_decode_buffer[current_write_index].write_pos;
-
-               if (flushbuf(stream))
+               // Try to read packet..
+               int bytesRead;
+               if ((bytesRead = fread(buf+bytesReadInPacket, 1, 188-bytesReadInPacket, stream->file_handle)) != 188-bytesReadInPacket)
                {
-                       // FLushing the buffer will have change the current write buffer
-                       current_write_index = stream->ps_current_write_buffer_index;
-
-                       memcpy(stream->ps_decode_buffer[current_write_index].data, (unsigned char*)buf + written, size - written);
-                       stream->ps_decode_buffer[current_write_index].write_pos += size - written;
-                       stream->ps_decode_buffer[current_write_index].len = stream->ps_decode_buffer[current_write_index].write_pos;
-                       written += size - written;
-               }
-       }
-
-
-       if (elnum == 1 && written == size)
-               return 1;
-       else
-               return written / elsize;
-}
-
-static int write_pack(hb_stream_t* stream, int64_t time)
-{
-       unsigned char buf[64];
-       set_buf(buf, 64, 1);                                            // clear buffer
-
-       int64_t ext_time = time % 300;
-       time = time / 300;
-
-       set_bits(0x000001ba, 32);                                       // pack id                                                              32
-       set_bits(1, 2);                                                         // 0x01                                                                 2
-       set_bits((unsigned int)(time >> 30), 3);        // system_clock_reference_base                  3
-       set_bits(1, 1);                                                         // marker_bit                                                   1
-       set_bits((unsigned int)(time >> 15), 15);       // system_clock_reference_base                  15
-       set_bits(1, 1);                                                         // marker_bit                                                   1
-       set_bits((unsigned int)time, 15);                       // system_clock_reference_base1                 15
-       set_bits(1, 1);                                                         // marker_bit                                                   1
-       set_bits((unsigned int)ext_time, 9);            // system_clock_reference_extension             9
-       set_bits(1, 1);                                                         // marker_bit                                                   1
-       set_bits(DEMUX, 22);                                            // program_mux_rate                                             22
-       set_bits(1, 1);                                                         // marker_bit                                                   1
-       set_bits(1, 1);                                                         // marker_bit                                                   1
-       set_bits(31, 5);                                                        // reserved                                                             5
-       set_bits(0, 3);                                                         // pack_stuffing_length                                 3
-
-       return fwrite64(buf, buf_size(), 1, stream) == 1;
-}
-
-static int pad_buffer(hb_stream_t *stream, int pad)
-{
-       pad -= 6;
-
-       char buf[6];
-       buf[0] = '\x0'; buf[1] = '\x0'; buf[2] = '\x1'; buf[3] = '\xbe';
-       buf[4] = pad >> 8; buf[5] = pad & 0xff;
-
-       if (fwrite64(buf, 6, 1, stream) != 1)
-               return 0;
-
-       unsigned char padbyte = 0xff;
-       int i=0;
-       for (i = 0; i < pad; i++)
-       {
-               if (fwrite64(&padbyte, 1, 1, stream) != 1)
-                       return 0;
-       }
-
-       return 1;
-}
+                       if (bytesRead < 0)
+                               bytesRead = 0;
+                       bytesReadInPacket += bytesRead;
 
-int make_pes_header(unsigned char* buf, int streamid, int len, int64_t PTS, int64_t DTS)
-{
-       int hdrlen = 0;
-       int PTS_DTS_flags = 0;
-       if (PTS != -1)
-       {
-               if (DTS != -1)
-               {
-                       PTS_DTS_flags = 3;
-                       hdrlen += 10;
+                       hb_log("hb_ts_stream_find_pids - end of file");
+                       break;
                }
                else
                {
-                       PTS_DTS_flags = 2;
-                       hdrlen += 5;
-               }
-       }
-
-       set_buf(buf, 9 + hdrlen, 1);                            // clear the buffer
-
-       set_bits(0x000001, 24);                                         // packet_start_code_prefix                             24
-       set_bits((unsigned int)streamid, 8);            // directory_stream_id                                  8
-       set_bits(len, 16);                                                      // PES_packet_length                                    16
-       set_bits(0x2, 2);                                                       // '10'                                                                 2
-       set_bits(0, 2);                                                         // PES_scrambling_control                               2
-       set_bits(1, 1);                                                         // PES_priority                                                 1
-       set_bits(0, 1);                                                         // data_alignment_indicator                             1
-       set_bits(0, 1);                                                         // copyright                                                    1
-       set_bits(0, 1);                                                         // original_or_copy                                             1
-       set_bits(PTS_DTS_flags, 2);                                     // PTS_DTS_flags                                                2
-       set_bits(0, 1);                                                         // ESCR_flag                                                    1
-       set_bits(0, 1);                                                         // ES_rate_flag                                                 1
-       set_bits(0, 1);                                                         // DSM_trick_mode_flag                                  1
-       set_bits(0, 1);                                                         // additional_copy_info_flag                    1
-       set_bits(0, 1);                                                         // PES_CRC_flag                                                 1
-       set_bits(0, 1);                                                         // PES_extension_flag                                   1
-       set_bits(hdrlen, 8);                                            // PES_header_data_length                               8
-
-       if (PTS_DTS_flags == 2)
-       {
-               set_bits(2, 4);                                                         // '0010'                                                       4
-               set_bits((unsigned int)(PTS >> 30), 3);         // PTS [32..30]                                         3
-               set_bits(1, 1);                                                         // marker bit                                           1
-               set_bits((unsigned int)(PTS >> 15), 15);        // PTS [29..15]                                         15
-               set_bits(1, 1);                                                         // marker bit                                           1
-               set_bits((unsigned int)PTS, 15);                        // PTS [14..0]                                          15
-               set_bits(1, 1);                                                         // marker bit                                           1
-       }
-       else if (PTS_DTS_flags == 3)
-       {
-               set_bits(3, 4);                                                         // '0011'                                                       4
-               set_bits((unsigned int)(PTS >> 30), 3);         // PTS [32..30]                                         3
-               set_bits(1, 1);                                                         // marker bit                                           1
-               set_bits((unsigned int)(PTS >> 15), 15);        // PTS [29..15]                                         15
-               set_bits(1, 1);                                                         // marker bit                                           1
-               set_bits((unsigned int)PTS, 15);                        // PTS [14..0]                                          15
-               set_bits(1, 1);                                                         // marker bit                                           1
-               set_bits(1, 4);                                                         // '0001'                                                       4
-               set_bits((unsigned int)(DTS >> 30), 3);         // DTS [32..30]                                         3
-               set_bits(1, 1);                                                         // marker bit                                           1
-               set_bits((unsigned int)(DTS >> 15), 15);        // DTS [29..15]                                         15
-               set_bits(1, 1);                                                         // marker bit                                           1
-               set_bits((unsigned int)DTS, 15);                        // DTS [14..0]                                          15
-               set_bits(1, 1);                                                         // marker bit                                           1
-       }
-
-       return buf_size();
-}
-
-int generate_output_data(hb_stream_t *stream, int write_ac3, int curstream, int pid)
-{
-                       unsigned char ac3_substream_id[4];
-                       int ac3len = 0;
-
-                       if (write_ac3)
-                       {
-                // 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
-                       int pos = 0;            // Position in PES packet buffer
-
-                       for (;;)
-                       {
-                               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!");
-                                       return 1;
-                               }
-
-                               // Get total length of this pack
-                               int len = min(14 + ac3len + stream->ts_packetpos[curstream] - pos, HB_DVD_READ_BUFFER_SIZE);
-
-                               // Figure out stuffing (if we have less than 16 bytes left)
-                               int stuffing = 0;
-                               if (len < HB_DVD_READ_BUFFER_SIZE && HB_DVD_READ_BUFFER_SIZE - len < 16)
-                               {
-                                       stuffing = HB_DVD_READ_BUFFER_SIZE - len;
-                                       len += stuffing;
-                               }
-
-                               // Write out pack header
-                               off_t file_offset = ftello(stream->file_handle);
-                               int64_t packet_time = (file_offset * CLOCKRATE / STREAMRATE) + 0 /*file_time*/;
-                               if (!write_pack(stream, packet_time))
-                               {
-                                       hb_log("write_output_stream - Couldn't write pack header!");
-                                       return 1;
-                               }
-
-                stream->ts_packetbuf[curstream][pos + 3] =
-                    stream->ts_streamid[curstream];
-
-                               // Packet length..
-                               // Subtract pack size (14) and pes id and len (6) from lenth
-                               stream->ts_packetbuf[curstream][pos + 4] = (len - 6 - 14) >> 8; stream->ts_packetbuf[curstream][pos + 5] = (len - 6 - 14) & 0xFF;
-
-                               // Add any stuffing bytes to header extra len
-                               int hdrsize = 9 + stream->ts_packetbuf[curstream][pos + 8];
-                               stream->ts_packetbuf[curstream][pos + 8] += stuffing;                                   // Add stuffing to header bytes
-
-                               // Write out id, streamid, len
-                               if (fwrite64(stream->ts_packetbuf[curstream] + pos, hdrsize, 1, stream) != 1)   // Write pes id, streamid, and len
-                               {
-                                       hb_log("write_output_stream - Failed to write output file!");
-                                       return 1;
-                               }
-
-                               // Write stuffing
-                               int i=0;
-                               for (i = 0; i < stuffing; i++)                          // Write any stuffing bytes
-                               {
-                                       unsigned char stuff = 0xff;
-                                       if (fwrite64(&stuff, 1, 1, stream) != 1)
-                                       {
-                                               hb_log("write_output_stream - Failed to write output file!");
-                                               return 1;
-                                       }
-                               }
-
-                               // Write ac3 streamid
-                               if (ac3len != 0)
-                               {
-                                       if (fwrite64(ac3_substream_id, ac3len, 1, stream) != 1)
-                                       {
-                                               hb_log("write_output_stream - Failed to write output file!");
-                                               return 1;
-                                       }
-                               }
-
-                               // Write rest of data len minus headersize (9) stuffing, and pack size (14)
-                               if (fwrite64(stream->ts_packetbuf[curstream] + pos + hdrsize, len - hdrsize - 14 - stuffing - ac3len, 1, stream) != 1)  // Write data bytes
-                               {
-                                       hb_log("write_output_stream - Failed to write output file!");
-                                       return 1;
-                               }
-                               written += len;
-
-                               // Add len minus stuff we added like the pack (14) and the stuffing.
-                               pos += len - 14 - stuffing - ac3len;
-                               if (pos == stream->ts_packetpos[curstream])
-                                       break;
-
-                               // Add pes header for next packet
-                               pos -= 9;
-                               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)
-                       {
-                               int left = HB_DVD_READ_BUFFER_SIZE - (written % HB_DVD_READ_BUFFER_SIZE);
-
-                               // Pad out to HB_DVD_READ_BUFFER_SIZE bytes
-                               if (!pad_buffer(stream, left))
-                               {
-                                       hb_log("write_output_stream - Couldn't write pad buffer!");
-                                       return 1;
-                               }
-                       }
-
-       return 0;
-}
-
-static void hb_ts_handle_mpeg_audio(hb_stream_t *stream, int curstream, unsigned char* buf, int adapt_len )
-{
-       // Although we don't have AC3/A52 audio here we can still use the same structure to record this useful information.
-
-       stream->a52_info[curstream - stream->ts_number_video_pids].flags = A52_STEREO;
-       stream->a52_info[curstream - stream->ts_number_video_pids].rate = 48000 /*Hz*/;
-       stream->a52_info[curstream - stream->ts_number_video_pids].bitrate = 384000 /*Bps*/;
-}
-
-static int hb_ts_handle_ac3_audio(hb_stream_t *stream, int curstream, unsigned char* buf, int adapt_len )
-{
-       int spos, dpos;
-
-       // Make sure we start with 0x0b77
-       if (stream->ts_packetbuf[curstream][9 + stream->ts_packetbuf[curstream][8]] != 0x0b || stream->ts_packetbuf[curstream][9 + stream->ts_packetbuf[curstream][8] + 1] != 0x77)
-       {
-               spos = 9 + stream->ts_packetbuf[curstream][8];
-               dpos = 9 + stream->ts_packetbuf[curstream][8];
-               while (spos <= stream->ts_packetpos[curstream] - 2 && !(stream->ts_packetbuf[curstream][spos] == 0x0b && stream->ts_packetbuf[curstream][spos + 1] == 0x77))
-                       spos++;
-
-               if (!(stream->ts_packetbuf[curstream][spos] == 0x0b && stream->ts_packetbuf[curstream][spos + 1] == 0x77))
-               {
-                       hb_log("hb_ts_stream_decode - Couldn't sync AC3 packet!");
-                       stream->ts_skipbad[curstream] = 1;
-                       return 0;
-               }
-
-               while (spos < stream->ts_packetpos[curstream])
-               {
-                       stream->ts_packetbuf[curstream][dpos] = stream->ts_packetbuf[curstream][spos];
-                       spos++;
-                       dpos++;
-               }
-               stream->ts_packetpos[curstream] = dpos;
-       }
-
-       // Check the next packet to make sure IT starts with a 0x0b77
-       int plen = 0;
-    plen = 9 + buf[4 + adapt_len + 8];
-       int pstart = 4 + adapt_len + plen;
-       if (buf[pstart] != 0x0b || buf[pstart + 1] != 0x77)
-       {
-               spos = pstart;
-               while (spos < 188 - 2 && !(buf[spos] == 0x0b && buf[spos + 1] == 0x77))
-               {
-                       stream->ts_packetbuf[curstream][stream->ts_packetpos[curstream]] = buf[spos];
-                       stream->ts_packetpos[curstream]++;
-                       spos++;
-               }
-
-               if (!(buf[spos] == 0x0b && buf[spos + 1] == 0x77))
-               {
-                       hb_log("hb_ts_stream_decode - Couldn't sync AC3 packet!");
-                       stream->ts_skipbad[curstream] = 1;
-                       return 0;
-               }
-
-               adapt_len = spos - 4 - plen;
-
-               dpos = spos - 1;
-               spos = pstart - 1;
-               while (spos >= pstart - plen)
-               {
-                       buf[dpos] = buf[spos];
-                       spos--;
-                       dpos--;
-               }
-       }
-
-       int flags, rate, bitrate;
-       if( a52_syncinfo( &buf[pstart], &flags, &rate, &bitrate ) )
-       {
-               stream->a52_info[curstream - stream->ts_number_video_pids].flags = flags;
-               stream->a52_info[curstream - stream->ts_number_video_pids].rate = rate;
-               stream->a52_info[curstream - stream->ts_number_video_pids].bitrate = bitrate;
-       }
-       return 1;
-}
-
-static void hb_ts_stream_find_pids(hb_stream_t *stream)
-{
-       unsigned char buf[188];
-
-       // align to first packet
-       align_to_next_packet(stream->file_handle);
-
-       // Read the Transport Stream Packets (188 bytes each) looking at first for PID 0 (the PAT PID), then decode that
-       // to find the program map PID and then decode that to get the list of audio and video PIDs
-
-       int bytesReadInPacket = 0;
-       for (;;)
-       {
-               // 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;
-
-                       hb_log("hb_ts_stream_find_pids - end of file");
-                       break;
-               }
-               else
-               {
-                       bytesReadInPacket = 0;
+                       bytesReadInPacket = 0;
                }
 
                // Check sync byte
                if ((buf[0] != 0x47) && (buf[0] != 0x72) && (buf[0] != 0x29))
                {
-                       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;
+            off_t pos = ftello(stream->file_handle) - 188;
+            off_t pos2 = align_to_next_packet(stream->file_handle);
+            if ( pos2 == 0 )
+            {
+                hb_log( "hb_ts_stream_find_pids: eof while re-establishing sync @ %lld",
+                        pos );
+                break;
+            }
+            hb_log("hb_ts_stream_decode: sync lost @%lld, regained after %lld bytes",
+                    pos, pos2 );
                        continue;
                }
 
@@ -1891,50 +1477,298 @@ static void hb_ts_stream_find_pids(hb_stream_t *stream)
        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("      0x%x (%d) [Type %s (0x%x)]", 
+                       stream->ts_video_pids[i], stream->ts_video_pids[i],
+                       get_stream_name(stream->ts_video_stream_type[i]),
+                       stream->ts_video_stream_type[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]);
+               hb_log("      0x%x (%d) [Type %s (0x%x)]", 
+                       stream->ts_audio_pids[i], stream->ts_audio_pids[i],
+                       get_stream_name(stream->ts_audio_stream_type[i]),
+                       stream->ts_audio_stream_type[i] );
        }
  }
 
-int index_of_video_pid(int pid, hb_stream_t *stream)
+
+static void fwrite64( hb_stream_t *stream, void *buf, int size )
 {
-       int found_pid = -1, i = 0;
+    if ( (stream->fwrite_buf - stream->fwrite_buf_orig) + size > 2048 )
+    {
+        hb_log( "steam fwrite64 buffer overflow - writing %d with %d already",
+                size, stream->fwrite_buf - stream->fwrite_buf_orig );
+        return;
+    }
+    memcpy( stream->fwrite_buf, buf, size );
+    stream->fwrite_buf += size;
+}
 
-       for (i = 0; (i < stream->ts_number_video_pids) && (found_pid < 0); i++)
-       {
-               if (pid == stream->ts_video_pids[i])
-                       found_pid = i;
-       }
-       return found_pid;
+static void write_pack(hb_stream_t* stream, uint64_t time, int stuffing)
+{
+       uint8_t buf[24];
+
+    buf[0] = 0x00;      // pack id
+    buf[1] = 0x00;
+    buf[2] = 0x01;
+    buf[3] = 0xba;
+
+    buf[4] = 0x44 |     // SCR
+             ( ( ( time >> 30 ) & 7 ) << 3 ) |
+             ( ( time >> 28 ) & 3 );
+    buf[5] = time >> 20;
+    buf[6] = 0x04 |
+             ( ( ( time >> 15 ) & 0x1f ) << 3 ) |
+             ( ( time >> 13 ) & 3 );
+    buf[7] = time >> 5;
+    buf[8] = 0x04 | ( time << 3 );
+
+    buf[9] = 0x01;      // SCR extension
+
+    buf[10] = 384000 >> (22 - 8);     // program mux rate
+    buf[11] = (uint8_t)( 384000 >> (22 - 16) );
+    buf[12] = (uint8_t)( 384000 << 2 ) | 0x03;
+
+    buf[13] = 0xf8 | stuffing;
+
+    int i;
+    for (i = 0; i < stuffing; ++i )
+        buf[14+i] = 0xff;
+
+       fwrite64(stream, buf, 14 + stuffing );
 }
 
-int index_of_audio_pid(int pid, hb_stream_t *stream)
+static void pad_buffer(hb_stream_t* stream, int pad)
 {
-       int i = 0, found_pid = -1;
+       pad -= 6;
 
-       for (i = 0; (i < stream->ts_number_audio_pids) && (found_pid < 0); i++)
-       {
-               if (pid == stream->ts_audio_pids[i])
-                       found_pid = i;
+       uint8_t buf[6];
+       buf[0] = 0;
+    buf[1] = 0;
+    buf[2] = 0;
+    buf[3] = 0xbe;
+       buf[4] = pad >> 8;
+    buf[5] = pad;
+
+       fwrite64(stream, buf, 6);
+
+       buf[0] = 0xff;
+    while ( --pad >= 0 )
+    {
+               fwrite64(stream, buf, 1);
        }
-       return found_pid;
 }
 
-int index_of_pid(int pid, hb_stream_t *stream)
+static void make_pes_header(hb_stream_t* stream, int len, uint8_t streamid)
+{
+       uint8_t buf[9];
+
+    memset(buf, 0, sizeof(buf) );
+    buf[2] = 1;
+    buf[3] = streamid;
+    buf[4] = ( len + 3 ) >> 8;
+    buf[5] = len + 3;
+    buf[6] = 0x88;
+
+    fwrite64(stream, buf, 9);
+}
+
+static void generate_output_data(hb_stream_t *stream, int curstream)
+{
+    uint8_t *tdat = stream->ts_buf[curstream];
+    int len;
+
+    // we always ship a PACK header plus all the data in our demux buf.
+    // AC3 audio also always needs it substream header.
+    len = 14 + stream->ts_pos[curstream];
+    if ( stream->ts_audio_stream_type[curstream] == 0x81)
+    {
+        len += 4;
+    }
+
+    if ( ! stream->ts_start[curstream] )
+    {
+        // we're in the middle of a chunk of PES data - we need to add
+        // a 'continuation' PES header after the PACK header.
+        len += 9;
+    }
+
+    // Write out pack header
+    // If we don't have 2048 bytes we need to pad to 2048. We can
+    // add a padding frame after our data but we need at least 7
+    // bytes of space to do it (6 bytes of header & 1 of pad). If
+    // we have fewer than 7 bytes left we need to fill the excess
+    // space with stuffing bytes added to the pack header.
+    int stuffing = 0;
+    if ( len > HB_DVD_READ_BUFFER_SIZE )
+    {
+        hb_log( "stream ts length botch %d", len );
+    }
+    if ( HB_DVD_READ_BUFFER_SIZE - len < 8)
+    {
+        stuffing = HB_DVD_READ_BUFFER_SIZE - len;
+    }
+    write_pack(stream, stream->ts_nextpcr, stuffing );
+    stream->ts_nextpcr += 10;
+
+    if ( stream->ts_start[curstream] )
+    {
+        // Start frames already have a PES header but we have modify it
+        // to map from TS PID to PS stream id. Also, if the stream is AC3
+        // audio we have to insert an AC3 stream header between the end of
+        // the PES header and the start of the stream data.
+
+        stream->ts_start[curstream] = 0;
+        tdat[3] = stream->ts_streamid[curstream];
+
+        uint16_t plen = stream->ts_pos[curstream] - 6;
+        if ( stream->ts_audio_stream_type[curstream] == 0x81)
+        {
+            // We have to add an AC3 header in front of the data. Add its
+            // size to the PES packet length.
+            plen += 4;
+            tdat[4] = plen >> 8;
+            tdat[5] = plen;
+
+            // Write out the PES header
+            int hdrsize = 9 + tdat[8];
+            fwrite64(stream, tdat, hdrsize);
+
+            // add a four byte DVD ac3 stream header
+            uint8_t ac3_substream_id[4];
+            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;
+            fwrite64(stream, ac3_substream_id, 4);
+
+            // add the rest of the data
+            fwrite64(stream, tdat + hdrsize, stream->ts_pos[curstream] - hdrsize);
+        }
+        else
+        {
+            // not audio - don't need to modify the stream so write what we've got
+            tdat[4] = plen >> 8;
+            tdat[5] = plen;
+            fwrite64( stream,  tdat, stream->ts_pos[curstream] );
+        }
+    }
+    else
+    {
+        // data without a PES start header needs a simple 'continuation'
+        // PES header. AC3 audio also needs its substream header.
+        if ( stream->ts_audio_stream_type[curstream] != 0x81)
+        {
+            make_pes_header(stream, stream->ts_pos[curstream],
+                            stream->ts_streamid[curstream]);
+        }
+        else
+        {
+            make_pes_header(stream, stream->ts_pos[curstream] + 4,
+                            stream->ts_streamid[curstream]);
+
+            // add a four byte DVD ac3 stream header
+            uint8_t ac3_substream_id[4];
+            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;
+            fwrite64(stream, ac3_substream_id, 4);
+        }
+        fwrite64( stream, tdat, stream->ts_pos[curstream] );
+    }
+
+    // Write padding
+    int left = HB_DVD_READ_BUFFER_SIZE - len;
+    if ( left >= 8 )
+    {
+        pad_buffer(stream, left);
+    }
+
+    stream->ts_pos[curstream] = 0;
+}
+
+static void ts_warn_helper( hb_stream_t *stream, char *log, va_list args )
 {
-       int found_pid = -1;
+    // limit error printing to at most one per minute of video (at 30fps)
+    ++stream->errors;
+    if ( stream->frames - stream->last_error_frame >= 30*60 )
+    {
+        char msg[256];
 
-       if ((found_pid = index_of_video_pid(pid, stream)) >= 0)
-               return found_pid;
+        vsnprintf( msg, sizeof(msg), log, args );
 
-       if ((found_pid = index_of_audio_pid(pid, stream)) >= 0)
-               return found_pid;
+        if ( stream->errors - stream->last_error_count < 10 )
+        {
+            hb_log( "stream: error near frame %d: %s", stream->frames, msg );
+        }
+        else
+        {
+            int Edelta = stream->errors - stream->last_error_count;
+            double Epcnt = (double)Edelta * 100. /
+                            (stream->frames - stream->last_error_frame);
+            hb_log( "stream: %d new errors (%.0f%%) up to frame %d: %s",
+                    Edelta, Epcnt, stream->frames, msg );
+        }
+        stream->last_error_frame = stream->frames;
+        stream->last_error_count = stream->errors;
+    }
+}
 
-       return found_pid;
+static void ts_warn( hb_stream_t *stream, char *log, ... )
+{
+    va_list     args;
+    va_start( args, log );
+    ts_warn_helper( stream, log, args );
+    va_end( args );
+}
+
+static void ts_err( hb_stream_t *stream, int curstream, char *log, ... )
+{
+    va_list     args;
+    va_start( args, log );
+    ts_warn_helper( stream, log, args );
+    va_end( args );
+
+    stream->ts_skipbad[curstream] = 1;
+    stream->ts_pos[curstream] = 0;
+    stream->ts_streamcont[curstream] = -1;
+}
+
+static int isIframe( const uint8_t *buf, int adapt_len )
+{
+    // Look for the Group of Pictures packet
+    int i;
+    uint32_t strid = 0;
+
+    for (i = 4 + adapt_len; i < 188; i++)
+    {
+        strid = (strid << 8) | buf[i];
+        switch ( strid )
+        {
+            case 0x000001B8: // group_start_code (GOP header)
+            case 0x000001B3: // sequence_header code
+                return 1;
+
+            case 0x00000100: // picture_start_code
+                // picture_header, let's see if it's an I-frame
+                if (i<185)
+                {
+                    // check if picture_coding_type == 1
+                    if ((buf[i+2] & (0x7 << 3)) == (1 << 3))
+                    {
+                        // found an I-frame picture
+                        return 1;
+                    }
+                }
+                break;
+        }
+    }
+    // didn't find an I frame
+    return 0;
 }
 
 /***********************************************************************
@@ -1942,40 +1776,32 @@ int index_of_pid(int pid, hb_stream_t *stream)
  ***********************************************************************
  *
  **********************************************************************/
-static void hb_ts_stream_decode(hb_stream_t *stream)
+static int hb_ts_stream_decode( hb_stream_t *stream, uint8_t *obuf )
 {
-       unsigned char buf[188];
+    int64_t pcr = stream->ts_lastpcr;
        int curstream;
-       int doing_iframe;
+       uint8_t buf[188];
 
-       int i = 0;
-       for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
-       {
-               stream->ts_skipbad[i] = 0;
-       }
-
-       doing_iframe = 0;
+    /*
+     * stash the output buffer pointer in our stream so we don't have to
+     * pass it & its original value to everything we call.
+     */
+    stream->fwrite_buf = obuf;
+    stream->fwrite_buf_orig = obuf;
 
-       if ((stream->ts_number_video_pids == 0) || (stream->ts_number_audio_pids == 0))
+       // spin until we get a packet of data from some stream or hit eof
+       while ( 1 )
        {
-               hb_log("hb_ts_stream_decode  - no Video or Audio PID selected, cannot decode transport stream");
-               return;
-       }
-
-       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)
-       {
-      if ((fread(buf, 188, 1, stream->file_handle)) != 1)
+        if ((fread(buf, 188, 1, stream->file_handle)) != 1)
                {
             // 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;
+            return 0;
                }
 
+        /* This next section validates the packet */
+
                // Check sync byte
                if ((buf[0] != 0x47) && (buf[0] != 0x72) && (buf[0] != 0x29))
                {
@@ -1987,81 +1813,32 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
             {
                 hb_log( "hb_ts_stream_decode: eof while re-establishing sync @ %lld",
                         pos );
-                stream->ps_decode_buffer[stream->ps_current_write_buffer_index].len = 0;
-                return;
+                return 0;
             }
-            hb_log("hb_ts_stream_decode: sync lost @%lld, regained after %lld bytes",
-                    pos, pos2 );
-                       for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
-                       {
-                               stream->ts_skipbad[i] = 1;
-                       }
+            ts_warn( stream, "hb_ts_stream_decode: sync lost @%lld, "
+                     "regained after %lld bytes", pos, pos2 );
                        continue;
                }
 
-               // Get pid
-               int pid = (((buf[1] & 0x1F) << 8) | buf[2]) & 0x1FFF;
-
-               // Get the pos and buf - we organize our streams as 'n' video streams then 'm' audio streams
-      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)
-                       {
-            // not a pid we want
-                               continue;
-                       }
-                       else
-                       {
-                               curstream = stream->ts_number_video_pids + index_of_selected_pid;
-                       }
-               }
-               else
-                       curstream = index_of_selected_pid;
-
-               // Get start code
-               int start;
-               start = (buf[1] & 0x40) != 0;
-
-               if (!start && stream->ts_skipbad[curstream])
-                       continue;
+               // Get pid and use it to find stream state.
+               int pid = ((buf[1] & 0x1F) << 8) | buf[2];
+        if ( ( curstream = index_of_pid( pid, stream ) ) < 0 )
+            continue;
 
                // Get error
                int errorbit = (buf[1] & 0x80) != 0;
                if (errorbit)
                {
-                       hb_log("hb_ts_stream_decode - Error bit set in packet");
-                       stream->ts_skipbad[curstream] = 1;
+                       ts_err( stream, curstream,  "packet error bit set");
                        continue;
                }
 
                // Get adaption header info
                int adaption = (buf[3] & 0x30) >> 4;
                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) != 0))
-               {
-                       if (continuity != ((stream->ts_streamcont[curstream] + 1) & 0xF))
-                       {
-                               hb_log("hb_ts_stream_decode - Bad continuity code in packet");
-                               stream->ts_skipbad[curstream] = 1;
-                               continue;
-                       }
-                       stream->ts_streamcont[curstream] = continuity;
-               }
-
-               // Get adaption header size
                if (adaption == 0)
                {
-                       hb_log("hb_ts_stream_decode - Bad adaption code (code was 0)!");
-                       for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
-                       {
-                               stream->ts_skipbad[i] = 1;
-                       }
+                       ts_err( stream, curstream,  "adaptation code 0");
                        continue;
                }
                else if (adaption == 0x2)
@@ -2071,144 +1848,136 @@ 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 %d", adapt_len);
-                               for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
-                               {
-                                       stream->ts_skipbad[i] = 1;
-                               }
+                               ts_err( stream, curstream,  "invalid adapt len %d", adapt_len);
+                continue;
                        }
                }
 
-               // 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 (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;
-                       unsigned char *p = buf + 4 + adapt_len;
-                       while (p <= buf + 186)
-                       {
-                               if (p[0] == 0x0b && p[1] == 0x77)
-                               {
-                                       sync_found = 1;
-                                       break;
-                               }
-                               p++;
-                       }
+        // if there's an adaptation header & PCR_flag is set
+        // get the PCR (Program Clock Reference)
+        if ( adapt_len > 7 && ( buf[5] & 0x10 ) != 0 )
+        {
+            pcr = ( (uint64_t)buf[6] << (33 - 8) ) |
+                  ( (uint64_t)buf[7] << (33 - 16) ) |
+                  ( (uint64_t)buf[8] << (33 - 24) ) |
+                  ( (uint64_t)buf[9] << (33 - 32) ) |
+                  ( buf[10] >> 7 );
+            stream->ts_nextpcr = pcr;
+
+            // remember the pcr across calls to this routine
+            stream->ts_lastpcr = pcr;
+        }
 
-                       // Couldn't find an AC3 sync start in this packet.. don't make a PES packet!
-                       if (!sync_found)
-                       {
-                               adapt_len = 184;
-                               start = 0;
-                       }
+               if ( pcr == -1 )
+               {
+            // don't accumulate data until we get a pcr
+                   continue;
                }
 
-               // Found a random access point (now we can start a frame/audio packet..)
-               if (start)
+               // Get continuity
+        // Continuity only increments for adaption values of 0x3 or 0x01
+        // and is not checked for start packets.
+
+               int start = (buf[1] & 0x40) != 0;
+
+        if ( (adaption & 0x01) != 0 )
                {
-                       // Check to see if this is an i_frame (group of picture start)
-                       if (pid == stream->ts_video_pids[0])
-                       {
-                               // Look for the Group of Pictures packet.. indicates this is an I-Frame packet..
-                               doing_iframe = 0;
-                               unsigned int strid = 0;
-                               int i = 4;
-                               for (i = 4 + adapt_len; i < 188; i++)
-                               {
-                                       strid = (strid << 8) | buf[i];
-                                       if (strid == 0x000001B8) // group_start_code
-                                       {
-                                               // found a Group of Pictures header, subsequent picture must be an I-frame
-                                               doing_iframe = 1;
-                                       }
-                                       else if (strid == 0x000001B3) // sequence_header code
-                                       {
-                                               doing_iframe = 1;
-                                       }
-                                       else if (strid == 0x00000100) // picture_start_code
-                                       {
-                                               // picture_header, let's see if it's an I-frame
-                                               if (i<187)
-                                               {
-                                                       // check if picture_coding_type == 1
-                                                       if ((buf[i+2] & (0x7 << 3)) == (1 << 3))
-                                                       {
-                                                               // found an I-frame picture
-                                                               doing_iframe = 1;
-                                                       }
-                                               }
-                                       }
-
-                                       if (doing_iframe)
-                                       {
-                                               if (!stream->ts_foundfirst[curstream])
-                                               {
-                                                       stream->ts_foundfirst[curstream] = 1;
-//                                                     first_video_PCR = PCR;
-                                               }
-                                               break;
-                                       }
-                               }
-                       }
-                       else if (index_of_audio_pid(pid, stream) >= 0)
+            int continuity = (buf[3] & 0xF);
+            if ( continuity == stream->ts_streamcont[curstream] )
+            {
+                // we got a duplicate packet (usually used to introduce
+                // a PCR when one is needed). The only thing that can
+                // change in the dup is the PCR which we grabbed above
+                // so ignore the rest.
+                continue;
+            }
+            if ( !start && (stream->ts_streamcont[curstream] != -1) &&
+                 (continuity != ( (stream->ts_streamcont[curstream] + 1) & 0xf ) ) )
                        {
-                           if (stream->ts_foundfirst[0])  // Set audio found first ONLY after first video frame found. There's an assumption here that stream '0' is a video stream
-                               {
-                                       stream->ts_foundfirst[curstream] |= 1;
-                               }
+                               ts_err( stream, curstream,  "continuity error: got %d expected %d",
+                        (int)continuity,
+                        (stream->ts_streamcont[curstream] + 1) & 0xf );
+                stream->ts_streamcont[curstream] = continuity;
+                               continue;
                        }
+                       stream->ts_streamcont[curstream] = continuity;
+               }
+
+        /* If we get here the packet is valid - process its data */
+
+        if ( start )
+        {
+            // Found a random access point (now we can start a frame/audio packet..)
 
                        // If we were skipping a bad packet, start fresh on this new PES packet..
                        if (stream->ts_skipbad[curstream] == 1)
                        {
+                // video skips to an iframe after a bad packet to minimize
+                // screen corruption
+                if ( curstream == 0 && !isIframe( buf, adapt_len ) )
+                {
+                    continue;
+                }
                                stream->ts_skipbad[curstream] = 0;
-                               stream->ts_packetpos[curstream] = 0;
                        }
 
-                       // Get the continuity code of this packet
-                       stream->ts_streamcont[curstream] = continuity;
-               }
-
-               // Write a 2048 byte program stream packet..
-               if (start && stream->ts_packetpos[curstream] > 0 && stream->ts_foundfirst[curstream] && !stream->ts_skipbad[curstream])
-               {
-                       // Save the substream id block so we can added it to subsequent blocks
-                       int write_ac3 = 0;
-            if (curstream >= stream->ts_number_video_pids)
-                       {
-                               // 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
-                               {
-                    write_ac3 = hb_ts_handle_ac3_audio(stream, curstream, buf, adapt_len);
-                               }
+                       // If we don't have video yet, check to see if this is an
+            // i_frame (group of picture start)
+                       if ( curstream == 0 )
+            {
+                if ( !stream->ts_foundfirst[0] )
+                {
+                    if ( !isIframe( buf, adapt_len ) )
+                    {
+                        // didn't find an I frame
+                        continue;
+                    }
+                    stream->ts_foundfirst[0] = 1;
+                }
+                ++stream->frames;
+            }
+                       else if ( ! stream->ts_foundfirst[curstream] )
+            {
+                // start other streams only after first video frame found.
+                if ( ! stream->ts_foundfirst[0] )
+                {
+                    continue;
+                }
+                stream->ts_foundfirst[curstream] = 1;
                        }
 
-               if (generate_output_data(stream, write_ac3, curstream, pid) != 0)
-                       return ;
-               }
+            // If we have some data already on this stream, turn it into
+            // a program stream packet. Then add the payload for this
+            // packet to the current pid's buffer.
+            if ( stream->ts_pos[curstream] )
+            {
+                generate_output_data(stream, curstream);
+                stream->ts_start[curstream] = 1;
+                memcpy(stream->ts_buf[curstream],
+                       buf + 4 + adapt_len, 184 - adapt_len);
+                stream->ts_pos[curstream] = 184 - adapt_len;
+                return 1;
+            }
+            stream->ts_start[curstream] = 1;
+        }
 
                // Add the payload for this packet to the current buffer
                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)
+                       memcpy(stream->ts_buf[curstream] + stream->ts_pos[curstream],
+                   buf + 4 + adapt_len, 184 - adapt_len);
+                       stream->ts_pos[curstream] += 184 - adapt_len;
+
+            // if the next TS packet could possibly overflow our 2K output buffer
+            // we need to generate a packet now. Overflow would be 184 bytes of
+            // data + the 9 byte PES hdr + the 14 byte PACK hdr = 211 bytes.
+            if ( stream->ts_pos[curstream] >= (HB_DVD_READ_BUFFER_SIZE - 216) )
             {
-                hb_log("hb_ts_stream_decode: ts_packetbuf overflow, pos = %d ,"
-                       "len = %d", stream->ts_packetpos[curstream],
-                       184 - adapt_len );
-                return;
+                // we have enough data to make a PS packet
+                generate_output_data(stream, curstream);
+                return 1;
             }
-                       memcpy(stream->ts_packetbuf[curstream] + stream->ts_packetpos[curstream], buf + 4 + adapt_len, 184 - adapt_len);
-                       stream->ts_packetpos[curstream] += 184 - adapt_len;
                }
        }
 }
@@ -2220,21 +1989,24 @@ static void hb_ts_stream_decode(hb_stream_t *stream)
  **********************************************************************/
 static void hb_ts_stream_reset(hb_stream_t *stream)
 {
-       int i=0;
-       for (i=0; i < kNumDecodeBuffers; i++)
-       {
-               stream->ps_decode_buffer[i].read_pos = 0;
-               stream->ps_decode_buffer[i].write_pos = 0;
-               stream->ps_decode_buffer[i].len = 0;
-       }
+       int i;
 
        for (i=0; i < kMaxNumberDecodeStreams; i++)
        {
+               stream->ts_pos[i] = 0;
+               stream->ts_foundfirst[i] = 0;
+               stream->ts_skipbad[i] = 0;
                stream->ts_streamcont[i] = -1;
+               stream->ts_start[i] = 0;
        }
 
-       stream->ps_current_write_buffer_index = 0;
-       stream->ps_current_read_buffer_index = 1;
+    stream->ts_lastpcr = -1;
+    stream->ts_nextpcr = -1;
+
+    stream->frames = 0;
+    stream->errors = 0;
+    stream->last_error_frame = -10000;
+    stream->last_error_count = 0;
 
        align_to_next_packet(stream->file_handle);
 }