OSDN Git Service

bump ffmpeg from git-185a155 to git-0b32da9
[handbrake-jp/handbrake-jp-git.git] / libhb / stream.c
old mode 100755 (executable)
new mode 100644 (file)
index 109864f..4c11841
 /* $Id$
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
 #include "hb.h"
+#include "hbffmpeg.h"
 #include "lang.h"
 #include "a52dec/a52.h"
-
-#include <string.h>
+#include "mp4v2/mp4v2.h"
 
 #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
+/*
+ * This table defines how ISO MPEG stream type codes map to HandBrake
+ * codecs. It is indexed by the 8 bit stream type and contains the codec
+ * worker object id and a parameter for that worker proc (ignored except
+ * for the ffmpeg-based codecs in which case it is the ffmpeg codec id).
+ *
+ * Entries with a worker proc id of 0 or a kind of 'U' indicate that HB
+ * doesn't handle the stream type.
+ * N - Not used
+ * U - Unknown (to be determined by further processing)
+ * A - Audio
+ * V - Video
+ * P - PCR
+ */
+typedef enum { N, U, A, V, P } kind_t;
+typedef struct {
+    kind_t kind; /* not handled / unknown / audio / video */
+    int codec;          /* HB worker object id of codec */
+    int codec_param;    /* param for codec (usually ffmpeg codec id) */
+    const char* name;   /* description of type */
+} stream2codec_t;
+
+#define st(id, kind, codec, codec_param, name) \
+ [id] = { kind, codec, codec_param, name }
+
+static const stream2codec_t st2codec[256] = {
+    st(0x01, V, WORK_DECMPEG2,     0,              "MPEG1"),
+    st(0x02, V, WORK_DECMPEG2,     0,              "MPEG2"),
+    st(0x03, A, HB_ACODEC_MPGA,    CODEC_ID_MP2,   "MPEG1"),
+    st(0x04, A, HB_ACODEC_MPGA,    CODEC_ID_MP2,   "MPEG2"),
+    st(0x05, N, 0,                 0,              "ISO 13818-1 private section"),
+    st(0x06, U, 0,                 0,              "ISO 13818-1 PES private data"),
+    st(0x07, N, 0,                 0,              "ISO 13522 MHEG"),
+    st(0x08, N, 0,                 0,              "ISO 13818-1 DSM-CC"),
+    st(0x09, N, 0,                 0,              "ISO 13818-1 auxiliary"),
+    st(0x0a, N, 0,                 0,              "ISO 13818-6 encap"),
+    st(0x0b, N, 0,                 0,              "ISO 13818-6 DSM-CC U-N msgs"),
+    st(0x0c, N, 0,                 0,              "ISO 13818-6 Stream descriptors"),
+    st(0x0d, N, 0,                 0,              "ISO 13818-6 Sections"),
+    st(0x0e, N, 0,                 0,              "ISO 13818-1 auxiliary"),
+    st(0x0f, A, HB_ACODEC_MPGA,    CODEC_ID_AAC,   "ISO 13818-7 AAC Audio"),
+    st(0x10, V, WORK_DECAVCODECV,  CODEC_ID_MPEG4, "MPEG4"),
+    st(0x11, A, HB_ACODEC_MPGA,    CODEC_ID_AAC_LATM, "MPEG4 LATM AAC"),
+    st(0x12, U, 0,                 0,              "MPEG4 generic"),
+
+    st(0x14, N, 0,                 0,              "ISO 13818-6 DSM-CC download"),
+
+    st(0x1b, V, WORK_DECAVCODECV,  CODEC_ID_H264,  "H.264"),
+
+    st(0x80, N, HB_ACODEC_MPGA,    CODEC_ID_PCM_BLURAY, "DigiCipher II Video"),
+    st(0x81, A, HB_ACODEC_AC3,     0,              "AC-3"),
+    st(0x82, A, HB_ACODEC_DCA,     0,              "HDMV DTS"),
+    st(0x83, A, HB_ACODEC_LPCM,    0,              "LPCM/TrueHD"),
+    st(0x84, A, 0,                 0,              "SDDS/EAC3"),
+    st(0x85, U, 0,                 0,              "ATSC Program ID"),
+    st(0x86, A, HB_ACODEC_DCA,     0,              "DTS-HD"),
+    st(0x87, A, HB_ACODEC_MPGA,    CODEC_ID_EAC3,  "EAC3"),
+
+    st(0x8a, A, HB_ACODEC_DCA,     0,              "DTS"),
+
+    st(0x91, A, HB_ACODEC_AC3,     0,              "AC-3"),
+    st(0x92, N, 0,                 0,              "Subtitle"),
+
+    st(0x94, A, 0,                 0,              "SDDS"),
+    st(0xa0, V, 0,                 0,              "MSCODEC"),
+
+    st(0xea, V, WORK_DECAVCODECV,  CODEC_ID_VC1,   "VC1"),
+};
+#undef st
+
+typedef enum {
+    hb_stream_type_unknown = 0,
+    transport,
+    program,
+    dvd_program,
+    ffmpeg
+} hb_stream_type_t;
+
+#define kMaxNumberDecodeStreams 32
 #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;
-       
-       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;
+    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 */
+    int     packetsize;         /* Transport Stream packet size */
+
+    uint8_t need_keyframe;      // non-zero if want to start at a keyframe
+    uint8_t ts_found_pcr;       // non-zero if we've found at least one input pcr
+    int     ts_pcr_out;         // sequence number of most recent output pcr
+    int     ts_pcr_in;          // sequence number of most recent input pcr
+    int64_t ts_pcr;             // most recent input pcr
+    int64_t ts_pcrhist[4];      // circular buffer of output pcrs
+
+    uint8_t *ts_packet;         /* buffer for one TS packet */
+    hb_buffer_t *ts_buf[kMaxNumberDecodeStreams];
+    int     ts_pos[kMaxNumberDecodeStreams];
+    int8_t  ts_skipbad[kMaxNumberDecodeStreams];
+    int8_t  ts_streamcont[kMaxNumberDecodeStreams];
+    uint8_t ts_pkt_summary[kMaxNumberDecodeStreams][8];
+
+    hb_buffer_t *fwrite_buf;      /* PS buffer (set by hb_ts_stream_decode) */
+
+    int      chapter;           /* Chapter that we are currently in */
+    int64_t  chapter_end;       /* HB time that the current chapter ends */
+
+    /*
+     * 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.
+     */
+    uint8_t ts_number_pids;
+    uint8_t ts_flags;           // stream characteristics:
+#define         TS_HAS_PCR  (1 << 0)    // at least one PCR seen
+#define         TS_HAS_RAP  (1 << 1)    // Random Access Point bit seen
+#define         TS_HAS_RSEI (1 << 2)    // "Restart point" SEI seen
+    uint8_t ts_IDRs;            // # IDRs found during duration scan
+
+    int16_t ts_pids[kMaxNumberDecodeStreams];
+
+    uint32_t ts_format_id[kMaxNumberDecodeStreams];
+#define TS_FORMAT_ID_AC3 (('A' << 24) | ('C' << 16) | ('-' << 8) | '3')
+    uint8_t ts_stream_type[kMaxNumberDecodeStreams];
+    kind_t  ts_stream_kind[kMaxNumberDecodeStreams];
+    uint8_t ts_multiplexed[kMaxNumberDecodeStreams];
+
+    char    *path;
+    FILE    *file_handle;
+    hb_stream_type_t hb_stream_type;
+    hb_title_t *title;
+
+    AVFormatContext *ffmpeg_ic;
+    AVPacket *ffmpeg_pkt;
+    double ffmpeg_tsconv[MAX_STREAMS];
+    uint8_t ffmpeg_video_id;
+
+    struct {
+        int lang_code;
+        int flags;
+        int rate;
+        int bitrate;
+    } a52_info[kMaxNumberDecodeStreams];
+
+    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;
+        uint32_t reg_desc;
+        int program_info_length;
+        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,25 +198,139 @@ 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, hb_buffer_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);
+                                                       int idx);
 static void hb_ps_stream_find_audio_ids(hb_stream_t *stream, hb_title_t *title);
-static off_t align_to_next_packet(FILE* f);
+static off_t align_to_next_packet(hb_stream_t *stream);
+
+static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title );
+static void ffmpeg_close( hb_stream_t *d );
+static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream );
+static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf );
+static int ffmpeg_seek( hb_stream_t *stream, float frac );
+static int ffmpeg_seek_ts( hb_stream_t *stream, int64_t ts );
 
 /*
  * 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_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 );
+}
+
+/*
+ * logging routines.
+ * these frontend hb_log because transport streams can have a lot of errors
+ * so we want to rate limit messages. this routine limits the number of
+ * messages to at most one per minute of video. other errors that occur
+ * during the minute are counted & the count is output with the next
+ * error msg we print.
  */
-static hb_stream_t *current_stream;
+static void ts_warn_helper( hb_stream_t *stream, char *log, va_list args )
+{
+    // 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];
+
+        vsnprintf( msg, sizeof(msg), log, args );
+
+        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;
+    }
+}
+
+static void ts_warn( hb_stream_t*, char*, ... ) HB_WPRINTF(2,3);
+static void ts_err( hb_stream_t*, int, char*, ... ) HB_WPRINTF(3,4);
+
+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 kind_t ts_stream_kind( hb_stream_t *stream, int curstream )
+{
+    return st2codec[stream->ts_stream_type[curstream]].kind;
+}
 
+static int index_of_pid(hb_stream_t *stream, int pid)
+{
+    int i;
+
+    for ( i = 0; i < stream->ts_number_pids; ++i )
+        if ( pid == stream->ts_pids[i] )
+            return i;
+
+    return -1;
+}
+
+static int index_of_video(hb_stream_t *stream)
+{
+    int i;
 
-static inline int check_ps_sync(const uint8_t *buf)
+    for ( i = 0; i < stream->ts_number_pids; ++i )
+        if ( V == stream->ts_stream_kind[i] )
+            return i;
+
+    return -1;
+}
+
+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 check_ps_sync(const uint8_t *buf)
 {
     // a legal MPEG program stream must start with a Pack header in the
     // first four bytes.
@@ -126,39 +338,106 @@ static inline int check_ps_sync(const uint8_t *buf)
            (buf[2] == 0x01) && (buf[3] == 0xba);
 }
 
-static inline int check_ts_sync(const uint8_t *buf)
+static int check_ps_sc(const uint8_t *buf)
+{
+    // a legal MPEG program stream must start with a Pack followed by a
+    // some other start code. If we've already verified the pack, this skip
+    // it and checks for a start code prefix.
+    int pos = 14 + ( buf[13] & 0x7 );   // skip over the PACK
+    return (buf[pos+0] == 0x00) && (buf[pos+1] == 0x00) && (buf[pos+2] == 0x01);
+}
+
+static int check_ts_sync(const uint8_t *buf)
 {
     // must have initial sync byte, no scrambling & a legal adaptation ctrl
     return (buf[0] == 0x47) && ((buf[3] >> 6) == 0) && ((buf[3] >> 4) > 0);
 }
 
-static inline int have_ts_sync(const uint8_t *buf)
+static int have_ts_sync(const uint8_t *buf, int psize)
 {
-    return check_ts_sync(&buf[0*188]) && check_ts_sync(&buf[1*188]) &&
-           check_ts_sync(&buf[2*188]) && check_ts_sync(&buf[3*188]) &&
-           check_ts_sync(&buf[4*188]) && check_ts_sync(&buf[5*188]) &&
-           check_ts_sync(&buf[6*188]) && check_ts_sync(&buf[7*188]);
+    return check_ts_sync(&buf[0*psize]) && check_ts_sync(&buf[1*psize]) &&
+           check_ts_sync(&buf[2*psize]) && check_ts_sync(&buf[3*psize]) &&
+           check_ts_sync(&buf[4*psize]) && check_ts_sync(&buf[5*psize]) &&
+           check_ts_sync(&buf[6*psize]) && check_ts_sync(&buf[7*psize]);
 }
 
 static int hb_stream_check_for_ts(const uint8_t *buf)
 {
     // transport streams should have a sync byte every 188 bytes.
-    // search the first KB of buf looking for at least 8 consecutive
+    // search the first 8KB of buf looking for at least 8 consecutive
     // correctly located sync patterns.
     int offset = 0;
 
-    for ( offset = 0; offset < 1024; ++offset )
+    for ( offset = 0; offset < 8*1024-8*188; ++offset )
     {
-        if ( have_ts_sync( &buf[offset]) )
-            return 1;
+        if ( have_ts_sync( &buf[offset], 188) )
+            return 188 | (offset << 8);
+        if ( have_ts_sync( &buf[offset], 192) )
+            return 192 | (offset << 8);
+        if ( have_ts_sync( &buf[offset], 204) )
+            return 204 | (offset << 8);
+        if ( have_ts_sync( &buf[offset], 208) )
+            return 208 | (offset << 8);
+    }
+    return 0;
+}
+
+static int hb_stream_check_for_ps(hb_stream_t *stream)
+{
+    uint8_t buf[2048*4];
+    uint8_t sc_buf[4];
+    int pos = 0;
+    int hits = 0;
+
+    fseek(stream->file_handle, 0, SEEK_SET);
+
+    // program streams should start with a PACK then some other mpeg start 
+    // code (usually a SYS but that might be missing if we only have a clip). 
+    while (pos < 512 * 1024)
+    {
+        int offset;
+
+        if ( fread(buf, 1, sizeof(buf), stream->file_handle) != sizeof(buf) )
+            return 0;
+
+        for ( offset = 0; offset < 8*1024-27; ++offset )
+        {
+            if ( check_ps_sync( &buf[offset] ) && check_ps_sc( &buf[offset] ) )
+            {
+                int pes_offset, prev, data_len;
+                uint8_t sid;
+
+                if ( ++hits == 3 )
+                    return 1;
+                pes_offset = 14 + (buf[13] & 0x7);
+                sid = buf[pes_offset+3];
+                data_len = (buf[pes_offset+4] << 8) + buf[pes_offset+5];
+                if ( data_len && sid > 0xba && sid < 0xf9 )
+                {
+                    prev = ftell( stream->file_handle );
+                    pos = pes_offset + 6 + data_len + prev;
+                    fseek( stream->file_handle, pos, SEEK_SET );
+                    if ( fread(sc_buf, 1, 4, stream->file_handle) != 4 )
+                        return 0;
+                    if (sc_buf[0] == 0x00 && sc_buf[1] == 0x00 && 
+                        sc_buf[2] == 0x01)
+                    {
+                        return 1;
+                    }
+                    fseek( stream->file_handle, prev, SEEK_SET );
+                }
+            }
+        }
+        fseek( stream->file_handle, -27, SEEK_CUR );
+        pos = ftell( stream->file_handle );
     }
     return 0;
 }
 
-static int hb_stream_check_for_ps(const uint8_t *buf)
+static int hb_stream_check_for_dvd_ps(const uint8_t *buf)
 {
-    // program streams should have a Pack header every 2048 bytes.
-    // check that we have 4 of these.
+    // DVD program streams should have a Pack header every 2048 bytes.
+    // check that we have 4 of these in a row.
     return check_ps_sync(&buf[0*2048]) && check_ps_sync(&buf[1*2048]) &&
            check_ps_sync(&buf[2*2048]) && check_ps_sync(&buf[3*2048]);
 }
@@ -169,54 +448,100 @@ static int hb_stream_get_type(hb_stream_t *stream)
 
     if ( fread(buf, 1, sizeof(buf), stream->file_handle) == sizeof(buf) )
     {
-        if ( hb_stream_check_for_ts(buf) != 0 )
+        int psize;
+        if ( ( psize = hb_stream_check_for_ts(buf) ) != 0 )
         {
-            hb_log("file is MPEG Transport Stream");
-            stream->stream_type = hb_stream_type_transport;
+            int offset = psize >> 8;
+            psize &= 0xff;
+            hb_log("file is MPEG Transport Stream with %d byte packets"
+                   " offset %d bytes", psize, offset);
+            stream->packetsize = psize;
+            stream->hb_stream_type = transport;
             hb_ts_stream_init(stream);
+            if ( index_of_video( stream ) < 0 )
+            {
+                return 0;
+            }
             return 1;
         }
-        if ( hb_stream_check_for_ps(buf) != 0 )
+        if ( hb_stream_check_for_dvd_ps(buf) != 0 )
+        {
+            hb_log("file is MPEG DVD Program Stream");
+            stream->hb_stream_type = dvd_program;
+            return 1;
+        }
+        if ( hb_stream_check_for_ps(stream) != 0 )
         {
             hb_log("file is MPEG Program Stream");
-            stream->stream_type = hb_stream_type_program;
+            stream->hb_stream_type = program;
             return 1;
         }
     }
     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 );
-               d->file_handle = NULL;
-    }
-
-       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])
-               {
-                       free(d->ts_packetbuf[i]);
-                       d->ts_packetbuf[i] = NULL;
-               }
-       }
+        d->file_handle = NULL;
+    }
+
+    int i=0;
+
+    if ( d->ts_packet )
+    {
+        free( d->ts_packet );
+        d->ts_packet = NULL;
+    }
+    for (i = 0; i < kMaxNumberDecodeStreams; i++)
+    {
+        if (d->ts_buf[i])
+        {
+            hb_buffer_close(&(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;
+}
+
+static int audio_inactive( hb_stream_t *stream, int idx )
+{
+    int pid = stream->ts_pids[idx];
+
+    if ( pid < 0 )
+    {
+        // PID declared inactive by hb_stream_title_scan
+        return 1;
+    }
+    if ( pid == stream->pmt_info.PCR_PID )
+    {
+        // PCR PID is always active
+        return 0;
+    }
+
+    // see if we should make the stream inactive because scan.c didn't
+    // find a valid audio bitstream.
+    int i;
+    for ( i = 0; i < hb_list_count( stream->title->list_audio ); ++i )
+    {
+        hb_audio_t *audio = hb_list_item( stream->title->list_audio, i );
+        if ( audio->id == pid )
+        {
+            return 0;
+        }
+    }
+
+    // not in the title's audio list - declare the PID inactive
+    stream->ts_pids[idx] = -stream->ts_pids[idx];
+    return 1;
 }
 
 /***********************************************************************
@@ -224,38 +549,192 @@ 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, hb_title_t *title )
 {
-    if (current_stream)
+    FILE *f = fopen( path, "rb" );
+    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 ( title && ss && ss->hb_stream_type != ffmpeg )
     {
+        /*
+         * copy the saved state since we might be encoding the same stream
+         * multiple times.
+         */
+        memcpy( d, ss, sizeof(*d) );
+        d->file_handle = f;
+        d->title = title;
         d->path = strdup( path );
-        if (d->path != NULL &&  hb_stream_get_type( d ) != 0 )
+
+        if ( d->hb_stream_type == transport )
+        {
+            d->ts_packet = malloc( d->packetsize );
+
+            int i;
+            for ( i = 0; i < d->ts_number_pids; i++)
+            {
+                if ( d->ts_stream_kind[i] == A &&
+                     audio_inactive( d, i ) )
+                {
+                    // this PID isn't wanted (we don't have a codec for it
+                    // or scan didn't find audio parameters)
+                    continue;
+                }
+                d->ts_buf[i] = hb_buffer_init(d->packetsize);
+                d->ts_buf[i]->size = 0;
+            }
+            hb_stream_seek( d, 0. );
+        }
+        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->title = title;
+    d->path = strdup( path );
+    if (d->path != NULL )
+    {
+        if ( hb_stream_get_type( d ) != 0 )
+        {
+            return d;
+        }
+        fclose( d->file_handle );
+        d->file_handle = NULL;
+        if ( ffmpeg_open( d, title ) )
         {
-            current_stream = d;
             return d;
         }
+    }
+    if ( d->file_handle )
+    {
         fclose( d->file_handle );
-        if (d->path)
-            free( d->path );
+    }
+    if (d->path)
+    {
+        free( d->path );
     }
     hb_log( "hb_stream_open: open %s failed", path );
     free( d );
     return NULL;
 }
 
+hb_stream_t * hb_bd_stream_open( hb_title_t *title )
+{
+    int ii;
+
+    hb_stream_t *d = calloc( sizeof( hb_stream_t ), 1 );
+    if ( d == NULL )
+    {
+        hb_log( "hb_bd_stream_open: can't allocate space for stream state" );
+        return NULL;
+    }
+
+    for (ii = 0; ii < kMaxNumberDecodeStreams; ii++)
+    {
+        d->ts_streamcont[ii] = -1;
+        d->ts_pids[ii] = -1;
+    }
+
+    d->file_handle = NULL;
+    d->title = title;
+    d->path = NULL;
+    d->ts_packet = NULL;
+
+    d->ts_number_pids = 0;
+    d->ts_pids[0] = title->video_id;
+    d->ts_stream_type[0] = title->video_stream_type;
+    d->ts_stream_kind[0] = V;
+    d->ts_number_pids++;
+
+    hb_audio_t * audio;
+    for ( ii = 0; ( audio = hb_list_item( title->list_audio, ii ) ); ++ii )
+    {
+        d->ts_pids[d->ts_number_pids] = audio->id;
+        d->ts_stream_type[d->ts_number_pids] = audio->config.in.stream_type;
+        d->ts_stream_kind[d->ts_number_pids] = A;
+
+        if ( d->ts_stream_type[d->ts_number_pids] == 0x83 &&
+             title->reg_desc == STR4_TO_UINT32("HDMV") )
+        {
+            // This is an interleaved TrueHD/AC-3 stream and the esid of
+            // the AC-3 is 0x76
+            d->ts_multiplexed[d->ts_number_pids] = 0x76;
+            d->ts_stream_type[d->ts_number_pids] = 0x81;
+        }
+        if ( d->ts_stream_type[d->ts_number_pids] == 0x86 &&
+             title->reg_desc == STR4_TO_UINT32("HDMV") )
+        {
+            // This is an interleaved DTS-HD/DTS stream and the esid of
+            // the DTS is 0x71
+            d->ts_multiplexed[d->ts_number_pids] = 0x71;
+            d->ts_stream_type[d->ts_number_pids] = 0x82;
+        }
+        if ( d->ts_stream_type[d->ts_number_pids] == 0x84 &&
+             title->reg_desc == STR4_TO_UINT32("HDMV") )
+        {
+            // EAC3 audio in bluray has an stype of 0x84
+            // which conflicts with SDDS
+            // To distinguish, Bluray streams have a reg_desc of HDMV
+            d->ts_stream_type[d->ts_number_pids] = 0x87;
+        }
+
+        d->ts_number_pids++;
+    }
+
+    d->ts_flags = TS_HAS_RAP;
+    // When scanning, title->job == NULL.  We don't need to wait for
+    // a PCR when scanning. In fact, it trips us up on the first
+    // preview of every title since we would have to read quite a
+    // lot of data before finding the PCR.
+    if (title->pcr_pid != 0xFFFF && title->job)
+    {
+        if ( index_of_pid( d, title->pcr_pid ) < 0 )
+        {
+            // BD PCR PID is specified to always be 0x1001
+            d->ts_pids[d->ts_number_pids] = 0x1001;
+            d->ts_stream_kind[d->ts_number_pids] = P;
+            d->ts_number_pids++;
+        }
+    }
+
+    d->packetsize = 192;
+    d->hb_stream_type = transport;
+
+    for ( ii = 0; ii < d->ts_number_pids; ii++ )
+    {
+        d->ts_buf[ii] = hb_buffer_init(d->packetsize);
+        d->ts_buf[ii]->size = 0;
+    }
+
+    return d;
+}
+
 /***********************************************************************
  * hb_stream_close
  ***********************************************************************
@@ -263,6 +742,41 @@ hb_stream_t * hb_stream_open( char * path )
  **********************************************************************/
 void hb_stream_close( hb_stream_t ** _d )
 {
+    hb_stream_t *stream = * _d;
+
+    if ( stream->hb_stream_type == ffmpeg )
+    {
+        ffmpeg_close( stream );
+        hb_stream_delete( stream );
+        *_d = NULL;
+        return;
+    }
+
+    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->title == NULL )
+    {
+        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
@@ -270,20 +784,15 @@ void hb_stream_close( hb_stream_t ** _d )
  * now have an audio codec, type, rate, etc., associated with them. At the end
  * of the scan we delete all the audio entries that weren't found by the scan
  * or don't have a format we support. This routine deletes audio entry 'indx'
- * by copying all later entries down one slot. */
-static void hb_stream_delete_audio_entry(hb_stream_t *stream, int indx)
+ * by setting its PID to an invalid value so no packet will match it. (We can't
+ * move any of the entries since the index of the entry is used as the id
+ * of the media stream for HB. */
+static void hb_stream_delete_entry(hb_stream_t *stream, int indx)
 {
-    int i;
-
-    for (i = indx+1; i < stream->ts_number_audio_pids; ++i)
+    if ( stream->ts_pids[indx] > 0 )
     {
-        stream->ts_audio_pids[indx] = stream->ts_audio_pids[i];
-        stream->ts_audio_stream_type[indx] = stream->ts_audio_stream_type[i];
-        stream->ts_streamid[stream->ts_number_video_pids + indx] =
-            stream->ts_streamid[stream->ts_number_video_pids + i];
-        ++indx;
+        stream->ts_pids[indx] = -stream->ts_pids[indx];
     }
-    --stream->ts_number_audio_pids;
 }
 
 /***********************************************************************
@@ -293,22 +802,26 @@ static void hb_stream_delete_audio_entry(hb_stream_t *stream, int indx)
  **********************************************************************/
 hb_title_t * hb_stream_title_scan(hb_stream_t *stream)
 {
+    if ( stream->hb_stream_type == ffmpeg )
+        return ffmpeg_title_scan( stream );
+
     // 'Barebones Title'
     hb_title_t *aTitle = hb_title_init( stream->path, 0 );
+    aTitle->type = HB_STREAM_TYPE;
     aTitle->index = 1;
 
-       // Copy part of the stream path to the title name
-       char *sep = strrchr(stream->path, '/');
-       if (sep)
-               strcpy(aTitle->name, sep+1);
-       char *dot_term = strrchr(aTitle->name, '.');
-       if (dot_term)
-               *dot_term = '\0';
-       
+    // Copy part of the stream path to the title name
+    char *sep = strrchr(stream->path, '/');
+    if (sep)
+        strcpy(aTitle->name, sep+1);
+    char *dot_term = strrchr(aTitle->name, '.');
+    if (dot_term)
+        *dot_term = '\0';
+
     // Height, width,  rate and aspect ratio information is filled in when the previews are built
 
     hb_stream_duration(stream, aTitle);
-    
+
     // One Chapter
     hb_chapter_t * chapter;
     chapter = calloc( sizeof( hb_chapter_t ), 1 );
@@ -318,7 +831,7 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream)
     chapter->minutes = aTitle->minutes;
     chapter->seconds = aTitle->seconds;
     hb_list_add( aTitle->list_chapter, chapter );
-    
+
     // Figure out how many audio streams we really have:
     // - For transport streams, for each PID listed in the PMT (whether
     //   or not it was an audio stream type) read the bitstream until we
@@ -326,74 +839,264 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream)
     //   the elementary stream is an audio type.
     // - For program streams read the first 4MB and take every unique
     //   audio stream we find.
-       if (stream->stream_type == hb_stream_type_transport)
-       {
+    if (stream->hb_stream_type == transport)
+    {
         int i;
 
-        for (i=0; i < stream->ts_number_audio_pids; i++)
+        for (i=0; i < stream->ts_number_pids; i++)
         {
             hb_audio_t *audio = hb_ts_stream_set_audio_id_and_codec(stream, i);
-            if (audio->codec)
+            if ( audio )
+            {
                 hb_list_add( aTitle->list_audio, audio );
-            else
+            }
+        }
+
+        // make sure we're grabbing the PCR PID
+        if ( index_of_pid( stream, stream->pmt_info.PCR_PID ) < 0 )
+        {
+            stream->ts_pids[stream->ts_number_pids] = stream->pmt_info.PCR_PID;
+            stream->ts_stream_kind[stream->ts_number_pids] = P;
+            stream->ts_number_pids++;
+        }
+
+        for (i = 0; i < stream->ts_number_pids; i++)
+        {
+            kind_t kind = stream->ts_stream_kind[i];
+
+            if ( kind == N || kind == U )
             {
-                free(audio);
-                hb_stream_delete_audio_entry(stream, i);
-                --i;
+                hb_stream_delete_entry(stream, i);
             }
         }
-       }
+
+        // set the video id, codec & muxer
+        int idx = index_of_video( stream );
+        if ( idx < 0 )
+        {
+            hb_title_close( &aTitle );
+            return NULL;
+        }
+
+        aTitle->video_id = stream->ts_pids[idx];
+        aTitle->video_codec = st2codec[stream->ts_stream_type[idx]].codec;
+        aTitle->video_codec_param = st2codec[stream->ts_stream_type[idx]].codec_param;
+        aTitle->demuxer = HB_MPEG2_TS_DEMUXER;
+
+        if ( ( stream->ts_flags & TS_HAS_PCR ) == 0 )
+        {
+            hb_log( "transport stream missing PCRs - using video DTS instead" );
+        }
+
+        if ( stream->ts_IDRs < 1 )
+        {
+            hb_log( "transport stream doesn't seem to have video IDR frames" );
+            aTitle->flags |= HBTF_NO_IDR;
+        }
+    }
     else
     {
         hb_ps_stream_find_audio_ids(stream, aTitle);
     }
 
-  return aTitle;
+    return aTitle;
 }
 
 /*
- * scan the next MB of 'stream' to find the next start packet for
- * the Packetized Elementary Stream associated with TS PID 'pid'.
+ * read the next transport stream packet from 'stream'. Return NULL if
+ * we hit eof & a pointer to the sync byte otherwise.
  */
-static const uint8_t *hb_ts_stream_getPEStype(hb_stream_t *stream, uint32_t pid)
+static const uint8_t *next_packet( hb_stream_t *stream )
 {
-    static uint8_t buf[188];
-    int npack = 100000; // max packets to read
+    uint8_t *buf = stream->ts_packet + stream->packetsize - 188;
 
-    while (--npack >= 0)
+    while ( 1 )
     {
-        if (fread(buf, 1, 188, stream->file_handle) != 188)
+        if ( fread(stream->ts_packet, 1, stream->packetsize, stream->file_handle) !=
+             stream->packetsize )
         {
-            hb_log("hb_ts_stream_getPEStype: EOF while searching for PID 0x%x", pid);
-            return 0;
+            return NULL;
         }
-        if (buf[0] != 0x47)
+        if (buf[0] == 0x47)
         {
-            hb_log("hb_ts_stream_getPEStype: lost sync while searching for PID 0x%x", pid);
-            align_to_next_packet(stream->file_handle);
-            continue;
+            return buf;
         }
-
-        /*
-         * The PES header is only in TS packets with 'start' set so we check
-         * that first then check for the right PID.
-         */
-        if ((buf[1] & 0x40) == 0 || (buf[1] & 0x1f) != (pid >> 8) ||
-            buf[2] != (pid & 0xff))
+        // lost sync - back up to where we started then try to re-establish.
+        off_t pos = ftello(stream->file_handle) - stream->packetsize;
+        off_t pos2 = align_to_next_packet(stream);
+        if ( pos2 == 0 )
         {
-            // not a start packet or not the pid we want
-            continue;
+            hb_log( "next_packet: eof while re-establishing sync @ %"PRId64, pos );
+            return NULL;
         }
+        ts_warn( stream, "next_packet: sync lost @ %"PRId64", regained after %"PRId64" bytes",
+                 pos, pos2 );
+    }
+}
 
-        /* skip over the TS hdr to return a pointer to the PES hdr */
-        int udata = 4;
-        switch (buf[3] & 0x30)
-        {
-            case 0x00: // illegal
-            case 0x20: // fill packet
-                continue;
+/*
+ * skip to the start of the next PACK header in program stream src_stream.
+ */
+static void skip_to_next_pack( hb_stream_t *src_stream )
+{
+    // scan forward until we find the start of the next pack
+    uint32_t strt_code = -1;
+    int c;
 
-            case 0x30: // adaptation
+    flockfile( src_stream->file_handle );
+    while ( ( c = getc_unlocked( src_stream->file_handle ) ) != EOF )
+    {
+        strt_code = ( strt_code << 8 ) | c;
+        if ( strt_code == 0x000001ba )
+            // we found the start of the next pack
+            break;
+    }
+    funlockfile( src_stream->file_handle );
+
+    // if we didn't terminate on an eof back up so the next read
+    // starts on the pack boundary.
+    if ( c != EOF )
+    {
+        fseeko( src_stream->file_handle, -4, SEEK_CUR );
+    }
+}
+
+static int isIframe( hb_stream_t *stream, const uint8_t *buf, int adapt_len )
+{
+    // For mpeg2: look for a gop start or i-frame picture start
+    // for h.264: look for idr nal type or a slice header for an i-frame
+    // for vc1:   look for a Sequence header
+    int i;
+    uint32_t strid = 0;
+
+
+    if ( stream->ts_stream_type[0] <= 2 )
+    {
+        // This section of the code handles MPEG-1 and MPEG-2 video streams
+        for (i = 13 + adapt_len; i < 188; i++)
+        {
+            strid = (strid << 8) | buf[i];
+            if ( ( strid >> 8 ) == 1 )
+            {
+                // we found a start code
+                uint8_t id = strid;
+                switch ( id )
+                {
+                    case 0xB8: // group_start_code (GOP header)
+                    case 0xB3: // sequence_header code
+                        return 1;
+
+                    case 0x00: // 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;
+    }
+    if ( stream->ts_stream_type[0] == 0x1b )
+    {
+        // we have an h.264 stream 
+        for (i = 13 + adapt_len; i < 188; i++)
+        {
+            strid = (strid << 8) | buf[i];
+            if ( ( strid >> 8 ) == 1 )
+            {
+                // we found a start code - remove the ref_idc from the nal type
+                uint8_t nal_type = strid & 0x1f;
+                if ( nal_type == 0x05 )
+                    // h.264 IDR picture start
+                    return 1;
+            }
+        }
+        // didn't find an I-frame
+        return 0;
+    }
+    if ( stream->ts_stream_type[0] == 0xea )
+    {
+        // we have an vc1 stream 
+        for (i = 13 + adapt_len; i < 188; i++)
+        {
+            strid = (strid << 8) | buf[i];
+            if ( strid == 0x10f )
+            {
+                // the ffmpeg vc1 decoder requires a seq hdr code in the first
+                // frame.
+                return 1;
+            }
+        }
+        // didn't find an I-frame
+        return 0;
+    }
+
+    // we don't understand the stream type so just say "yes" otherwise
+    // we'll discard all the video.
+    return 1;
+}
+
+/*
+ * scan the next MB of 'stream' to find the next start packet for
+ * the Packetized Elementary Stream associated with TS PID 'pid'.
+ */
+static const uint8_t *hb_ts_stream_getPEStype(hb_stream_t *stream, uint32_t pid)
+{
+    int npack = 300000; // max packets to read
+
+    while (--npack >= 0)
+    {
+        const uint8_t *buf = next_packet( stream );
+        if ( buf == NULL )
+        {
+            hb_log("hb_ts_stream_getPEStype: EOF while searching for PID 0x%x", pid);
+            return 0;
+        }
+
+        // while we're reading the stream, check if it has valid PCRs
+        // and/or random access points.
+        uint32_t pack_pid = ( (buf[1] & 0x1f) << 8 ) | buf[2];
+        if ( pack_pid == stream->pmt_info.PCR_PID )
+        {
+            if ( ( buf[5] & 0x10 ) &&
+                 ( ( ( buf[3] & 0x30 ) == 0x20 ) ||
+                   ( ( buf[3] & 0x30 ) == 0x30 && buf[4] > 6 ) ) )
+            {
+                stream->ts_flags |= TS_HAS_PCR;
+            }
+        }
+        if ( buf[5] & 0x40 )
+        {
+            stream->ts_flags |= TS_HAS_RAP;
+        }
+
+        /*
+         * The PES header is only in TS packets with 'start' set so we check
+         * that first then check for the right PID.
+         */
+        if ((buf[1] & 0x40) == 0 || pack_pid != pid )
+        {
+            // not a start packet or not the pid we want
+            continue;
+        }
+
+        /* skip over the TS hdr to return a pointer to the PES hdr */
+        int udata = 4;
+        switch (buf[3] & 0x30)
+        {
+            case 0x00: // illegal
+            case 0x20: // fill packet
+                continue;
+
+            case 0x30: // adaptation
                 if (buf[4] > 182)
                 {
                     hb_log("hb_ts_stream_getPEStype: invalid adaptation field length %d for PID 0x%x", buf[4], pid);
@@ -402,7 +1105,11 @@ static const uint8_t *hb_ts_stream_getPEStype(hb_stream_t *stream, uint32_t pid)
                 udata += buf[4] + 1;
                 break;
         }
-        return &buf[udata];
+        /* PES hdr has to begin with an mpeg start code */
+        if (buf[udata+0] == 0x00 && buf[udata+1] == 0x00 && buf[udata+2] == 0x01)
+        {
+            return &buf[udata];
+        }
     }
 
     /* didn't find it */
@@ -422,7 +1129,7 @@ static uint64_t hb_ps_stream_getVideoPTS(hb_stream_t *stream)
         hb_buffer_t *es;
 
         // 'buf' contains an MPEG2 PACK - get a list of all it's elementary streams
-        hb_demux_ps(buf, list);
+        hb_demux_ps( buf, list, 0 );
 
         while ( ( es = hb_list_item( list, 0 ) ) )
         {
@@ -450,37 +1157,56 @@ static uint64_t hb_ps_stream_getVideoPTS(hb_stream_t *stream)
  * hb_stream_duration
  ***********************************************************************
  *
+ * Finding stream duration is difficult.  One issue is that the video file
+ * may have chunks from several different program fragments (main feature,
+ * commercials, station id, trailers, etc.) all with their own base pts
+ * value.  We can't find the piece boundaries without reading the entire
+ * file but if we compute a rate based on time stamps from two different
+ * pieces the result will be meaningless.  The second issue is that the
+ * data rate of compressed video normally varies by 5-10x over the length
+ * of the video. This says that we want to compute the rate over relatively
+ * long segments to get a representative average but long segments increase
+ * the likelihood that we'll cross a piece boundary.
+ *
+ * What we do is take time stamp samples at several places in the file
+ * (currently 16) then compute the average rate (i.e., ticks of video per
+ * byte of the file) for all pairs of samples (N^2 rates computed for N
+ * samples). Some of those rates will be absurd because the samples came
+ * from different segments. Some will be way low or high because the
+ * samples came from a low or high motion part of the segment. But given
+ * that we're comparing *all* pairs the majority of the computed rates
+ * should be near the overall average.  So we median filter the computed
+ * rates to pick the most representative value.
+ *
  **********************************************************************/
 struct pts_pos {
     uint64_t pos;   /* file position of this PTS sample */
     uint64_t pts;   /* PTS from video stream */
 };
 
+#define NDURSAMPLES 128
+
+// get one (position, timestamp) sampple from a transport or program
+// stream.
 static struct pts_pos hb_sample_pts(hb_stream_t *stream, uint64_t fpos)
 {
     struct pts_pos pp = { 0, 0 };
 
-    if ( stream->stream_type == hb_stream_type_program )
-    {
-        // round address down to nearest dvd sector start
-        fpos &=~ ( HB_DVD_READ_BUFFER_SIZE - 1 );
-        fseeko( stream->file_handle, fpos, SEEK_SET );
-        pp.pts = hb_ps_stream_getVideoPTS( stream );
-    }
-    else
+    if ( stream->hb_stream_type == transport )
     {
         const uint8_t *buf;
         fseeko( stream->file_handle, fpos, SEEK_SET );
-        align_to_next_packet( stream->file_handle );
-        buf = hb_ts_stream_getPEStype( stream, stream->ts_video_pids[0] );
+        align_to_next_packet( stream );
+        int pid = stream->ts_pids[index_of_video(stream)];
+        buf = hb_ts_stream_getPEStype( stream, pid );
         if ( buf == NULL )
         {
-            hb_log("hb_sample_pts: couldn't find video packet near %llu", fpos);
+            hb_log("hb_sample_pts: couldn't find video packet near %"PRIu64, fpos);
             return pp;
         }
         if ( ( buf[7] >> 7 ) != 1 )
         {
-            hb_log("hb_sample_pts: no PTS in video packet near %llu", fpos);
+            hb_log("hb_sample_pts: no PTS in video packet near %"PRIu64, fpos);
             return pp;
         }
         pp.pts = ( ( (uint64_t)buf[9] >> 1 ) & 7 << 30 ) |
@@ -488,42 +1214,100 @@ static struct pts_pos hb_sample_pts(hb_stream_t *stream, uint64_t fpos)
                  ( ( (uint64_t)buf[11] >> 1 ) << 15 ) |
                  ( (uint64_t)buf[12] << 7 ) |
                  ( (uint64_t)buf[13] >> 1 );
+
+        if ( isIframe( stream, buf, -4 ) )
+        {
+            if (  stream->ts_IDRs < 255 )
+            {
+                ++stream->ts_IDRs;
+            }
+        }
+    }
+    else
+    {
+        // round address down to nearest dvd sector start
+        fpos &=~ ( HB_DVD_READ_BUFFER_SIZE - 1 );
+        fseeko( stream->file_handle, fpos, SEEK_SET );
+        if ( stream->hb_stream_type == program )
+        {
+            skip_to_next_pack( stream );
+        }
+        pp.pts = hb_ps_stream_getVideoPTS( stream );
     }
     pp.pos = ftello(stream->file_handle);
-    hb_log("hb_sample_pts: pts %lld at %llu", pp.pts, pp.pos );
     return pp;
 }
 
+static int dur_compare( const void *a, const void *b )
+{
+    const double *aval = a, *bval = b;
+    return ( *aval < *bval ? -1 : ( *aval == *bval ? 0 : 1 ) );
+}
+
+// given an array of (position, time) samples, compute a max-likelihood
+// estimate of the average rate by computing the rate between all pairs
+// of samples then taking the median of those rates.
+static double compute_stream_rate( struct pts_pos *pp, int n )
+{
+    int i, j;
+    double rates[NDURSAMPLES * NDURSAMPLES / 8];
+    double *rp = rates;
+
+    // the following nested loops compute the rates between all pairs.
+    *rp = 0;
+    for ( i = 0; i < n-1; ++i )
+    {
+        // Bias the median filter by not including pairs that are "far"
+        // 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
+        // could easily fall in the inter-piece part of the data which
+        // would give a bogus estimate. The 'ns' index creates an
+        // asymmetry that favors locality.
+        int ns = i + ( n >> 3 );
+        if ( ns > n )
+            ns = n;
+        for ( j = i+1; j < ns; ++j )
+        {
+            if ( (uint64_t)(pp[j].pts - pp[i].pts) > 90000LL*3600*6 )
+                break;
+            if ( pp[j].pts != pp[i].pts && pp[j].pos > pp[i].pos )
+            {
+                *rp = ((double)( pp[j].pts - pp[i].pts )) /
+                      ((double)( pp[j].pos - pp[i].pos ));
+                ++rp;
+            }
+        }
+    }
+    // now compute and return the median of all the (n*n/2) rates we computed
+    // above.
+    int nrates = rp - rates;
+    qsort( rates, nrates, sizeof (rates[0] ), dur_compare );
+    return rates[nrates >> 1];
+}
+
 static void hb_stream_duration(hb_stream_t *stream, hb_title_t *inTitle)
 {
-    // To calculate the duration we get video presentation time stamps
-    // at a couple places in the file then use their difference scaled
-    // by the ratio of the distance between our measurement points &
-    // the size of the file. The issue is that our video file may have
-    // chunks from several different program fragments (main feature,
-    // commercials, station id, trailers, etc.) all with their own base
-    // pts value. We need to difference two pts's from the same program
-    // fragment. Since extraneous material is very likely at the beginning
-    // and end of the content, for now we take a time stamp from 25%
-    // into the file & 75% into the file then double their difference
-    // to get the total duration.
-    struct pts_pos first_pts, last_pts;
+    struct pts_pos ptspos[NDURSAMPLES];
+    struct pts_pos *pp = ptspos;
+    int i;
 
     fseeko(stream->file_handle, 0, SEEK_END);
     uint64_t fsize = ftello(stream->file_handle);
-    first_pts = hb_sample_pts(stream, fsize >> 2);
-    last_pts = hb_sample_pts(stream, fsize - (fsize >> 2) );
-
-    if ( first_pts.pos && last_pts.pos && first_pts.pos != last_pts.pos )
+    uint64_t fincr = fsize / NDURSAMPLES;
+    uint64_t fpos = fincr / 2;
+    for ( i = NDURSAMPLES; --i >= 0; fpos += fincr )
     {
-        uint64_t dur = ( ( last_pts.pts - first_pts.pts ) * fsize ) /
-                       ( last_pts.pos - first_pts.pos );
-        inTitle->duration = dur;
-        dur /= 90000;
-        inTitle->hours    = dur / 3600;
-        inTitle->minutes  = ( dur % 3600 ) / 60;
-        inTitle->seconds  = dur % 60;
+        *pp++ = hb_sample_pts(stream, fpos);
     }
+    uint64_t dur = compute_stream_rate( ptspos, pp - ptspos ) * (double)fsize;
+    inTitle->duration = dur;
+    dur /= 90000;
+    inTitle->hours    = dur / 3600;
+    inTitle->minutes  = ( dur % 3600 ) / 60;
+    inTitle->seconds  = dur % 60;
+
     rewind(stream->file_handle);
 }
 
@@ -534,68 +1318,163 @@ 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->hb_stream_type == ffmpeg )
+    {
+        return ffmpeg_read( src_stream, b );
+    }
+    if ( src_stream->hb_stream_type == dvd_program )
+    {
+        size_t amt_read = fread(b->data, HB_DVD_READ_BUFFER_SIZE, 1,
+                                src_stream->file_handle);
+        return (amt_read > 0);
+    }
+    if ( src_stream->hb_stream_type == program )
+    {
+        // a general program stream has arbitrary sized pack's. we're
+        // currently positioned at the start of a pack so read up to but
+        // not including the start of the next, expanding the buffer
+        // as necessary.
+        uint8_t *cp = b->data;
+        uint8_t *ep = cp + b->alloc;
+        uint32_t strt_code = -1;
+        int c;
+
+        // consume the first byte of the initial pack so we don't match on
+        // it in the loop below.
+        if ( ( c = getc( src_stream->file_handle ) ) == EOF )
+            return 0;
+
+        *cp++ = c;
+
+        flockfile( src_stream->file_handle );
+        while ( ( c = getc_unlocked( src_stream->file_handle ) ) != EOF )
+        {
+            strt_code = ( strt_code << 8 ) | c;
+            if ( strt_code == 0x000001ba )
+                // we found the start of the next pack
+                break;
+            if ( cp >= ep )
+            {
+                // need to expand the buffer
+                int curSize = cp - b->data;
+                hb_buffer_realloc( b, curSize * 2 );
+                cp = b->data + curSize;
+                ep = b->data + b->alloc;
+            }
+            *cp++ = c;
+            // Non-video streams can emulate start codes, so we need
+            // to inspect PES packets and skip over their data
+            // sections to avoid mis-detection of the next pack header.
+            if ( ( strt_code >> 8 ) == 0x000001 &&
+                 ( strt_code & 0xff ) >= 0xbb )
+            {
+                int len = 0;
+                c = getc_unlocked( src_stream->file_handle );
+                if ( c == EOF )
+                    break;
+                len = c << 8;
+                c = getc_unlocked( src_stream->file_handle );
+                if ( c == EOF )
+                    break;
+                len |= c;
+                if ( cp+len+2 > ep )
+                {
+                    // need to expand the buffer
+                    int curSize = cp - b->data;
+                    if ( curSize * 2 > curSize+len+2 )
+                        hb_buffer_realloc( b, curSize * 2 );
+                    else
+                        hb_buffer_realloc( b, curSize + len + 2 );
+                    cp = b->data + curSize;
+                    ep = b->data + b->alloc;
+                }
+                *cp++ = len >> 8;
+                *cp++ = len & 0xff;
+                fread( cp, 1, len, src_stream->file_handle );
+                cp += len;
+            }
+        }
+        funlockfile( src_stream->file_handle );
+
+        // if we didn't terminate on an eof back up so the next read
+        // starts on the pack boundary.
+        b->size = cp - b->data;
+        if ( c != EOF )
+        {
+            fseeko( src_stream->file_handle, -4, SEEK_CUR );
+            // Only 3 of the 4 bytes read were added to the buffer.
+            b->size -= 3;
+        }
+        return 1;
+    }
+    return hb_ts_stream_decode( src_stream, b );
+}
+
+int64_t ffmpeg_initial_timestamp( hb_stream_t * stream )
+{
+    AVStream *s = stream->ffmpeg_ic->streams[stream->ffmpeg_video_id];
+    if ( s->nb_index_entries < 1 )
+        return 0;
+
+    return s->index_entries[0].timestamp;
+}
+int hb_stream_seek_chapter( hb_stream_t * stream, int chapter_num )
+{
+
+    if ( stream->hb_stream_type != ffmpeg )
+    {
+        // currently meaningliess for transport and program streams
+        return 1;
+    }
+    if ( !stream || !stream->title ||
+         chapter_num > hb_list_count( stream->title->list_chapter ) )
+    {
+        return 0;
+    }
+
+    int64_t sum_dur = 0;
+    hb_chapter_t *chapter = NULL;
+    int i;
+    for ( i = 0; i < chapter_num; ++i)
+    {
+        chapter = hb_list_item( stream->title->list_chapter, i );
+        sum_dur += chapter->duration;
+    }
+    stream->chapter = chapter_num - 1;
+    stream->chapter_end = sum_dur;
+
+    int64_t pos = ( ( ( sum_dur - chapter->duration ) * AV_TIME_BASE ) / 90000 ) + ffmpeg_initial_timestamp( stream );
+
+    hb_deep_log( 2, "Seeking to chapter %d: starts %"PRId64", ends %"PRId64", AV pos %"PRId64,
+                 chapter_num, sum_dur - chapter->duration, sum_dur, pos);
+
+    if ( chapter_num > 1 && pos > 0 )
+    {
+        av_seek_frame( stream->ffmpeg_ic, -1, pos, 0);
+    }
+    else
+    {
+        // ffmpeg has a bug that causes the first PTS after
+        // av_find_stream_info() is called to be incorrect.
+        // av_find_stream_info is called whenever opening a file
+        // with ffmpeg.  av_seek_frame clears the condition
+        // that causes the problem. since hb_stream_seek_chapter
+        // is called before we start reading, make sure
+        // we do a seek here.
+        av_seek_frame( stream->ffmpeg_ic, -1, ffmpeg_initial_timestamp( stream ), AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY );
+    }
+    return 1;
+}
+
+/***********************************************************************
+ * hb_stream_chapter
+ ***********************************************************************
+ * Return the number of the chapter that we are currently in. We store
+ * the chapter number starting from 0, so + 1 for the real chpater num.
+ **********************************************************************/
+int hb_stream_chapter( hb_stream_t * src_stream )
+{
+    return( src_stream->chapter + 1 );
 }
 
 /***********************************************************************
@@ -603,99 +1482,269 @@ int hb_stream_read( hb_stream_t * src_stream, hb_buffer_t * b )
  ***********************************************************************
  *
  **********************************************************************/
-int hb_stream_seek( hb_stream_t * src_stream, float f )
-{
-  off_t stream_size, cur_pos, new_pos;
-  double pos_ratio = f;
-  cur_pos = ftello(src_stream->file_handle);
-  fseeko(src_stream->file_handle,0 ,SEEK_END);
-  stream_size = ftello(src_stream->file_handle);
-  new_pos = (off_t) ((double) (stream_size) * pos_ratio);
-  new_pos &=~ (HB_DVD_READ_BUFFER_SIZE - 1);
-  int r = fseeko(src_stream->file_handle, new_pos, SEEK_SET);
-  
-  if (r == -1)
-  {
-    fseeko(src_stream->file_handle, cur_pos, SEEK_SET);
-    return 0;
-  }
-  
-  if (src_stream->stream_type == hb_stream_type_transport)
-  {
-       // We need to drop the current decoder output and move
-       // forwards to the next transport stream packet.
-       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);
-        }
-      }
+int hb_stream_seek( hb_stream_t * stream, float f )
+{
+    if ( stream->hb_stream_type == ffmpeg )
+    {
+        return ffmpeg_seek( stream, f );
+    }
+    off_t stream_size, cur_pos, new_pos;
+    double pos_ratio = f;
+    cur_pos = ftello( stream->file_handle );
+    fseeko( stream->file_handle, 0, SEEK_END );
+    stream_size = ftello( stream->file_handle );
+    new_pos = (off_t) ((double) (stream_size) * pos_ratio);
+    new_pos &=~ (HB_DVD_READ_BUFFER_SIZE - 1);
+
+    int r = fseeko( stream->file_handle, new_pos, SEEK_SET );
+    if (r == -1)
+    {
+        fseeko( stream->file_handle, cur_pos, SEEK_SET );
+        return 0;
+    }
+
+    if ( stream->hb_stream_type == transport )
+    {
+        // We need to drop the current decoder output and move
+        // forwards to the next transport stream packet.
+        hb_ts_stream_reset(stream);
+        if ( f > 0 )
+        {
+            if ( stream->ts_IDRs )
+            {
+                // the stream has IDRs so look for one.
+                stream->need_keyframe = 1;
+            }
+        }
+        else
+        {
+            // we're at the beginning - say we have video sync so that we
+            // won't drop initial SPS & PPS data on an AVC stream.
+            stream->need_keyframe = 0;
+        }
+    }
+    else if ( stream->hb_stream_type == program )
+    {
+        skip_to_next_pack( stream );
+    }
+
+    return 1;
+}
+
+int hb_stream_seek_ts( hb_stream_t * stream, int64_t ts )
+{
+    if ( stream->hb_stream_type == ffmpeg )
+    {
+        return ffmpeg_seek_ts( stream, ts );
+    }
+    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.
+     */
+    const char *codec_name;
+    AVCodecContext *cc;
+
+    if ( audio->config.in.codec == HB_ACODEC_FFMPEG &&
+         ( cc = hb_ffmpeg_context( audio->config.in.codec_param ) ) &&
+         avcodec_find_decoder( cc->codec_id ) )
+    {
+        AVCodec *codec = avcodec_find_decoder( cc->codec_id );
+        codec_name = codec->name;
+        if ( !strcmp( codec_name, "DCA" ) )
+        {
+            codec_name = "DTS";
+        }
+
+        char *profile_name;
+        profile_name = av_get_profile_name( codec, cc->profile );
+        if ( profile_name )
+        {
+            codec_name = profile_name;
+        }
+    }
+    else if ( audio->config.in.codec == HB_ACODEC_MPGA &&
+              avcodec_find_decoder( audio->config.in.codec_param ) )
+    {
+        codec_name = avcodec_find_decoder( audio->config.in.codec_param )->name;
     }
     else
-      done = 1;    // End of data;
-  }
-  hb_buffer_close(&buf);
-  return 1;
+    {
+        codec_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" : 
+                     audio->config.in.codec == HB_ACODEC_LPCM ? "LPCM" : 
+                     audio->config.in.codec == HB_ACODEC_FFMPEG ? "FFMPEG" :
+                     "Unknown";
+    }
+    snprintf( audio->config.lang.description,
+              sizeof( audio->config.lang.description ), "%s (%s)",
+              strlen(lang->native_name) ? lang->native_name : lang->eng_name,
+              codec_name );
+
+    if (audio->config.in.codec == HB_ACODEC_FFMPEG)
+    {
+        int layout = audio->config.in.channel_layout;
+        char *desc = audio->config.lang.description +
+                        strlen( audio->config.lang.description );
+        sprintf( desc, " (%d.%d ch)",
+                 HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT(layout) +
+                     HB_INPUT_CH_LAYOUT_GET_DISCRETE_REAR_COUNT(layout),
+                 HB_INPUT_CH_LAYOUT_GET_DISCRETE_LFE_COUNT(layout) );
+    }
+
+    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)
+                                                       int idx)
 {
     off_t cur_pos = ftello(stream->file_handle);
-    hb_audio_t *audio = calloc( sizeof( hb_audio_t ), 1 );
+    hb_audio_t *audio = NULL;
     const uint8_t *buf;
+    kind_t kind;
+    uint8_t stype = 0;
+
+    kind = stream->ts_stream_kind[idx];
+
+    if ( kind != A && kind != U && kind != N )
+    {
+        // Not audio
+        return NULL;
+    }
+    stype = stream->ts_stream_type[idx];
 
     fseeko(stream->file_handle, 0, SEEK_SET);
-    align_to_next_packet(stream->file_handle);
-    buf = hb_ts_stream_getPEStype(stream, stream->ts_audio_pids[aud_pid_index]);
+    align_to_next_packet(stream);
+
+    buf = hb_ts_stream_getPEStype(stream, stream->ts_pids[idx]);
 
     /* check that we found a PES header */
     if (buf && buf[0] == 0x00 && buf[1] == 0x00 && buf[2] == 0x01)
     {
-        if (buf[3] == 0xbd)
+        // 0xbd ("private stream 1") is the normal container for non-ISO
+        // media - AC3/DCA/PCM/etc.
+        if ( buf[3] == 0xbd )
+        {
+            if ( kind == U )
+            {
+                // XXX assume unknown stream types are AC-3 (if they're not
+                // audio we'll find that out during the scan but if they're
+                // some other type of audio we'll end up ignoring them).
+                stype = 0x81;
+                stream->ts_stream_type[idx] = 0x81;
+                kind = A;
+            }
+            if ( stype == 0x80 && 
+                 stream->pmt_info.reg_desc == STR4_TO_UINT32("HDMV") )
+            {
+                // LPCM audio in bluray have an stype of 0x80
+                // 0x80 is used for other DigiCipher normally
+                // To distinguish, Bluray streams have a reg_desc of HDMV
+                kind = A;
+            }
+        }
+        else if ( buf[3] == 0xfd )
         {
-            audio->id = 0x80bd | (aud_pid_index << 8);
-            audio->codec = HB_ACODEC_AC3;
-            hb_log("transport stream pid 0x%x (type 0x%x) is AC-3 audio id 0x%x",
-                   stream->ts_audio_pids[aud_pid_index],
-                   stream->ts_audio_stream_type[aud_pid_index],
-                   audio->id);
-            stream->ts_audio_stream_type[aud_pid_index] = 0x81;
-            stream->ts_streamid[stream->ts_number_video_pids + aud_pid_index] = buf[3];
+            // 0xfd indicates an extended stream id (ISO 13818-1(2007)).
+            // the blu ray consortium apparently forgot to read the portion
+            // of the MPEG spec that says one PID should map to one media
+            // stream and multiplexed multiple types of audio into one PID
+            // using the extended stream identifier of the PES header to
+            // distinguish them. So we have to check if that's happening and
+            // if so tell the runtime what esid we want.
+            if ( st2codec[stype].kind == A && stype == 0x83 &&
+                 stream->ts_format_id[idx] == TS_FORMAT_ID_AC3 )
+            {
+                // This is an interleaved TrueHD/AC-3 stream and the esid of
+                // the AC-3 is 0x76
+                stream->ts_multiplexed[idx] = 0x76;
+                stype = 0x81;
+                stream->ts_stream_type[idx] = 0x81;
+                kind = A;
+            }
+            if ( st2codec[stype].kind == A && stype == 0x86 )
+            {
+                // This is an interleaved DTS-HD/DTS stream and the esid of
+                // the DTS is 0x71
+                stream->ts_multiplexed[idx] = 0x71;
+                stype = 0x82;
+                stream->ts_stream_type[idx] = 0x82;
+                kind = A;
+            }
+            if ( stype == 0x84 && 
+                 stream->pmt_info.reg_desc == STR4_TO_UINT32("HDMV") )
+            {
+                // EAC3 audio in bluray has an stype of 0x84
+                // which conflicts with SDDS
+                // To distinguish, Bluray streams have a reg_desc of HDMV
+                stype = 0x87;
+                stream->ts_stream_type[idx] = 0x87;
+                kind = A;
+            }
         }
         else if ((buf[3] & 0xe0) == 0xc0)
         {
-            audio->id = buf[3] | aud_pid_index;
-            audio->codec = HB_ACODEC_MPGA;
-            hb_log("transport stream pid 0x%x (type 0x%x) is MPEG audio id 0x%x",
-                   stream->ts_audio_pids[aud_pid_index],
-                   stream->ts_audio_stream_type[aud_pid_index],
-                   audio->id);
-            stream->ts_audio_stream_type[aud_pid_index] = 0x03;
-            stream->ts_streamid[stream->ts_number_video_pids + aud_pid_index] = buf[3];
+            // 0xC0 - 0xCF are the normal containers for ISO-standard
+            // media (mpeg2 audio and mpeg4 AAC).
+            if ( st2codec[stype].kind == U )
+            {
+                // XXX assume unknown stream types are MPEG audio
+                stype = 0x03;
+                stream->ts_stream_type[idx] = 0x03;
+                kind = A;
+            }
+        }
+        else
+        {
+            stype = 0;
+            kind = N;
         }
     }
-    fseeko(stream->file_handle, cur_pos, SEEK_SET);
-    if (! audio->codec)
+
+    // if we found an audio stream type & HB has a codec that can decode it
+    // finish configuring the audio so we'll add it to the title's list.
+    if ( kind == A && st2codec[stype].codec )
+    {
+        audio = calloc( sizeof( hb_audio_t ), 1 );
+
+        stream->ts_stream_kind[idx] = A;
+        audio->id = stream->ts_pids[idx];
+        audio->config.in.codec = st2codec[stype].codec;
+        audio->config.in.codec_param = st2codec[stype].codec_param;
+        set_audio_description( audio,
+                  lang_for_code( stream->a52_info[idx].lang_code ) );
+        hb_log("transport stream pid 0x%x (type 0x%x) may be %s audio (id 0x%x)",
+               stream->ts_pids[idx],
+               stype, st2codec[stype].name, audio->id);
+
+    }
+    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]);
-       }
+        if ( buf )
+        {
+            hb_log("transport stream pid 0x%x (type 0x%x, substream 0x%x) "
+                    "isn't audio", stream->ts_pids[idx],
+                    stream->ts_stream_type[idx], buf[3]);
+        }
+        else
+        {
+            hb_log("transport stream pid 0x%x (type 0x%x) isn't audio",
+                    stream->ts_pids[idx],
+                    stream->ts_stream_type[idx]);
+        }
+    }
+    fseeko(stream->file_handle, cur_pos, SEEK_SET);
+
     return audio;
 }
 
@@ -707,7 +1756,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:
@@ -715,11 +1764,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:
@@ -728,6 +1777,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 );
 }
 
@@ -747,13 +1797,13 @@ static void hb_ps_stream_find_audio_ids(hb_stream_t *stream, hb_title_t *title)
     // start looking 20% into the file since there's occasionally no
     // audio at the beginning (particularly for vobs).
     hb_stream_seek(stream, 0.2f);
-               
+
     while (--blksleft >= 0 && hb_stream_read(stream, buf) == 1)
     {
         hb_buffer_t *es;
 
         // 'buf' contains an MPEG2 PACK - get a list of all it's elementary streams
-        hb_demux_ps(buf, list);
+        hb_demux_ps( buf, list, 0 );
 
         while ( ( es = hb_list_item( list, 0 ) ) )
         {
@@ -780,306 +1830,134 @@ static void hb_ps_stream_find_audio_ids(hb_stream_t *stream, hb_title_t *title)
 }
 
 /***********************************************************************
- * hb_stream_update_audio
+ * hb_ts_stream_init
  ***********************************************************************
  *
  **********************************************************************/
-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
+
+static void hb_ts_stream_init(hb_stream_t *stream)
+{
+    int i;
+
+    for (i=0; i < kMaxNumberDecodeStreams; i++)
     {
-        // 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 );
+        stream->ts_streamcont[i] = -1;
+        stream-> ts_pids[i] = -1;
+    }
+    stream->ts_packet = malloc( stream->packetsize );
+
+    // Find the audio and video pids in the stream
+    hb_ts_stream_find_pids(stream);
 
+    for (i = 0; i < stream->ts_number_pids; i++)
+    {
+        // demuxing buffer for TS to PS conversion
+        stream->ts_buf[i] = hb_buffer_init(stream->packetsize);
+        stream->ts_buf[i]->size = 0;
+    }
 }
 
-/***********************************************************************
- * 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);
-       }
+#define MAX_HOLE 208*80
+
+static off_t align_to_next_packet(hb_stream_t *stream)
+{
+    uint8_t buf[MAX_HOLE];
+    off_t pos = 0;
+    off_t start = ftello(stream->file_handle);
+    off_t orig;
+
+    if ( start >= stream->packetsize ) {
+        start -= stream->packetsize;
+        fseeko(stream->file_handle, start, SEEK_SET);
+    }
+    orig = start;
+
+    while (1)
+    {
+        if (fread(buf, sizeof(buf), 1, stream->file_handle) == 1)
+        {
+            const uint8_t *bp = buf;
+            int i;
+
+            for ( i = sizeof(buf) - 8 * stream->packetsize; --i >= 0; ++bp )
+            {
+                if ( have_ts_sync( bp, stream->packetsize ) )
+                {
+                    break;
+                }
+            }
+            if ( i >= 0 )
+            {
+                pos = ( bp - buf ) - stream->packetsize + 188;
+                break;
+            }
+            fseeko(stream->file_handle, -8 * stream->packetsize, SEEK_CUR);
+            start = ftello(stream->file_handle);
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    fseeko(stream->file_handle, start+pos, SEEK_SET);
+    return start - orig + pos;
 }
 
 
-/***********************************************************************
- * hb_ts_stream_init
- ***********************************************************************
- *
- **********************************************************************/
- #define PS_DECODE_BUFFER_SIZE ( 1024 * 1024 * 4)
-static void hb_ts_stream_init(hb_stream_t *stream)
+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(bitbuf_t *bb, uint8_t* buf, int bufsize, int clear)
+{
+    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(bb->buf, 0, bufsize);
+}
+
+static inline int buf_size(bitbuf_t *bb)
+{
+    return bb->pos >> 3;
+}
+
+static inline unsigned int get_bits(bitbuf_t *bb, int bits)
 {
-       // 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;
-       }
-       
-       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;
-       
-       // 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
-       }
-       
-       for (i = stream->ts_number_video_pids; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
-       {
-               stream->ts_packetbuf[i] = (unsigned char *) malloc(1024 * 1024);
-       }
-}
-
-// ------------------------------------------------------------------------------------
-
-static off_t align_to_next_packet(FILE* f)
-{
-       unsigned char buf[188*20];
-
-       off_t start = ftello(f);
-       off_t pos = 0;
-
-       if (fread(buf, 188*20, 1, f) == 1)
-       {
-               int found = 0;
-               while (!found && (pos < 188))
-               {
-                       found = 1;
-                       int i = 0;
-                       for (i = 0; i < 188*20; i += 188)
-                       {
-                               unsigned char c = buf[pos+i];
-                               // Check sync byte
-                               if ((c != 0x47) && (c != 0x72) && (c != 0x29))
-                               {
-                                       // this offset failed, try next
-                                       found = 0;
-                                       pos++;
-                                       break;
-                               }
-                       }
-               }
-       }
-
-       if (pos == 188)
-               pos = 0;                // failed to find anything!!!!!?
-
-    fseeko(f, start+pos, SEEK_SET);
-
-       return pos;
-}
-
-// ------------------------------------------------------------------------------------
-
-int bitpos = 0;
-unsigned int bitval = 0;
-unsigned char* bitbuf = NULL;
-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)
-{
-       bitpos = 0;
-       bitbuf = buf;
-       bitval = (bitbuf[0] << 24) | (bitbuf[1] << 16) | (bitbuf[2] << 8) | bitbuf[3];
-       if (clear)
-               memset(bitbuf, 0, bufsize);
-}
-
-static inline int buf_size()
-{
-       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;
-               }
-       }
-}
-
-static inline unsigned int get_bits(int bits)
-{
-       unsigned int val;
-       int left = 32 - (bitpos & 31);
-
-       if (bits < left)
-       {
-               val = (bitval >> (left - bits)) & bitmask[bits];
-               bitpos += bits;
-       }
-       else
-       {
-               val = (bitval & bitmask[left]) << (bits - left);
-               bitpos += left;
-               bits -= left;
-
-               int pos = bitpos >> 3;
-               bitval = (bitbuf[pos] << 24) | (bitbuf[pos + 1] << 16) | (bitbuf[pos + 2] << 8) | bitbuf[pos + 3];
-               
-               if (bits > 0)
-               {
-                       val |= (bitval >> (32 - bits)) & bitmask[bits];
-                       bitpos += bits;
-               }
-       }
-
-       return val;
+    unsigned int val;
+    int left = 32 - (bb->pos & 31);
+
+    if (bits < left)
+    {
+        val = (bb->val >> (left - bits)) & bitmask[bits];
+        bb->pos += bits;
+    }
+    else
+    {
+        val = (bb->val & bitmask[left]) << (bits - left);
+        bb->pos += left;
+        bits -= left;
+
+        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 |= (bb->val >> (32 - bits)) & bitmask[bits];
+            bb->pos += bits;
+        }
+    }
+
+    return val;
 }
 
 // extract what useful information we can from the elementary stream
@@ -1096,10 +1974,23 @@ static void decode_element_descriptors(hb_stream_t* stream, int esindx,
     {
         switch (dp[0])
         {
+            case 5:    // Registration descriptor
+                stream->ts_format_id[esindx] = (dp[2] << 24) | (dp[3] << 16) |
+                                               (dp[4] << 8)  | dp[5];
+                break;
+
             case 10:    // ISO_639_language descriptor
                 stream->a52_info[esindx].lang_code = lang_to_code(lang_for_code2((const char *)&dp[2]));
                 break;
 
+            case 0x6a:  // DVB AC-3 descriptor
+                stream->ts_stream_type[esindx] = 0x81;
+                break;
+
+            case 0x7a:  // DVB EAC-3 descriptor
+                stream->ts_stream_type[esindx] = 0x87;
+                break;
+
             default:
                 break;
         }
@@ -1107,94 +1998,117 @@ static void decode_element_descriptors(hb_stream_t* stream, int esindx,
     }
 }
 
+static const char *stream_type_name (uint8_t stream_type)
+{
+    return st2codec[stream_type].name? st2codec[stream_type].name : "Unknown";
+}
+
 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);
-    stream->pmt_info.PCR_PID = PCR_PID;
-    get_bits(4);
-    unsigned int program_info_length = get_bits(12);
+    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);
+    stream->pmt_info.PCR_PID = get_bits(&bb, 13);
+    get_bits(&bb, 4);
+    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);
-       }                                 
-       
-       int cur_pos =  9 /* data after the section length field*/ + program_info_length;
-       int done_reading_stream_types = 0;
-       while (!done_reading_stream_types)
-       {
-         unsigned char stream_type = get_bits(8);
-                 get_bits(3);
-         unsigned int elementary_PID = get_bits(13);
-                 get_bits(4);
-         unsigned int ES_info_length = get_bits(12);
-         
-         int i=0;
-         unsigned char *ES_info_buf = (unsigned char *) malloc(ES_info_length);
-         for (i=0; i < ES_info_length; i++)
-         {
-               ES_info_buf[i] = get_bits(8);
-         }
-       
-         if (stream_type == 0x02)
-         {
-               if (stream->ts_number_video_pids <= kMaxNumberVideoPIDS)
-                 stream->ts_number_video_pids++;
-               stream->ts_video_pids[stream->ts_number_video_pids-1] = elementary_PID;
-         }
-      else
-      {
-        // Defined audio stream types are 0x81 for AC-3/A52 audio and 0x03
-        // for mpeg audio. But content producers seem to use other
-        // values (0x04 and 0x06 have both been observed) so at this point
-        // we say everything that isn't a video pid is audio then at the end
-        // of hb_stream_title_scan we'll figure out which are really audio
-        // by looking at the PES headers.
-        i = stream->ts_number_audio_pids;
-        if (i < kMaxNumberAudioPIDS)
-            stream->ts_number_audio_pids++;
-        stream->ts_audio_pids[i] = elementary_PID;
-        stream->ts_audio_stream_type[i] = stream_type;
-               
-               if (ES_info_length > 0)
-               {
-            decode_element_descriptors(stream, i, ES_info_buf, ES_info_length);
-               }
-         }
-
-         cur_pos += 5 /* stream header */ + ES_info_length;
-         
-         free(ES_info_buf);
-         
-         if (cur_pos >= section_length - 4 /* stop before the CRC */)
-               done_reading_stream_types = 1;
-       }
-                                                        
-       free(descriptor_buf);
-       return 1;
-}
-
-// ------------------------------------------------------------------------------------
-
-int build_program_map(unsigned char *buf, hb_stream_t *stream)
+    int i;
+    for (i = 0; i < program_info_length - 2; )
+    {
+        uint8_t tag, len;
+        tag = get_bits(&bb, 8);
+        len = get_bits(&bb, 8);
+        i += 2;
+        if ( i + len > program_info_length )
+        {
+            break;
+        }
+        if (tag == 0x05 && len >= 4)
+        {
+            // registration descriptor
+            stream->pmt_info.reg_desc = get_bits(&bb, 32);
+            i += 4;
+            len -= 4;
+        }
+        int j;
+        for ( j = 0; j < len; j++ )
+        {
+            get_bits(&bb, 8);
+        }
+        i += len;
+    }
+    for ( ; i < program_info_length; 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(&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(&bb, 8);
+        }
+
+        if ( index_of_pid( stream, elementary_PID ) < 0 )
+        {
+            // 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_pids;
+            if (i < kMaxNumberDecodeStreams)
+            {
+                stream->ts_pids[i] = elementary_PID;
+                stream->ts_stream_type[i] = stream_type;
+                if (ES_info_length > 0)
+                {
+                    decode_element_descriptors(stream, i, ES_info_buf,
+                                            ES_info_length);
+                }
+                stream->ts_stream_kind[i] = ts_stream_kind(stream, i);
+                ++stream->ts_number_pids;
+            }
+        }
+
+        cur_pos += 5 /* stream header */ + ES_info_length;
+
+        free(ES_info_buf);
+
+        if (cur_pos >= section_length - 4 /* stop before the CRC */)
+            done_reading_stream_types = 1;
+    }
+
+    return 1;
+}
+
+static int build_program_map(const uint8_t *buf, hb_stream_t *stream)
 {
     // Get adaption header info
     int adapt_len = 0;
@@ -1214,53 +2128,61 @@ int build_program_map(unsigned char *buf, hb_stream_t *stream)
 
     // Get pointer length - only valid in packets with a start flag
     int pointer_len = 0;
-       if (start && stream->pmt_info.reading)
-       {
-               // We just finished a bunch of packets - parse the program map details
-               int decode_ok = 0;
-               if (stream->pmt_info.tablebuf[0] == 0x02)
-                       decode_ok = decode_program_map(stream);
-               free(stream->pmt_info.tablebuf);
-               stream->pmt_info.tablebuf = NULL;
-               stream->pmt_info.tablepos = 0;
-        stream->pmt_info.reading = 0;
-        if (decode_ok)
-                       return decode_ok;
-       }
-
-       if (start)
-       {
-               pointer_len = buf[4 + adapt_len] + 1;
-               stream->pmt_info.tablepos = 0;
-       }       
-       // Get Continuity Counter
-       int continuity_counter = buf[3] & 0x0f;
-       if (!start && (stream->pmt_info.current_continuity_counter + 1 != continuity_counter))
-       {
-               hb_log("build_program_map - Continuity Counter %d out of sequence - expected %d", continuity_counter, stream->pmt_info.current_continuity_counter+1);
-               return 0;
-       }
-       stream->pmt_info.current_continuity_counter = continuity_counter;
-       stream->pmt_info.reading |= start;
+
+    if (start)
+    {
+        pointer_len = buf[4 + adapt_len] + 1;
+        stream->pmt_info.tablepos = 0;
+    }
+    // Get Continuity Counter
+    int continuity_counter = buf[3] & 0x0f;
+    if (!start && (stream->pmt_info.current_continuity_counter + 1 != continuity_counter))
+    {
+        hb_log("build_program_map - Continuity Counter %d out of sequence - expected %d", continuity_counter, stream->pmt_info.current_continuity_counter+1);
+        return 0;
+    }
+    stream->pmt_info.current_continuity_counter = continuity_counter;
+    stream->pmt_info.reading |= start;
 
     // Add the payload for this packet to the current buffer
-       int amount_to_copy = 184 - adapt_len - pointer_len;
+    int amount_to_copy = 184 - adapt_len - pointer_len;
     if (stream->pmt_info.reading && (amount_to_copy > 0))
     {
-                       stream->pmt_info.tablebuf = realloc(stream->pmt_info.tablebuf, stream->pmt_info.tablepos + amount_to_copy);
-                               
+            stream->pmt_info.tablebuf = realloc(stream->pmt_info.tablebuf, stream->pmt_info.tablepos + amount_to_copy);
+
             memcpy(stream->pmt_info.tablebuf + stream->pmt_info.tablepos, buf + 4 + adapt_len + pointer_len, amount_to_copy);
             stream->pmt_info.tablepos += amount_to_copy;
     }
+    if (stream->pmt_info.tablepos > 3)
+    {
+        // We have enough to check the section length
+        int length;
+        length = ((stream->pmt_info.tablebuf[1] << 8) + 
+                  stream->pmt_info.tablebuf[2]) & 0xFFF;
+        if (stream->pmt_info.tablepos > length + 1)
+        {
+            // We just finished a bunch of packets - parse the program map details
+            int decode_ok = 0;
+            if (stream->pmt_info.tablebuf[0] == 0x02)
+                decode_ok = decode_program_map(stream);
+            free(stream->pmt_info.tablebuf);
+            stream->pmt_info.tablebuf = NULL;
+            stream->pmt_info.tablepos = 0;
+            stream->pmt_info.reading = 0;
+            if (decode_ok)
+                return decode_ok;
+        }
+
+    }
 
     return 0;
 }
 
-int decode_PAT(unsigned char *buf, hb_stream_t *stream)
+static int decode_PAT(const uint8_t *buf, hb_stream_t *stream)
 {
     unsigned char tablebuf[1024];
     unsigned int tablepos = 0;
-    
+
     int reading = 0;
 
 
@@ -1302,21 +2224,22 @@ int decode_PAT(unsigned char *buf, hb_stream_t *stream)
     {
             memcpy(tablebuf + tablepos, buf + 4 + adapt_len + 1, pointer_len - 1);
 
-                       
+
             unsigned int pos = 0;
             //while (pos < tablepos)
             {
-                    set_buf(tablebuf + pos, tablepos - pos, 0);
-
-                    unsigned char section_id   = get_bits(8);
-                    get_bits(4);
-                    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)
                     {
@@ -1326,24 +2249,24 @@ int decode_PAT(unsigned char *buf, hb_stream_t *stream)
                           section_len -= 5;    // Already read transport stream ID, version num, section num, and last section num
                           section_len -= 4;   // Ignore the CRC
                           int curr_pos = 0;
-                                                 stream->ts_number_pat_entries = 0;
+                          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);
-                                                       stream->pat_info[stream->ts_number_pat_entries].program_number = pkt_program_num;
-                              
-                            get_bits(3);  // Reserved
+                            unsigned int pkt_program_num = get_bits(&bb, 16);
+                            stream->pat_info[stream->ts_number_pat_entries].program_number = pkt_program_num;
+
+                            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;
-                                                       stream->ts_number_pat_entries++;
+                            stream->ts_number_pat_entries++;
                           }
                         }
                         break;
@@ -1365,513 +2288,202 @@ int decode_PAT(unsigned char *buf, hb_stream_t *stream)
     return 1;
 }
 
-static int flushbuf(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;
-}
-
-static int fwrite64(void* buf, int elsize, int elnum, hb_stream_t* stream)
-{
-       int size = elsize;
-       if (elnum > 1)
-               size *= elnum;
-       
-       int written = 0;
-       int current_write_index = stream->ps_current_write_buffer_index;
-       
-       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
-       {
-               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))
-               {
-                       // 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;
-}
-
-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;
-               }
-               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;
-               }
-
-               // 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;
-                       continue;
-               }
-
-               // Get pid
-               int pid = (((buf[1] & 0x1F) << 8) | buf[2]) & 0x1FFF;
-                
+    // To be different from every other broadcaster in the world, New Zealand TV
+    // changes PMTs (and thus video & audio PIDs) when 'programs' change. Since
+    // we may have the tail of the previous program at the beginning of this
+    // file, take our PMT from the middle of the file.
+    fseeko(stream->file_handle, 0, SEEK_END);
+    uint64_t fsize = ftello(stream->file_handle);
+    fseeko(stream->file_handle, fsize >> 1, SEEK_SET);
+    align_to_next_packet(stream);
+
+    // 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
+
+    for (;;)
+    {
+        const uint8_t *buf = next_packet( stream );
+
+        if ( buf == NULL )
+        {
+            hb_log("hb_ts_stream_find_pids - end of file");
+            break;
+        }
+
+        // Get pid
+        int pid = (((buf[1] & 0x1F) << 8) | buf[2]) & 0x1FFF;
+
         if ((pid == 0x0000) && (stream->ts_number_pat_entries == 0))
-               {
-                 decode_PAT(buf, stream);
-                 continue;
-               }
-               
-               int pat_index = 0;
-               for (pat_index = 0; pat_index < stream->ts_number_pat_entries; pat_index++)
-               {
-                       // There are some streams where the PAT table has multiple entries as if their are
-                       // multiple programs in the same transport stream, and yet there's actually only one
-                       // program really in the stream. This seems to be true for transport streams that
-                       // originate in the HDHomeRun but have been output by EyeTV's export utility. What I think
-                       // is happening is that the HDHomeRun is sending the entire transport stream as broadcast, 
-                       // but the EyeTV is only recording a single (selected) program number and not rewriting the 
-                       // PAT info on export to match what's actually on the stream.
-                       // Until we have a way of handling multiple programs per transport stream elegantly we'll match
-                       // on the first pat entry for which we find a matching program map PID.  The ideal solution would
-                       // be to build a title choice popup from the PAT program number details and then select from
-                       // their - but right now the API's not capable of that.
-                       if (pid == stream->pat_info[pat_index].program_map_PID)
-                       {
-                         if (build_program_map(buf, stream) > 0)
-                               break;
-                       }
-               }
-               // Keep going  until we have a complete set of PIDs
-               if ((stream->ts_number_video_pids > 0) && (stream->ts_number_audio_pids > 0))
-                 break;
-       }
-       
-       hb_log("hb_ts_stream_find_pids - found the following PIDS");
-       hb_log("    Video PIDS : ");
-       int i=0;
-       for (i=0; i < stream->ts_number_video_pids; i++)
-       {
-               hb_log("      0x%x (%d)", stream->ts_video_pids[i], stream->ts_video_pids[i]);
-       }
-       hb_log("    Audio PIDS : ");
-       for (i = 0; i < stream->ts_number_audio_pids; i++)
-       {
-               hb_log("      0x%x (%d)", stream->ts_audio_pids[i], stream->ts_audio_pids[i]);
-       }
+        {
+          decode_PAT(buf, stream);
+          continue;
+        }
+
+        int pat_index = 0;
+        for (pat_index = 0; pat_index < stream->ts_number_pat_entries; pat_index++)
+        {
+            // There are some streams where the PAT table has multiple entries as if their are
+            // multiple programs in the same transport stream, and yet there's actually only one
+            // program really in the stream. This seems to be true for transport streams that
+            // originate in the HDHomeRun but have been output by EyeTV's export utility. What I think
+            // is happening is that the HDHomeRun is sending the entire transport stream as broadcast,
+            // but the EyeTV is only recording a single (selected) program number and not rewriting the
+            // PAT info on export to match what's actually on the stream.
+            // Until we have a way of handling multiple programs per transport stream elegantly we'll match
+            // on the first pat entry for which we find a matching program map PID.  The ideal solution would
+            // be to build a title choice popup from the PAT program number details and then select from
+            // their - but right now the API's not capable of that.
+            if (stream->pat_info[pat_index].program_number != 0 &&
+                pid == stream->pat_info[pat_index].program_map_PID)
+            {
+              if (build_program_map(buf, stream) > 0)
+                break;
+            }
+        }
+        // Keep going  until we have a complete set of PIDs
+        if ( index_of_video( stream ) >= 0 )
+          break;
+    }
+
+    hb_log("hb_ts_stream_find_pids - found the following PIDS");
+    hb_log("    Video PIDS : ");
+    int i;
+    for (i=0; i < stream->ts_number_pids; i++)
+    {
+        if ( stream->ts_stream_kind[i] == V )
+        {
+            hb_log( "      0x%x type %s (0x%x)", 
+                    stream->ts_pids[i],
+                    stream_type_name(stream->ts_stream_type[i]),
+                    stream->ts_stream_type[i]);
+        }
+    }
+    hb_log("    Audio PIDS : ");
+    for (i = 0; i < stream->ts_number_pids; i++)
+    {
+        if ( stream->ts_stream_kind[i] != V )
+        {
+            hb_log( "      0x%x type %s (0x%x)", 
+                    stream->ts_pids[i],
+                    stream_type_name(stream->ts_stream_type[i]),
+                    stream->ts_stream_type[i] );
+        }
+    }
  }
 
-int index_of_video_pid(int pid, hb_stream_t *stream)
+
+static void fwrite64( hb_stream_t *stream, void *buf, int len )
+{
+    if ( len > 0 )
+    {
+        int pos = stream->fwrite_buf->size;
+        if ( pos + len > stream->fwrite_buf->alloc )
+        {
+            int size = MAX(stream->fwrite_buf->alloc * 2, pos + len);
+            hb_buffer_realloc(stream->fwrite_buf, size);
+        }
+        memcpy( &(stream->fwrite_buf->data[pos]), buf, len );
+        stream->fwrite_buf->size += len;
+    }
+}
+
+// convert a PES PTS or DTS to an int64
+static int64_t pes_timestamp( const uint8_t *pes )
 {
-       int found_pid = -1, i = 0;
-       
-       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;
+    int64_t ts = ( (uint64_t)(pes[0] & 0xe ) << 29 );
+    ts |= ( pes[1] << 22 ) | ( ( pes[2] >> 1 ) << 15 ) |
+          ( pes[3] << 7 ) | ( pes[4] >> 1 );
+    return ts;
 }
 
-int index_of_audio_pid(int pid, hb_stream_t *stream)
+static void generate_output_data(hb_stream_t *stream, int curstream)
 {
-       int i = 0, found_pid = -1;
+    hb_buffer_t *buf = stream->fwrite_buf;
+    uint8_t *tdat = stream->ts_buf[curstream]->data;
+
+    buf->id = stream->ts_pids[curstream];
+    switch (stream->ts_stream_kind[curstream])
+    {
+        case A:
+            buf->type = AUDIO_BUF;
+            break;
+
+        case V:
+            buf->type = VIDEO_BUF;
+            break;
+
+        default:
+            buf->type = OTHER_BUF;
+            break;
+    }
+
+    // check if this packet was referenced to an older pcr and if that
+    // pcr was significantly different than the one we're using now.
+    // (the reason for the uint cast on the pcr difference is that the
+    // difference is significant if it advanced by more than 200ms or if
+    // it went backwards by any amount. The negative numbers look like huge
+    // unsigned ints so the cast allows both conditions to be checked at once.
+    int bufpcr = stream->ts_buf[curstream]->cur;
+    int curpcr = stream->ts_pcr_out;
+    if ( bufpcr && bufpcr < curpcr &&
+         (uint64_t)(stream->ts_pcrhist[curpcr & 3] - stream->ts_pcrhist[bufpcr & 3]) > 200*90LL )
+    {
+        // we've sent up a new pcr but have a packet referenced to an
+        // old pcr and the difference was enough to trigger a discontinuity
+        // correction. smash the timestamps or we'll mess up the correction.
+        buf->start = -1;
+        buf->renderOffset = -1;
+    }
+    else
+    {
+        if ( stream->ts_pcr_out != stream->ts_pcr_in )
+        {
+            // we have a new pcr
+            stream->ts_pcr_out = stream->ts_pcr_in;
+            buf->stop = stream->ts_pcr;
+            stream->ts_pcrhist[stream->ts_pcr_out & 3] = stream->ts_pcr;
+        }
+        else
+        {
+            buf->stop = -1;
+        }
+
+        // put the PTS & possible DTS into 'start' & 'renderOffset' then strip
+        // off the PES header.
+        if ( tdat[7] & 0xc0 )
+        {
+            buf->start = pes_timestamp( tdat + 9 );
+            buf->renderOffset = ( tdat[7] & 0x40 )? pes_timestamp( tdat + 14 ) :
+                                                    buf->start;
+        }
+        else
+        {
+            buf->start = -1;
+            buf->renderOffset = -1;
+        }
+    }
+    int hlen = tdat[8] + 9;
 
-       for (i = 0; (i < stream->ts_number_audio_pids) && (found_pid < 0); i++)
-       {
-               if (pid == stream->ts_audio_pids[i])
-                       found_pid = i;
-       }
-       return found_pid;
+    fwrite64( stream,  tdat + hlen, stream->ts_pos[curstream] - hlen );
+
+    stream->ts_pos[curstream] = 0;
+    stream->ts_buf[curstream]->size = 0;
 }
 
-int index_of_pid(int pid, hb_stream_t *stream)
+static void hb_ts_stream_append_pkt(hb_stream_t *stream, int idx, const uint8_t *buf, int len)
 {
-       int found_pid = -1;
-       
-       if ((found_pid = index_of_video_pid(pid, stream)) >= 0)
-               return found_pid;
-       
-       if ((found_pid = index_of_audio_pid(pid, stream)) >= 0)
-               return found_pid;
-               
-       return found_pid;
+    if (stream->ts_pos[idx] + len > stream->ts_buf[idx]->alloc)
+    {
+        int size;
+
+        size = MAX(stream->ts_buf[idx]->alloc * 2, stream->ts_pos[idx] + len);
+        hb_buffer_realloc(stream->ts_buf[idx], size);
+    }
+    memcpy(stream->ts_buf[idx]->data + stream->ts_pos[idx], buf, len);
+    stream->ts_pos[idx] += len;
+    stream->ts_buf[idx]->size += len;
 }
 
 /***********************************************************************
@@ -1879,291 +2491,1113 @@ int index_of_pid(int pid, hb_stream_t *stream)
  ***********************************************************************
  *
  **********************************************************************/
-static void hb_ts_stream_decode(hb_stream_t *stream)
-{
-       unsigned char buf[188];
-       int curstream;
-       int doing_iframe;
-       
-       int i = 0;
-       for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
-       {
-//     stream->ts_skipbad[kAudioStream] = stream->ts_skipbad[kVideoStream] = 0;
-               stream->ts_skipbad[i] = 0;
-       }
-       
-       doing_iframe = 0;
-       
-       if ((stream->ts_number_video_pids == 0) || (stream->ts_number_audio_pids == 0))
-       {
-               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)
-               {
-            // end of file - we didn't finish filling our ps write buffer
-            // so just discard the remainder (the partial buffer is useless)
-            hb_log("hb_ts_stream_decode - eof");
-            stream->ps_decode_buffer[stream->ps_current_write_buffer_index].len = 0;
-         return;
-               }
-
-               // Check sync byte
-               if ((buf[0] != 0x47) && (buf[0] != 0x72) && (buf[0] != 0x29))
-               {
-            off_t pos = ftello(stream->file_handle);
-            hb_log("hb_ts_stream_decode - no sync byte 0x47 @ %lld",  pos);
-                       for (i=0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++)
-                       {
-               //      stream->ts_skipbad[kAudioStream] = stream->ts_skipbad[kVideoStream] = 1;
-                               stream->ts_skipbad[i] = 1;
-                       }
-                       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 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;
-                       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;
-                       }
-                       continue;
-               }
-               else if (adaption == 0x2)
-                       adapt_len = 184;
-               else if (adaption == 0x3)
-               {
-                       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;
-                               }
-                       }
-               }
-
-               // 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++;
-                       }
-
-                       // Couldn't find an AC3 sync start in this packet.. don't make a PES packet!
-                       if (!sync_found)
-                       {
-                               adapt_len = 184;        
-                               start = 0;
-                       }
-               }
-
-               // Found a random access point (now we can start a frame/audio packet..)
-               if (start)
-               {
-                       // Check to see if this is an i_frame (group of picture start)
-                       if (pid == stream->ts_video_pids[0])
-                       {
-                               // 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)
-                       {
-                           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;
-                               }
-                       }
-                       
-                       // If we were skipping a bad packet, start fresh on this new PES packet..
-                       if (stream->ts_skipbad[curstream] == 1)
-                       {
-                               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 (generate_output_data(stream, write_ac3, curstream, pid) != 0)
-                       return ;
-               }
-
-               // 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)
+int hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt, hb_buffer_t *obuf )
+{
+    /*
+     * stash the output buffer pointer in our stream so we don't have to
+     * pass it & its original value to everything we call.
+     */
+    obuf->size = 0;
+    stream->fwrite_buf = obuf;
+
+    int video_index = index_of_video(stream);
+
+    int curstream;
+
+    /* This next section validates the packet */
+
+    // Get pid and use it to find stream state.
+    int pid = ((pkt[1] & 0x1F) << 8) | pkt[2];
+    if ( ( curstream = index_of_pid( stream, pid ) ) < 0 )
+    {
+        return 0;
+    }
+
+    // Get error
+    int errorbit = (pkt[1] & 0x80) != 0;
+    if (errorbit)
+    {
+        ts_err( stream, curstream,  "packet error bit set");
+        return 0;
+    }
+
+    // Get adaption header info
+    int adaption = (pkt[3] & 0x30) >> 4;
+    int adapt_len = 0;
+    if (adaption == 0)
+    {
+        ts_err( stream, curstream,  "adaptation code 0");
+        return 0;
+    }
+    else if (adaption == 0x2)
+        adapt_len = 184;
+    else if (adaption == 0x3)
+    {
+        adapt_len = pkt[4] + 1;
+        if (adapt_len > 184)
+        {
+            ts_err( stream, curstream,  "invalid adapt len %d", adapt_len);
+            return 0;
+        }
+    }
+
+    if ( adapt_len > 0 )
+    {
+        if ( pkt[5] & 0x40 )
+        {
+            // found a random access point
+        }
+        // if there's an adaptation header & PCR_flag is set
+        // get the PCR (Program Clock Reference)
+        if ( adapt_len > 7 && ( pkt[5] & 0x10 ) != 0 )
+        {
+            stream->ts_pcr = ( (uint64_t)pkt[6] << (33 - 8) ) |
+                             ( (uint64_t)pkt[7] << (33 - 16) ) |
+                             ( (uint64_t)pkt[8] << (33 - 24) ) |
+                             ( (uint64_t)pkt[9] << (33 - 32) ) |
+                             ( pkt[10] >> 7 );
+            ++stream->ts_pcr_in;
+            stream->ts_found_pcr = 1;
+            stream->ts_flags |= TS_HAS_PCR;
+        }
+    }
+
+    // If we don't have a PCR yet but the stream has PCRs just loop
+    // so we don't process anything until we have a clock reference.
+    // Unfortunately the HD Home Run appears to null out the PCR so if
+    // we didn't detect a PCR during scan keep going and we'll use
+    // the video stream DTS for the PCR.
+
+    if ( !stream->ts_found_pcr && ( stream->ts_flags & TS_HAS_PCR ) )
+    {
+        return 0;
+    }
+
+    // Get continuity
+    // Continuity only increments for adaption values of 0x3 or 0x01
+    // and is not checked for start packets.
+
+    int start = (pkt[1] & 0x40) != 0;
+
+    if ( (adaption & 0x01) != 0 )
+    {
+        int continuity = (pkt[3] & 0xF);
+        if ( continuity == stream->ts_streamcont[curstream] )
+        {
+            // Spliced transport streams can have duplicate 
+            // continuity counts at the splice boundary.
+            // Test to see if the packet is really a duplicate
+            // by comparing packet summaries to see if they
+            // match.
+            uint8_t summary[8];
+
+            summary[0] = adaption;
+            summary[1] = adapt_len;
+            if (adapt_len + 4 + 6 + 9 <= 188)
             {
-                hb_log("hb_ts_stream_decode: ts_packetbuf overflow, pos = %d ,"
-                       "len = %d", stream->ts_packetpos[curstream],
-                       184 - adapt_len );
-                return;
+                memcpy(&summary[2], pkt+4+adapt_len+9, 6);
             }
-                       memcpy(stream->ts_packetbuf[curstream] + stream->ts_packetpos[curstream], buf + 4 + adapt_len, 184 - adapt_len);
-                       stream->ts_packetpos[curstream] += 184 - adapt_len;
-               }
-       }
-}
+            else
+            {
+                memset(&summary[2], 0, 6);
+            }
+            if ( memcmp( summary, stream->ts_pkt_summary[curstream], 8 ) == 0 )
+            {
+                // 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.
+                return 0;
+            }
+        }
+        if ( !start && (stream->ts_streamcont[curstream] != -1) &&
+             !stream->ts_skipbad[curstream] &&
+             (continuity != ( (stream->ts_streamcont[curstream] + 1) & 0xf ) ) )
+        {
+            ts_err( stream, curstream,  "continuity error: got %d expected %d",
+                    (int)continuity,
+                    (stream->ts_streamcont[curstream] + 1) & 0xf );
+            stream->ts_streamcont[curstream] = continuity;
+            return 0;
+        }
+        stream->ts_streamcont[curstream] = continuity;
+
+        // Save a summary of this packet for later duplicate
+        // testing.  The summary includes some header information
+        // and payload bytes.  Should be enough to detect 
+        // non-duplicates.
+        stream->ts_pkt_summary[curstream][0] = adaption;
+        stream->ts_pkt_summary[curstream][1] = adapt_len;
+        if (adapt_len + 4 + 6 + 9 <= 188)
+        {
+            memcpy(&stream->ts_pkt_summary[curstream][2], 
+                    pkt+4+adapt_len+9, 6);
+        }
+        else
+        {
+            memset(&stream->ts_pkt_summary[curstream][2], 0, 6);
+        }
+    }
 
-/***********************************************************************
- * hb_ts_stream_reset
- ***********************************************************************
- *
- **********************************************************************/
-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;
-       }
+    /* If we get here the packet is valid - process its data */
 
-       for (i=0; i < kMaxNumberDecodeStreams; i++)
-       {
-               stream->ts_streamcont[i] = -1;
-       }
+    if ( start )
+    {
+        // Found a random access point (now we can start a frame/audio packet..)
 
-       stream->ps_current_write_buffer_index = 0;
-       stream->ps_current_read_buffer_index = 1;
+        if ( stream->need_keyframe )
+        {
+            // we're looking for the first video frame because we're
+            // doing random access during 'scan'
+            if ( curstream != video_index || !isIframe( stream, pkt, adapt_len ) )
+            {
+                // not the video stream or didn't find an I frame
+                // but we'll only wait 255 video frames for an I frame.
+                if ( curstream != video_index || ++stream->need_keyframe )
+                {
+                    return 0;
+                }
+            }
+            stream->need_keyframe = 0;
+        }
 
-       align_to_next_packet(stream->file_handle);
-}
+        // If we were skipping a bad packet, start fresh on this new PES packet..
+        if (stream->ts_skipbad[curstream] == 1)
+        {
+            stream->ts_skipbad[curstream] = 0;
+        }
+
+        if ( curstream == video_index )
+        {
+            ++stream->frames;
+
+            // if we don't have a pcr yet use the dts from this frame
+            if ( !stream->ts_found_pcr )
+            {
+                // PES must begin with an mpeg start code & contain
+                // a DTS or PTS.
+                const uint8_t *pes = pkt + adapt_len + 4;
+                if ( pes[0] != 0x00 || pes[1] != 0x00 || pes[2] != 0x01 ||
+                     ( pes[7] >> 6 ) == 0 )
+                {
+                    return 0;
+                }
+                // if we have a dts use it otherwise use the pts
+                stream->ts_pcr = pes_timestamp( pes + ( pes[7] & 0x40?14:9 ) );
+                ++stream->ts_pcr_in;
+            }
+        }
+
+        // if this is a multiplexed stream make sure this is the
+        // substream we want.
+        if ( stream->ts_multiplexed[curstream] )
+        {
+            // PES must begin with an mpeg start code & contain
+            // a DTS or PTS.
+            const uint8_t *pes = pkt + adapt_len + 4;
+            if ( pes[0] != 0x00 || pes[1] != 0x00 || pes[2] != 0x01 ||
+                 pes[3] != 0xfd )
+            {
+                stream->ts_skipbad[curstream] = 1;
+                return 0;
+            }
+            // the last byte of the header is the extension id. see if
+            // it's the one we want.
+            if ( pes[pes[8]+8] != stream->ts_multiplexed[curstream] )
+            {
+                stream->ts_skipbad[curstream] = 1;
+                return 0;
+            }
+        }
+
+        // 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] )
+        {
+            // we have to ship the old packet before updating the pcr
+            // since the packet we've been accumulating is referenced
+            // to the old pcr.
+            generate_output_data(stream, curstream);
+
+            // remember the pcr that was in effect when we started
+            // this packet.
+            stream->ts_buf[curstream]->cur = stream->ts_pcr_in;
+            hb_ts_stream_append_pkt(stream, curstream, pkt + 4 + adapt_len,
+                                    184 - adapt_len);
+            return 1;
+        }
+        // remember the pcr that was in effect when we started this packet.
+        stream->ts_buf[curstream]->cur = stream->ts_pcr_in;
+    }
+
+    // Add the payload for this packet to the current buffer
+    if (!stream->ts_skipbad[curstream] && (184 - adapt_len) > 0)
+    {
+        hb_ts_stream_append_pkt(stream, curstream, pkt + 4 + adapt_len,
+                                184 - adapt_len);
+        // see if we've hit the end of this PES packet
+        const uint8_t *pes = stream->ts_buf[curstream]->data;
+        int len = ( pes[4] << 8 ) + pes[5] + 6;
+        if ( len > 6 && stream->ts_pos[curstream] == len &&
+             pes[0] == 0x00 && pes[1] == 0x00 && pes[2] == 0x01 )
+        {
+            generate_output_data(stream, curstream);
+            return 1;
+        }
+    }
+    return 0;
+}
+
+static int hb_ts_stream_decode( hb_stream_t *stream, hb_buffer_t *obuf )
+{
+    // spin until we get a packet of data from some stream or hit eof
+    while ( 1 )
+    {
+        const uint8_t *buf = next_packet(stream);
+        if ( buf == NULL )
+        {
+            // 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");
+            return 0;
+        }
+
+        if (hb_ts_decode_pkt( stream, buf, obuf ))
+        {
+            return 1;
+        }
+    }
+    return 0;
+}
+
+static void hb_ts_stream_reset(hb_stream_t *stream)
+{
+    int i;
+
+    for (i=0; i < kMaxNumberDecodeStreams; i++)
+    {
+        stream->ts_pos[i] = 0;
+        stream->ts_skipbad[i] = 1;
+        stream->ts_streamcont[i] = -1;
+    }
+
+    stream->need_keyframe = 0;
+
+    stream->ts_found_pcr = 0;
+    stream->ts_pcr_out = 0;
+    stream->ts_pcr_in = 0;
+    stream->ts_pcr = 0;
+
+    stream->frames = 0;
+    stream->errors = 0;
+    stream->last_error_frame = -10000;
+    stream->last_error_count = 0;
+
+    align_to_next_packet(stream);
+}
+
+// ------------------------------------------------------------------
+// Support for reading media files via the ffmpeg libraries.
+
+static void ffmpeg_add_codec( hb_stream_t *stream, int stream_index )
+{
+    // add a codec to the context here so it will be there when we
+    // read the first packet.
+    AVCodecContext *context = stream->ffmpeg_ic->streams[stream_index]->codec;
+    context->workaround_bugs = FF_BUG_AUTODETECT;
+    context->error_recognition = 1;
+    context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
+    AVCodec *codec = avcodec_find_decoder( context->codec_id );
+    hb_avcodec_open( context, codec );
+}
+
+// The ffmpeg stream reader / parser shares a lot of state with the 
+// decoder via a codec context kept in the AVStream of the reader's
+// AVFormatContext. Since decoding is done in a different thread we
+// have to somehow pass this codec context to the decoder and we have
+// to do it before the first packet is read (so we can't put the info
+// in the buf we'll send downstream). Decoders don't have any way to
+// get to the stream directly (they're not passed the title or job
+// pointers during a scan) so this is a back door for the decoder to
+// get the codec context. We just stick the stream pointer in the next
+// slot an array of pointers maintained as a circular list then return
+// the index into the list combined with the ffmpeg stream index as the
+// codec_param that will be passed to the decoder init routine. We make
+// the list 'big' (enough for 1024 simultaneously open ffmpeg streams)
+// so that we don't have to do a complicated allocator or worry about
+// deleting entries on close. 
+//
+// Entries can only be added to this list during a scan and are never
+// deleted so the list access doesn't require locking.
+static hb_stream_t **ffmpeg_streams;    // circular list of stream pointers
+static int ffmpeg_stream_cur;           // where we put the last stream pointer
+#define ffmpeg_sl_bits (10)             // log2 stream list size (in entries)
+#define ffmpeg_sl_size (1 << ffmpeg_sl_bits)
+
+// add a stream to the list & return the appropriate codec_param to access it
+static int ffmpeg_codec_param( hb_stream_t *stream, int stream_index )
+{
+    if ( !ffmpeg_streams )
+    {
+        ffmpeg_streams = calloc( ffmpeg_sl_size, sizeof(stream) );
+    }
+
+    // the title scan adds all the ffmpeg media streams at once so we
+    // only add a new entry to our stream list if the stream is different
+    // than last time.
+    int slot = ffmpeg_stream_cur;
+    if ( ffmpeg_streams[slot] != stream )
+    {
+        // new stream - put it in the next slot of the stream list
+        slot = ++ffmpeg_stream_cur & (ffmpeg_sl_size - 1);
+        ffmpeg_streams[slot] = stream;
+    }
+
+    ffmpeg_add_codec( stream, stream_index );
+
+    return ( stream_index << ffmpeg_sl_bits ) | slot;
+}
+
+// we're about to open 'title' to convert it - remap the stream associated
+// with the video & audio codec params of the title to refer to 'stream'
+// (the original scan stream was closed and no longer exists).
+static void ffmpeg_remap_stream( hb_stream_t *stream, hb_title_t *title )
+{
+    // all the video & audio came from the same stream so remapping
+    // the video's stream slot takes care of everything.
+    int slot = title->video_codec_param & (ffmpeg_sl_size - 1);
+    ffmpeg_streams[slot] = stream;
+
+    // add codecs for all the streams used by the title
+    ffmpeg_add_codec( stream, title->video_codec_param >> ffmpeg_sl_bits );
+
+    int i;
+    hb_audio_t *audio;
+    for ( i = 0; ( audio = hb_list_item( title->list_audio, i ) ); ++i )
+    {
+        if ( audio->config.in.codec == HB_ACODEC_FFMPEG )
+        {
+            ffmpeg_add_codec( stream,
+                              audio->config.in.codec_param >> ffmpeg_sl_bits );
+        }
+    }
+}
+
+void *hb_ffmpeg_context( int codec_param )
+{
+    if ( ffmpeg_streams == NULL )
+        return NULL;
+
+    int slot = codec_param & (ffmpeg_sl_size - 1);
+    int stream_index = codec_param >> ffmpeg_sl_bits;
+    return ffmpeg_streams[slot]->ffmpeg_ic->streams[stream_index]->codec;
+}
+
+void *hb_ffmpeg_avstream( int codec_param )
+{
+    if ( ffmpeg_streams == NULL )
+        return NULL;
+
+    int slot = codec_param & (ffmpeg_sl_size - 1);
+    int stream_index = codec_param >> ffmpeg_sl_bits;
+    return ffmpeg_streams[slot]->ffmpeg_ic->streams[stream_index];
+}
+
+static AVFormatContext *ffmpeg_deferred_close;
+
+static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title )
+{
+    if ( ffmpeg_deferred_close )
+    {
+        av_close_input_file( ffmpeg_deferred_close );
+        ffmpeg_deferred_close = NULL;
+    }
+    AVFormatContext *ic;
+
+    av_log_set_level( AV_LOG_ERROR );
+    if ( av_open_input_file( &ic, stream->path, NULL, 0, NULL ) < 0 )
+    {
+        return 0;
+    }
+    if ( hb_av_find_stream_info( ic ) < 0 )
+        goto fail;
+
+    stream->ffmpeg_ic = ic;
+    stream->hb_stream_type = ffmpeg;
+    stream->ffmpeg_pkt = malloc(sizeof(*stream->ffmpeg_pkt));
+    av_init_packet( stream->ffmpeg_pkt );
+    stream->chapter_end = INT64_MAX;
+
+    if ( title )
+    {
+        // we're opening for read. scan passed out codec params that
+        // indexed its stream so we need to remap them so they point
+        // to this stream.
+        ffmpeg_remap_stream( stream, title );
+        av_log_set_level( AV_LOG_ERROR );
+    }
+    else
+    {
+        // we're opening for scan. let ffmpeg put some info into the
+        // log about what we've got.
+        av_log_set_level( AV_LOG_INFO );
+        av_dump_format( ic, 0, stream->path, 0 );
+        av_log_set_level( AV_LOG_ERROR );
+
+        // accept this file if it has at least one video stream we can decode
+        int i;
+        for (i = 0; i < ic->nb_streams; ++i )
+        {
+            if ( ic->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
+            {
+                break;
+            }
+        }
+        if ( i >= ic->nb_streams )
+            goto fail;
+    }
+    return 1;
+
+  fail:
+    av_close_input_file( ic );
+    return 0;
+}
+
+static void ffmpeg_close( hb_stream_t *d )
+{
+    // XXX since we're sharing the CodecContext with the downstream
+    // decoder proc we can't close the stream. We need to reference count
+    // this so we can close it when both are done with their instance but
+    // for now just defer the close until the next stream open or close.
+    if ( ffmpeg_deferred_close )
+    {
+        av_close_input_file( ffmpeg_deferred_close );
+    }
+    ffmpeg_deferred_close = d->ffmpeg_ic;
+    if ( d->ffmpeg_pkt != NULL )
+    {
+        free( d->ffmpeg_pkt );
+        d->ffmpeg_pkt = NULL;
+    }
+}
 
+static void add_ffmpeg_audio( hb_title_t *title, hb_stream_t *stream, int id )
+{
+    AVStream *st = stream->ffmpeg_ic->streams[id];
+    AVCodecContext *codec = st->codec;
+    AVMetadataTag *tag;
+    int layout;
+
+    // scan will ignore any audio without a bitrate. Since we've already
+    // typed the audio in order to determine its codec we set up the audio
+    // paramters here.
+    layout = hb_ff_layout_xlat( codec->channel_layout, codec->channels );
+    if ( !layout )
+    {
+        // Unsupported layout
+        return;
+    }
+    if ( codec->bit_rate || codec->sample_rate )
+    {
+        hb_audio_t *audio = calloc( 1, sizeof(*audio) );;
+
+        audio->id = id;
+        if ( codec->codec_id == CODEC_ID_AC3 )
+        {
+            audio->config.in.codec = HB_ACODEC_AC3;
+        }
+        else if ( codec->codec_id == CODEC_ID_DTS &&
+                ( codec->profile == FF_PROFILE_DTS ||
+                  codec->profile == FF_PROFILE_DTS_ES ||
+                  codec->profile == FF_PROFILE_DTS_96_24 ) )
+        {
+            audio->config.in.codec = HB_ACODEC_DCA;
+        }
+        else
+        {
+            audio->config.in.codec = HB_ACODEC_FFMPEG;
+            audio->config.in.codec_param = ffmpeg_codec_param( stream, id );
+
+            audio->config.in.bitrate = codec->bit_rate? codec->bit_rate : 1;
+            audio->config.in.samplerate = codec->sample_rate;
+            audio->config.in.channel_layout = layout;
+        }
+
+        tag = av_metadata_get( st->metadata, "language", NULL, 0 );
+        set_audio_description( audio, 
+            lang_for_code2( tag ? tag->value : "und" ) );
+
+        hb_list_add( title->list_audio, audio );
+    }
+}
+
+/*
+ * Format:
+ *   MkvVobSubtitlePrivateData = ( Line )*
+ *   Line = FieldName ':' ' ' FieldValue '\n'
+ *   FieldName = [^:]+
+ *   FieldValue = [^\n]+
+ * 
+ * The line of interest is:
+ *   PaletteLine = "palette" ':' ' ' RRGGBB ( ',' ' ' RRGGBB )*
+ * 
+ * More information on the format at:
+ *   http://www.matroska.org/technical/specs/subtitles/images.html
+ */
+static int ffmpeg_parse_vobsub_extradata_mkv( AVCodecContext *codec, hb_subtitle_t *subtitle )
+{
+    // lines = (string) codec->extradata;
+    char *lines = malloc( codec->extradata_size + 1 );
+    if ( lines == NULL )
+        return 1;
+    memcpy( lines, codec->extradata, codec->extradata_size );
+    lines[codec->extradata_size] = '\0';
+    
+    uint32_t rgb[16];
+    int gotPalette = 0;
+    int gotDimensions = 0;
+    
+    char *curLine, *curLine_parserData;
+    for ( curLine = strtok_r( lines, "\n", &curLine_parserData );
+          curLine;
+          curLine = strtok_r( NULL, "\n", &curLine_parserData ) )
+    {
+        if (!gotPalette)
+        {
+            int numElementsRead = sscanf(curLine, "palette: "
+                "%06x, %06x, %06x, %06x, "
+                "%06x, %06x, %06x, %06x, "
+                "%06x, %06x, %06x, %06x, "
+                "%06x, %06x, %06x, %06x",
+                &rgb[0],  &rgb[1],  &rgb[2],  &rgb[3],
+                &rgb[4],  &rgb[5],  &rgb[6],  &rgb[7],
+                &rgb[8],  &rgb[9],  &rgb[10], &rgb[11],
+                &rgb[12], &rgb[13], &rgb[14], &rgb[15]);
+
+            if (numElementsRead == 16) {
+                gotPalette = 1;
+            }
+        }
+        if (!gotDimensions)
+        {
+            int numElementsRead = sscanf(curLine, "size: %dx%d",
+                &subtitle->width, &subtitle->height);
+
+            if (numElementsRead == 2) {
+                gotDimensions = 1;
+            }
+        }
+        if (gotPalette && gotDimensions)
+            break;
+    }
+
+    if (subtitle->width == 0 || subtitle->height == 0)
+    {
+        subtitle->width = 720;
+        subtitle->height = 480;
+    }
+    
+    free( lines );
+    
+    if ( gotPalette )
+    {
+        int i;
+        for (i=0; i<16; i++)
+            subtitle->palette[i] = hb_rgb2yuv(rgb[i]);
+        return 0;
+    }
+    else
+    {
+        return 1;
+    }
+}
+
+/*
+ * Format: 8-bit {0,Y,Cb,Cr} x 16
+ */
+static int ffmpeg_parse_vobsub_extradata_mp4( AVCodecContext *codec, hb_subtitle_t *subtitle )
+{
+    if ( codec->extradata_size != 4*16 )
+        return 1;
+    
+    int i, j;
+    for ( i=0, j=0; i<16; i++, j+=4 )
+    {
+        subtitle->palette[i] = 
+            codec->extradata[j+1] << 16 |   // Y
+            codec->extradata[j+2] << 8  |   // Cb
+            codec->extradata[j+3] << 0;     // Cr
+    }
+    if (codec->width <= 0 || codec->height <= 0)
+    {
+        subtitle->width = 720;
+        subtitle->height = 480;
+    }
+    else
+    {
+        subtitle->width = codec->width;
+        subtitle->height = codec->height;
+    }
+    return 0;
+}
+
+/*
+ * Parses the 'subtitle->palette' information from the specific VOB subtitle track's private data.
+ * Returns 0 if successful or 1 if parsing failed or was incomplete.
+ */
+static int ffmpeg_parse_vobsub_extradata( AVCodecContext *codec, hb_subtitle_t *subtitle )
+{
+    // XXX: Better if we actually chose the correct parser based on the input container
+    return
+        ffmpeg_parse_vobsub_extradata_mkv( codec, subtitle ) &&
+        ffmpeg_parse_vobsub_extradata_mp4( codec, subtitle );
+}
+
+static void add_ffmpeg_subtitle( hb_title_t *title, hb_stream_t *stream, int id )
+{
+    AVStream *st = stream->ffmpeg_ic->streams[id];
+    AVCodecContext *codec = st->codec;
+    
+    hb_subtitle_t *subtitle = calloc( 1, sizeof(*subtitle) );
+    
+    subtitle->id = id;
+    
+    switch ( codec->codec_id )
+    {
+        case CODEC_ID_DVD_SUBTITLE:
+            subtitle->format = PICTURESUB;
+            subtitle->source = VOBSUB;
+            subtitle->config.dest = RENDERSUB;  // By default render (burn-in) the VOBSUB.
+            if ( ffmpeg_parse_vobsub_extradata( codec, subtitle ) )
+                hb_log( "add_ffmpeg_subtitle: malformed extradata for VOB subtitle track; "
+                        "subtitle colors likely to be wrong" );
+            break;
+        case CODEC_ID_TEXT:
+            subtitle->format = TEXTSUB;
+            subtitle->source = UTF8SUB;
+            subtitle->config.dest = PASSTHRUSUB;
+            break;
+        case CODEC_ID_MOV_TEXT: // TX3G
+            subtitle->format = TEXTSUB;
+            subtitle->source = TX3GSUB;
+            subtitle->config.dest = PASSTHRUSUB;
+            break;
+        case CODEC_ID_SSA:
+            subtitle->format = TEXTSUB;
+            subtitle->source = SSASUB;
+            subtitle->config.dest = PASSTHRUSUB;
+            break;
+        default:
+            hb_log( "add_ffmpeg_subtitle: unknown subtitle stream type: 0x%x", (int) codec->codec_id );
+            free(subtitle);
+            return;
+    }
+    
+    AVMetadataTag *tag;
+    iso639_lang_t *language;
+
+    tag = av_metadata_get( st->metadata, "language", NULL, 0 );
+    language = lang_for_code2( tag ? tag->value : "und" );
+    strcpy( subtitle->lang, language->eng_name );
+    strncpy( subtitle->iso639_2, language->iso639_2, 4 );
+    
+    // Copy the extradata for the subtitle track
+    subtitle->extradata = malloc( codec->extradata_size );
+    memcpy( subtitle->extradata, codec->extradata, codec->extradata_size );
+    subtitle->extradata_size = codec->extradata_size;
+    
+    hb_list_add(title->list_subtitle, subtitle);
+}
+
+static char *get_ffmpeg_metadata_value( AVMetadata *m, char *key )
+{
+    AVMetadataTag *tag = NULL;
+    while ( (tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX)) )
+    {
+        if ( !strcmp( key, tag->key ) )
+        {
+            return tag->value;
+        }
+    }
+    return NULL;
+}
+
+static void add_ffmpeg_attachment( hb_title_t *title, hb_stream_t *stream, int id )
+{
+    AVStream *st = stream->ffmpeg_ic->streams[id];
+    AVCodecContext *codec = st->codec;
+    
+    enum attachtype type;
+    switch ( codec->codec_id )
+    {
+        case CODEC_ID_TTF:
+            type = FONT_TTF_ATTACH;
+            break;
+        default:
+            // Ignore unrecognized attachment type
+            return;
+    }
+    
+    hb_attachment_t *attachment = calloc( 1, sizeof(*attachment) );
+    
+    // Copy the attachment name and data
+    attachment->type = type;
+    attachment->name = strdup( get_ffmpeg_metadata_value( st->metadata, "filename" ) );
+    attachment->data = malloc( codec->extradata_size );
+    memcpy( attachment->data, codec->extradata, codec->extradata_size );
+    attachment->size = codec->extradata_size;
+    
+    hb_list_add(title->list_attachment, attachment);
+}
+
+static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream )
+{
+    AVFormatContext *ic = stream->ffmpeg_ic;
+
+    // 'Barebones Title'
+    hb_title_t *title = hb_title_init( stream->path, 0 );
+    title->type = HB_STREAM_TYPE;
+    title->index = 1;
+
+    // Copy part of the stream path to the title name
+    char *sep = strrchr(stream->path, '/');
+    if (sep)
+        strcpy(title->name, sep+1);
+    char *dot_term = strrchr(title->name, '.');
+    if (dot_term)
+        *dot_term = '\0';
+
+    uint64_t dur = ic->duration * 90000 / AV_TIME_BASE;
+    title->duration = dur;
+    dur /= 90000;
+    title->hours    = dur / 3600;
+    title->minutes  = ( dur % 3600 ) / 60;
+    title->seconds  = dur % 60;
+
+    // set the title to decode the first video stream in the file
+    title->demuxer = HB_NULL_DEMUXER;
+    title->video_codec = 0;
+    int i;
+    for (i = 0; i < ic->nb_streams; ++i )
+    {
+        if ( ic->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO &&
+             avcodec_find_decoder( ic->streams[i]->codec->codec_id ) &&
+             title->video_codec == 0 )
+        {
+            AVCodecContext *context = ic->streams[i]->codec;
+            if ( context->pix_fmt != PIX_FMT_YUV420P &&
+                 !sws_isSupportedInput( context->pix_fmt ) )
+            {
+                hb_log( "ffmpeg_title_scan: Unsupported color space" );
+                continue;
+            }
+            title->video_id = i;
+            stream->ffmpeg_video_id = i;
+
+            // We have to use the 'internal' avcodec decoder because
+            // it needs to share the codec context from this video
+            // stream. The parser internal to av_read_frame
+            // passes a bunch of state info to the decoder via the context.
+            title->video_codec = WORK_DECAVCODECVI;
+            title->video_codec_param = ffmpeg_codec_param( stream, i );
+        }
+        else if ( ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO &&
+                  avcodec_find_decoder( ic->streams[i]->codec->codec_id ) )
+        {
+            add_ffmpeg_audio( title, stream, i );
+        }
+        else if ( ic->streams[i]->codec->codec_type == CODEC_TYPE_SUBTITLE )
+        {
+            add_ffmpeg_subtitle( title, stream, i );
+        }
+        else if ( ic->streams[i]->codec->codec_type == CODEC_TYPE_ATTACHMENT )
+        {
+            add_ffmpeg_attachment( title, stream, i );
+        }
+    }
+
+    title->container_name = strdup( ic->iformat->name );
+    title->data_rate = ic->bit_rate;
+
+    hb_deep_log( 2, "Found ffmpeg %d chapters, container=%s", ic->nb_chapters, ic->iformat->name );
+
+    if( ic->nb_chapters != 0 )
+    {
+        AVChapter *m;
+        uint64_t duration_sum = 0;
+        for( i = 0; i < ic->nb_chapters; i++ )
+            if( ( m = ic->chapters[i] ) != NULL )
+            {
+                AVMetadataTag *tag;
+                hb_chapter_t * chapter;
+                chapter = calloc( sizeof( hb_chapter_t ), 1 );
+                chapter->index    = i+1;
+                chapter->duration = ( m->end / ( (double) m->time_base.num * m->time_base.den ) ) * 90000  - duration_sum;
+                duration_sum     += chapter->duration;
+                chapter->hours    = chapter->duration / 90000 / 3600;
+                chapter->minutes  = ( ( chapter->duration / 90000 ) % 3600 ) / 60;
+                chapter->seconds  = ( chapter->duration / 90000 ) % 60;
+                tag = av_metadata_get( m->metadata, "title", NULL, 0 );
+                strcpy( chapter->title, tag ? tag->value : "" );
+                hb_deep_log( 2, "Added chapter %i, name='%s', dur=%"PRIu64", (%02i:%02i:%02i)",
+                            chapter->index, chapter->title,
+                            chapter->duration, chapter->hours,
+                            chapter->minutes, chapter->seconds );
+                hb_list_add( title->list_chapter, chapter );
+            }
+    }
+
+    /*
+     * Fill the metadata.
+     */
+    decmetadata( title );
+
+    if( hb_list_count( title->list_chapter ) == 0 )
+    {
+        // Need at least one chapter
+        hb_chapter_t * chapter;
+        chapter = calloc( sizeof( hb_chapter_t ), 1 );
+        chapter->index = 1;
+        chapter->duration = title->duration;
+        chapter->hours = title->hours;
+        chapter->minutes = title->minutes;
+        chapter->seconds = title->seconds;
+        hb_list_add( title->list_chapter, chapter );
+    }
+
+    return title;
+}
+
+static int64_t av_to_hb_pts( int64_t pts, double conv_factor )
+{
+    if ( pts == AV_NOPTS_VALUE )
+        return -1;
+    return (int64_t)( (double)pts * conv_factor );
+}
+
+static int ffmpeg_is_keyframe( hb_stream_t *stream )
+{
+    uint8_t *pkt;
+
+    switch ( stream->ffmpeg_ic->streams[stream->ffmpeg_video_id]->codec->codec_id )
+    {
+        case CODEC_ID_VC1:
+            // XXX the VC1 codec doesn't mark key frames so to get previews
+            // we do it ourselves here. The decoder gets messed up if it
+            // doesn't get a SEQ header first so we consider that to be a key frame.
+            pkt = stream->ffmpeg_pkt->data;
+            if ( !pkt[0] && !pkt[1] && pkt[2] == 1 && pkt[3] == 0x0f )
+                return 1;
+
+            return 0;
+
+        case CODEC_ID_WMV3:
+            // XXX the ffmpeg WMV3 codec doesn't mark key frames.
+            // Only M$ could make I-frame detection this complicated: there
+            // are two to four bits of unused junk ahead of the frame type
+            // so we have to look at the sequence header to find out how much
+            // to skip. Then there are three different ways of coding the type
+            // depending on whether it's main or advanced profile then whether
+            // there are bframes or not so we have to look at the sequence
+            // header to get that.
+            pkt = stream->ffmpeg_pkt->data;
+            uint8_t *seqhdr = stream->ffmpeg_ic->streams[stream->ffmpeg_video_id]->codec->extradata;
+            int pshift = 2;
+            if ( ( seqhdr[3] & 0x02 ) == 0 )
+                // no FINTERPFLAG
+                ++pshift;
+            if ( ( seqhdr[3] & 0x80 ) == 0 )
+                // no RANGEREDUCTION
+                ++pshift;
+            if ( seqhdr[3] & 0x70 )
+                // stream has b-frames
+                return ( ( pkt[0] >> pshift ) & 0x3 ) == 0x01;
+
+            return ( ( pkt[0] >> pshift ) & 0x2 ) == 0;
+
+        default:
+            break;
+    }
+    return ( stream->ffmpeg_pkt->flags & PKT_FLAG_KEY );
+}
+
+static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf )
+{
+    int err;
+  again:
+    if ( ( err = av_read_frame( stream->ffmpeg_ic, stream->ffmpeg_pkt )) < 0 )
+    {
+        // av_read_frame can return EAGAIN.  In this case, it expects
+        // to be called again to get more data.
+        if ( err == AVERROR(EAGAIN) )
+        {
+            goto again;
+        }
+        // XXX the following conditional is to handle avi files that
+        // use M$ 'packed b-frames' and occasionally have negative
+        // sizes for the null frames these require.
+        if ( err != AVERROR_NOMEM || stream->ffmpeg_pkt->size >= 0 )
+            // eof
+            return 0;
+    }
+    if ( stream->ffmpeg_pkt->size <= 0 )
+    {
+        // M$ "invalid and inefficient" packed b-frames require 'null frames'
+        // following them to preserve the timing (since the packing puts two
+        // or more frames in what looks like one avi frame). The contents and
+        // size of these null frames are ignored by the ff_h263_decode_frame
+        // as long as they're < 20 bytes. We need a positive size so we use
+        // one byte if we're given a zero or negative size. We don't know
+        // if the pkt data points anywhere reasonable so we just stick a
+        // byte of zero in our outbound buf.
+        buf->size = 1;
+        *buf->data = 0;
+    }
+    else
+    {
+        if ( stream->ffmpeg_pkt->size > buf->alloc )
+        {
+            // sometimes we get absurd sizes from ffmpeg
+            if ( stream->ffmpeg_pkt->size >= (1 << 25) )
+            {
+                hb_log( "ffmpeg_read: pkt too big: %d bytes", stream->ffmpeg_pkt->size );
+                av_free_packet( stream->ffmpeg_pkt );
+                return ffmpeg_read( stream, buf );
+            }
+            // need to expand buffer
+            hb_buffer_realloc( buf, stream->ffmpeg_pkt->size );
+        }
+        memcpy( buf->data, stream->ffmpeg_pkt->data, stream->ffmpeg_pkt->size );
+        buf->size = stream->ffmpeg_pkt->size;
+    }
+    buf->id = stream->ffmpeg_pkt->stream_index;
+    if ( buf->id == stream->ffmpeg_video_id )
+    {
+        if ( stream->need_keyframe )
+        {
+            // we've just done a seek (generally for scan or live preview) and
+            // want to start at a keyframe. Some ffmpeg codecs seek to a key
+            // frame but most don't. So we spin until we either get a keyframe
+            // or we've looked through 50 video frames without finding one.
+            if ( ! ffmpeg_is_keyframe( stream ) && ++stream->need_keyframe < 50 )
+            {
+                av_free_packet( stream->ffmpeg_pkt );
+                goto again;
+            }
+            stream->need_keyframe = 0;
+        }
+        ++stream->frames;
+    }
+
+    // if we haven't done it already, compute a conversion factor to go
+    // from the ffmpeg timebase for the stream to HB's 90KHz timebase.
+    double tsconv = stream->ffmpeg_tsconv[stream->ffmpeg_pkt->stream_index];
+    if ( ! tsconv )
+    {
+        AVStream *s = stream->ffmpeg_ic->streams[stream->ffmpeg_pkt->stream_index];
+        tsconv = 90000. * (double)s->time_base.num / (double)s->time_base.den;
+        stream->ffmpeg_tsconv[stream->ffmpeg_pkt->stream_index] = tsconv;
+    }
+
+    buf->start = av_to_hb_pts( stream->ffmpeg_pkt->pts, tsconv );
+    buf->renderOffset = av_to_hb_pts( stream->ffmpeg_pkt->dts, tsconv );
+    if ( buf->renderOffset >= 0 && buf->start == -1 )
+    {
+        buf->start = buf->renderOffset;
+    }
+    else if ( buf->renderOffset == -1 && buf->start >= 0 )
+    {
+        buf->renderOffset = buf->start;
+    }
+    
+    /* 
+     * Fill out buf->stop for subtitle packets
+     * 
+     * libavcodec's MKV demuxer stores the duration of UTF-8 subtitles (CODEC_ID_TEXT)
+     * in the 'convergence_duration' field for some reason.
+     * 
+     * Other subtitles' durations are stored in the 'duration' field.
+     * 
+     * VOB subtitles (CODEC_ID_DVD_SUBTITLE) do not have their duration stored in
+     * either field. This is not a problem because the VOB decoder can extract this
+     * information from the packet payload itself.
+     * 
+     * SSA subtitles (CODEC_ID_SSA) do not have their duration stored in
+     * either field. This is not a problem because the SSA decoder can extract this
+     * information from the packet payload itself.
+     */
+    enum CodecID ffmpeg_pkt_codec = stream->ffmpeg_ic->streams[stream->ffmpeg_pkt->stream_index]->codec->codec_id;
+    if ( ffmpeg_pkt_codec == CODEC_ID_TEXT ) {
+        int64_t ffmpeg_pkt_duration = stream->ffmpeg_pkt->convergence_duration;
+        int64_t buf_duration = av_to_hb_pts( ffmpeg_pkt_duration, tsconv );
+        buf->stop = buf->start + buf_duration;
+    }
+    if ( ffmpeg_pkt_codec == CODEC_ID_MOV_TEXT ) {
+        int64_t ffmpeg_pkt_duration = stream->ffmpeg_pkt->duration;
+        int64_t buf_duration = av_to_hb_pts( ffmpeg_pkt_duration, tsconv );
+        buf->stop = buf->start + buf_duration;
+    }
+
+    /*
+     * Check to see whether this video buffer is on a chapter
+     * boundary, if so mark it as such in the buffer then advance
+     * chapter_end to the end of the next chapter.
+     * If there are no chapters, chapter_end is always initialized to INT64_MAX
+     * (roughly 3 million years at our 90KHz clock rate) so the test
+     * below handles both the chapters & no chapters case.
+     */
+    if ( buf->id == stream->ffmpeg_video_id && buf->start >= stream->chapter_end )
+    {
+        hb_chapter_t *chapter = hb_list_item( stream->title->list_chapter,
+                                              stream->chapter+1 );
+        if( chapter )
+        {
+            stream->chapter++;
+            stream->chapter_end += chapter->duration;
+            buf->new_chap = stream->chapter + 1;
+            hb_deep_log( 2, "ffmpeg_read starting chapter %i at %"PRId64,
+                         buf->new_chap, buf->start);
+        } else {
+            // Must have run out of chapters, stop looking.
+            stream->chapter_end = INT64_MAX;
+        }
+    } else {
+        buf->new_chap = 0;
+    }
+    av_free_packet( stream->ffmpeg_pkt );
+    return 1;
+}
+
+static int ffmpeg_seek( hb_stream_t *stream, float frac )
+{
+    AVFormatContext *ic = stream->ffmpeg_ic;
+    if ( frac > 0. )
+    {
+        int64_t pos = (double)ic->duration * (double)frac;
+        if ( ic->start_time != AV_NOPTS_VALUE && ic->start_time > 0 )
+        {
+            pos += ic->start_time;
+        }
+        av_seek_frame( ic, -1, pos, 0 );
+        stream->need_keyframe = 1;
+    }
+    else
+    {
+        av_seek_frame( ic, -1, 0LL, AVSEEK_FLAG_BACKWARD );
+    }
+    return 1;
+}
+
+// Assumes that we are always seeking forward
+static int ffmpeg_seek_ts( hb_stream_t *stream, int64_t ts )
+{
+    AVFormatContext *ic = stream->ffmpeg_ic;
+    int64_t pos;
+
+    pos = ts * AV_TIME_BASE / 90000 + ffmpeg_initial_timestamp( stream );
+    stream->need_keyframe = 1;
+    // Seek to the nearest timestamp before that requested where
+    // there is an I-frame
+    return av_seek_frame( ic, -1, pos, AVSEEK_FLAG_BACKWARD );
+}