mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux

Originally committed as revision 1956 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 775 insertions, 155 deletions

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 92e1d51389..8e2898398b 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1,6 +1,6 @@
 /*
  * MPEG2 transport stream (aka DVB) demux
- * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2002-2003 Fabrice Bellard.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,42 +18,193 @@
  */
 #include "avformat.h"
 
-#define TS_FEC_PACKET_SIZE 204
-#define TS_PACKET_SIZE 188
-#define NB_PID_MAX 8192
+#include "mpegts.h"
 
-enum MpegTSState {
-    MPEGTS_HEADER = 0,
-    MPEGTS_PESHEADER_FILL,
-    MPEGTS_PESHEADER_FLAGS,
-    MPEGTS_PESHEADER_SIZE,
-    MPEGTS_PESHEADER_READ,
-    MPEGTS_PAYLOAD,
-    MPEGTS_SKIP,
+//#define DEBUG_SI
+
+/* 1.0 second at 24Mbit/s */
+#define MAX_SCAN_PACKETS 16000
+
+static int add_pes_stream(AVFormatContext *s, int pid);
+
+enum MpegTSFilterType {
+    MPEGTS_PES,
+    MPEGTS_SECTION,
 };
 
-/* enough for PES header + length */
-#define MAX_HEADER_SIZE 6
+/* XXX: suppress 'pkt' parameter */
+typedef void PESCallback(void *opaque, const uint8_t *buf, int len, int is_start);
 
-typedef struct MpegTSStream {
+typedef struct MpegTSPESFilter {
+    PESCallback *pes_cb;
+    void *opaque;
+} MpegTSPESFilter;
+
+typedef void SectionCallback(void *opaque, const uint8_t *buf, int len);
+
+typedef void SetServiceCallback(void *opaque, int ret);
+
+typedef struct MpegTSSectionFilter {
+    int section_index;
+    int section_h_size;
+    uint8_t *section_buf;
+    int check_crc:1;
+    int end_of_section_reached:1;
+    SectionCallback *section_cb;
+    void *opaque;
+} MpegTSSectionFilter;
+
+typedef struct MpegTSFilter {
     int pid;
-    enum MpegTSState state;
     int last_cc; /* last cc code (-1 if first packet) */
-    /* used to get the format */
-    int header_size;
-    int payload_size;
-    int pes_header_size;
-    AVStream *st;
-    unsigned char header[MAX_HEADER_SIZE];
-} MpegTSStream;
+    enum MpegTSFilterType type;
+    union {
+        MpegTSPESFilter pes_filter;
+        MpegTSSectionFilter section_filter;
+    } u;
+} MpegTSFilter;
+
+typedef struct MpegTSService {
+    int running:1;
+    int sid;
+    char *provider_name;
+    char *name;
+} MpegTSService;
 
 typedef struct MpegTSContext {
+    /* user data */
+    AVFormatContext *stream;
     int raw_packet_size; /* raw packet size, including FEC if present */
-    MpegTSStream *pids[NB_PID_MAX];
+    int auto_guess; /* if true, all pids are analized to find streams */
+    int set_service_ret;
+
+    /* data needed to handle file based ts */
+    int stop_parse; /* stop parsing loop */
+    AVPacket *pkt; /* packet containing av data */
+
+    /******************************************/
+    /* private mpegts data */
+    /* scan context */
+    MpegTSFilter *sdt_filter;
+    int nb_services;
+    MpegTSService **services;
+    
+    /* set service context (XXX: allocated it ?) */
+    SetServiceCallback *set_service_cb;
+    void *set_service_opaque;
+    MpegTSFilter *pat_filter;
+    MpegTSFilter *pmt_filter;
+    int req_sid;
+
+    MpegTSFilter *pids[NB_PID_MAX];
 } MpegTSContext;
 
+static void write_section_data(AVFormatContext *s, MpegTSFilter *tss1,
+                               const uint8_t *buf, int buf_size, int is_start)
+{
+    MpegTSSectionFilter *tss = &tss1->u.section_filter;
+    int len;
+    unsigned int crc;
+    
+    if (is_start) {
+        memcpy(tss->section_buf, buf, buf_size);
+        tss->section_index = buf_size;
+        tss->section_h_size = -1;
+        tss->end_of_section_reached = 0;
+    } else {
+        if (tss->end_of_section_reached)
+            return;
+        len = 4096 - tss->section_index;
+        if (buf_size < len)
+            len = buf_size;
+        memcpy(tss->section_buf + tss->section_index, buf, len);
+        tss->section_index += len;
+    }
+
+    /* compute section length if possible */
+    if (tss->section_h_size == -1 && tss->section_index >= 3) {
+        len = (((tss->section_buf[1] & 0xf) << 8) | tss->section_buf[2]) + 3;
+        if (len > 4096)
+            return;
+        tss->section_h_size = len;
+    }
+
+    if (tss->section_h_size != -1 && tss->section_index >= tss->section_h_size) {
+        if (tss->check_crc) {
+            crc = mpegts_crc32(tss->section_buf, tss->section_h_size);
+            if (crc != 0)
+                goto invalid_crc;
+        }
+        tss->section_cb(tss->opaque, tss->section_buf, tss->section_h_size);
+    invalid_crc:
+        tss->end_of_section_reached = 1;
+    }
+}
+
+MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, unsigned int pid, 
+                                         SectionCallback *section_cb, void *opaque,
+                                         int check_crc)
+
+{
+    MpegTSFilter *filter;
+    MpegTSSectionFilter *sec;
+
+    if (pid >= NB_PID_MAX || ts->pids[pid])
+        return NULL;
+    filter = av_mallocz(sizeof(MpegTSFilter));
+    if (!filter) 
+        return NULL;
+    ts->pids[pid] = filter;
+    filter->type = MPEGTS_SECTION;
+    filter->pid = pid;
+    filter->last_cc = -1;
+    sec = &filter->u.section_filter;
+    sec->section_cb = section_cb;
+    sec->opaque = opaque;
+    sec->section_buf = av_malloc(MAX_SECTION_SIZE);
+    sec->check_crc = check_crc;
+    if (!sec->section_buf) {
+        av_free(filter);
+        return NULL;
+    }
+    return filter;
+}
+
+MpegTSFilter *mpegts_open_pes_filter(MpegTSContext *ts, unsigned int pid, 
+                                     PESCallback *pes_cb,
+                                     void *opaque)
+{
+    MpegTSFilter *filter;
+    MpegTSPESFilter *pes;
+
+    if (pid >= NB_PID_MAX || ts->pids[pid])
+        return NULL;
+    filter = av_mallocz(sizeof(MpegTSFilter));
+    if (!filter) 
+        return NULL;
+    ts->pids[pid] = filter;
+    filter->type = MPEGTS_PES;
+    filter->pid = pid;
+    filter->last_cc = -1;
+    pes = &filter->u.pes_filter;
+    pes->pes_cb = pes_cb;
+    pes->opaque = opaque;
+    return filter;
+}
+
+void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
+{
+    int pid;
+
+    pid = filter->pid;
+    if (filter->type == MPEGTS_SECTION)
+        av_freep(&filter->u.section_filter.section_buf);
+    av_free(filter);
+    ts->pids[pid] = NULL;
+}
+
 /* autodetect fec presence. Must have at least 1024 bytes  */
-static int get_packet_size(const unsigned char *buf, int size)
+static int get_packet_size(const uint8_t *buf, int size)
 {
     int i;
 
@@ -72,78 +223,400 @@ static int get_packet_size(const unsigned char *buf, int size)
     return TS_FEC_PACKET_SIZE;
 }
 
-static int mpegts_probe(AVProbeData *p)
+typedef struct SectionHeader {
+    uint8_t tid;
+    uint16_t id;
+    uint8_t version;
+    uint8_t sec_num;
+    uint8_t last_sec_num;
+} SectionHeader;
+
+static inline int get8(const uint8_t **pp, const uint8_t *p_end)
 {
-    int size;
-    size = get_packet_size(p->buf, p->buf_size);
-    if (size < 0)
-        return 0;
-    return AVPROBE_SCORE_MAX - 1;
+    const uint8_t *p;
+    int c;
+
+    p = *pp;
+    if (p >= p_end)
+        return -1;
+    c = *p++;
+    *pp = p;
+    return c;
 }
 
-static int mpegts_read_header(AVFormatContext *s,
-                              AVFormatParameters *ap)
+static inline int get16(const uint8_t **pp, const uint8_t *p_end)
+{
+    const uint8_t *p;
+    int c;
+
+    p = *pp;
+    if ((p + 1) >= p_end)
+        return -1;
+    c = (p[0] << 8) | p[1];
+    p += 2;
+    *pp = p;
+    return c;
+}
+
+/* read and allocate a DVB string preceeded by its length */
+static char *getstr8(const uint8_t **pp, const uint8_t *p_end)
 {
-    MpegTSContext *ts = s->priv_data;
-    ByteIOContext *pb = &s->pb;
-    unsigned char buf[1024];
     int len;
-    int64_t pos;
+    const uint8_t *p;
+    char *str;
 
-    /* read the first 1024 bytes to get packet size */
-    pos = url_ftell(pb);
-    len = get_buffer(pb, buf, sizeof(buf));
-    if (len != sizeof(buf))
-        goto fail;
-    ts->raw_packet_size = get_packet_size(buf, sizeof(buf));
-    if (ts->raw_packet_size <= 0)
-        goto fail;
-    /* go again to the start */
-    url_fseek(pb, pos, SEEK_SET);
+    p = *pp;
+    len = get8(&p, p_end);
+    if (len < 0)
+        return NULL;
+    if ((p + len) > p_end)
+        return NULL;
+    str = av_malloc(len + 1);
+    if (!str)
+        return NULL;
+    memcpy(str, p, len);
+    str[len] = '\0';
+    p += len;
+    *pp = p;
+    return str;
+}
+
+static int parse_section_header(SectionHeader *h, 
+                                const uint8_t **pp, const uint8_t *p_end)
+{
+    int val;
+
+    val = get8(pp, p_end);
+    if (val < 0)
+        return -1;
+    h->tid = val;
+    *pp += 2;
+    val = get16(pp, p_end);
+    if (val < 0)
+        return -1;
+    h->id = val;
+    val = get8(pp, p_end);
+    if (val < 0)
+        return -1;
+    h->version = (val >> 1) & 0x1f;
+    val = get8(pp, p_end);
+    if (val < 0)
+        return -1;
+    h->sec_num = val;
+    val = get8(pp, p_end);
+    if (val < 0)
+        return -1;
+    h->last_sec_num = val;
     return 0;
- fail:
-    return -1;
+}
+
+static MpegTSService *new_service(MpegTSContext *ts, int sid, 
+                                  char *provider_name, char *name)
+{
+    MpegTSService *service;
+
+#ifdef DEBUG_SI
+    printf("new_service: sid=0x%04x provider='%s' name='%s'\n", 
+           sid, provider_name, name);
+#endif
+
+    service = av_mallocz(sizeof(MpegTSService));
+    if (!service)
+        return NULL;
+    service->sid = sid;
+    service->provider_name = provider_name;
+    service->name = name;
+    dynarray_add(&ts->services, &ts->nb_services, service);
+    return service;
+}
+
+static void pmt_cb(void *opaque, const uint8_t *section, int section_len)
+{
+    MpegTSContext *ts = opaque;
+    SectionHeader h1, *h = &h1;
+    const uint8_t *p, *p_end;
+    int program_info_length, pcr_pid, pid, stream_type, desc_length;
+    
+#ifdef DEBUG_SI
+    printf("PMT:\n");
+    av_hex_dump((uint8_t *)section, section_len);
+#endif
+    p_end = section + section_len - 4;
+    p = section;
+    if (parse_section_header(h, &p, p_end) < 0)
+        return;
+#ifdef DEBUG_SI
+    printf("sid=0x%x sec_num=%d/%d\n", h->id, h->sec_num, h->last_sec_num);
+#endif
+    if (h->tid != PMT_TID || h->id != ts->req_sid)
+        return;
+
+    pcr_pid = get16(&p, p_end) & 0x1fff;
+    if (pcr_pid < 0)
+        return;
+#ifdef DEBUG_SI
+    printf("pcr_pid=0x%x\n", pcr_pid);
+#endif
+    program_info_length = get16(&p, p_end) & 0xfff;
+    if (program_info_length < 0)
+        return;
+    p += program_info_length;
+    if (p >= p_end)
+        return;
+    for(;;) {
+        stream_type = get8(&p, p_end);
+        if (stream_type < 0)
+            break;
+        pid = get16(&p, p_end) & 0x1fff;
+        if (pid < 0)
+            break;
+        desc_length = get16(&p, p_end) & 0xfff;
+        if (desc_length < 0)
+            break;
+        p += desc_length;
+        if (p > p_end)
+            return;
+
+#ifdef DEBUG_SI
+        printf("stream_type=%d pid=0x%x\n", stream_type, pid);
+#endif
+
+        /* now create ffmpeg stream */
+        switch(stream_type) {
+        case STREAM_TYPE_AUDIO:
+        case STREAM_TYPE_VIDEO:
+            add_pes_stream(ts->stream, pid);
+            break;
+        default:
+            /* we ignore the other streams */
+            break;
+        }
+    }
+    /* all parameters are there */
+    ts->set_service_cb(ts->set_service_opaque, 0);
+    mpegts_close_filter(ts, ts->pmt_filter);
+    ts->pmt_filter = NULL;
+}
+
+static void pat_cb(void *opaque, const uint8_t *section, int section_len)
+{
+    MpegTSContext *ts = opaque;
+    SectionHeader h1, *h = &h1;
+    const uint8_t *p, *p_end;
+    int sid, pmt_pid;
+
+#ifdef DEBUG_SI
+    printf("PAT:\n");
+    av_hex_dump((uint8_t *)section, section_len);
+#endif
+    p_end = section + section_len - 4;
+    p = section;
+    if (parse_section_header(h, &p, p_end) < 0)
+        return;
+    if (h->tid != PAT_TID)
+        return;
+
+    for(;;) {
+        sid = get16(&p, p_end);
+        if (sid < 0)
+            break;
+        pmt_pid = get16(&p, p_end) & 0x1fff;
+        if (pmt_pid < 0)
+            break;
+#ifdef DEBUG_SI
+        printf("sid=0x%x pid=0x%x\n", sid, pmt_pid);
+#endif
+        if (sid == 0x0000) {
+            /* NIT info */
+        } else {
+            if (ts->req_sid == sid) {
+                ts->pmt_filter = mpegts_open_section_filter(ts, pmt_pid, 
+                                                            pmt_cb, ts, 1);
+                goto found;
+            }
+        }
+    }
+    /* not found */
+    ts->set_service_cb(ts->set_service_opaque, -1);
+
+ found:
+    mpegts_close_filter(ts, ts->pat_filter);
+    ts->pat_filter = NULL;
+}
+
+void mpegts_set_service(MpegTSContext *ts, int sid,
+                        SetServiceCallback *set_service_cb, void *opaque)
+{
+    ts->set_service_cb = set_service_cb;
+    ts->set_service_opaque = opaque;
+    ts->req_sid = sid;
+    ts->pat_filter = mpegts_open_section_filter(ts, PAT_PID, 
+                                                pat_cb, ts, 1);
+}
+
+static void sdt_cb(void *opaque, const uint8_t *section, int section_len)
+{
+    MpegTSContext *ts = opaque;
+    SectionHeader h1, *h = &h1;
+    const uint8_t *p, *p_end, *desc_list_end, *desc_end;
+    int onid, val, sid, desc_list_len, desc_tag, desc_len, service_type;
+    char *name, *provider_name;
+
+#ifdef DEBUG_SI
+    printf("SDT:\n");
+    av_hex_dump((uint8_t *)section, section_len);
+#endif
+
+    p_end = section + section_len - 4;
+    p = section;
+    if (parse_section_header(h, &p, p_end) < 0)
+        return;
+    if (h->tid != SDT_TID)
+        return;
+    onid = get16(&p, p_end);
+    if (onid < 0)
+        return;
+    val = get8(&p, p_end);
+    if (val < 0)
+        return;
+    for(;;) {
+        sid = get16(&p, p_end);
+        if (sid < 0)
+            break;
+        val = get8(&p, p_end);
+        if (val < 0)
+            break;
+        desc_list_len = get16(&p, p_end) & 0xfff;
+        if (desc_list_len < 0)
+            break;
+        desc_list_end = p + desc_list_len;
+        if (desc_list_end > p_end)
+            break;
+        for(;;) {
+            desc_tag = get8(&p, desc_list_end);
+            if (desc_tag < 0)
+                break;
+            desc_len = get8(&p, desc_list_end);
+            desc_end = p + desc_len;
+            if (desc_end > desc_list_end)
+                break;
+#ifdef DEBUG_SI
+            printf("tag: 0x%02x len=%d\n", desc_tag, desc_len);
+#endif
+            switch(desc_tag) {
+            case 0x48:
+                service_type = get8(&p, p_end);
+                if (service_type < 0)
+                    break;
+                provider_name = getstr8(&p, p_end);
+                if (!provider_name)
+                    break;
+                name = getstr8(&p, p_end);
+                if (!name)
+                    break;
+                new_service(ts, sid, provider_name, name);
+                break;
+            default:
+                break;
+            }
+            p = desc_end;
+        }
+        p = desc_list_end;
+    }
+    ts->stop_parse = 1;
+
+    /* remove filter */
+    mpegts_close_filter(ts, ts->sdt_filter);
+    ts->sdt_filter = NULL;
+}
+
+/* scan services an a transport stream by looking at the sdt */
+void mpegts_scan_sdt(MpegTSContext *ts)
+{
+    ts->sdt_filter = mpegts_open_section_filter(ts, SDT_PID, 
+                                                sdt_cb, ts, 1);
+}
+
+
+/* TS stream handling */
+
+enum MpegTSState {
+    MPEGTS_HEADER = 0,
+    MPEGTS_PESHEADER_FILL,
+    MPEGTS_PAYLOAD,
+    MPEGTS_SKIP,
+};
+
+/* enough for PES header + length */
+#define PES_START_SIZE 9
+#define MAX_PES_HEADER_SIZE (9 + 255)
+
+typedef struct PESContext {
+    int pid;
+    AVFormatContext *stream;
+    AVStream *st;
+    enum MpegTSState state;
+    /* used to get the format */
+    int data_index;
+    int total_size;
+    int pes_header_size;
+    int64_t pts, dts;
+    uint8_t header[MAX_PES_HEADER_SIZE];
+} PESContext;
+
+static int64_t get_pts(const uint8_t *p)
+{
+    int64_t pts;
+    int val;
+
+    pts = (int64_t)((p[0] >> 1) & 0x07) << 30;
+    val = (p[1] << 8) | p[2];
+    pts |= (int64_t)(val >> 1) << 15;
+    val = (p[3] << 8) | p[4];
+    pts |= (int64_t)(val >> 1);
+    return pts;
 }
 
 /* return non zero if a packet could be constructed */
-static int mpegts_push_data(AVFormatContext *s, MpegTSStream *tss,
-                            AVPacket *pkt,
-                            const unsigned char *buf, int buf_size, int is_start)
+static void mpegts_push_data(void *opaque,
+                             const uint8_t *buf, int buf_size, int is_start)
 {
+    PESContext *pes = opaque;
+    MpegTSContext *ts = pes->stream->priv_data;
     AVStream *st;
-    const unsigned char *p;
+    const uint8_t *p;
     int len, code, codec_type, codec_id;
-
+    
     if (is_start) {
-        tss->state = MPEGTS_HEADER;
-        tss->header_size = 0;
+        pes->state = MPEGTS_HEADER;
+        pes->data_index = 0;
     }
     p = buf;
     while (buf_size > 0) {
-        len = buf_size;
-        switch(tss->state) {
+        switch(pes->state) {
         case MPEGTS_HEADER:
-            if (len > MAX_HEADER_SIZE - tss->header_size)
-                len = MAX_HEADER_SIZE - tss->header_size;
-            memcpy(tss->header, p, len);
-            tss->header_size += len;
+            len = PES_START_SIZE - pes->data_index;
+            if (len > buf_size)
+                len = buf_size;
+            memcpy(pes->header + pes->data_index, p, len);
+            pes->data_index += len;
             p += len;
             buf_size -= len;
-            if (tss->header_size == MAX_HEADER_SIZE) {
+            if (pes->data_index == PES_START_SIZE) {
                 /* we got all the PES or section header. We can now
                    decide */
 #if 0
-                av_hex_dump(tss->header, tss->header_size);
+                av_hex_dump(pes->header, pes->data_index);
 #endif
-                if (tss->header[0] == 0x00 && tss->header[1] == 0x00 &&
-                    tss->header[2] == 0x01) {
+                if (pes->header[0] == 0x00 && pes->header[1] == 0x00 &&
+                    pes->header[2] == 0x01) {
                     /* it must be an mpeg2 PES stream */
                     /* XXX: add AC3 support */
-                    code = tss->header[3] | 0x100;
+                    code = pes->header[3] | 0x100;
                     if (!((code >= 0x1c0 && code <= 0x1df) ||
                           (code >= 0x1e0 && code <= 0x1ef)))
                         goto skip;
-                    if (!tss->st) {
+                    if (!pes->st) {
                         /* allocate stream */
                         if (code >= 0x1c0 && code <= 0x1df) {
                             codec_type = CODEC_TYPE_AUDIO;
@@ -152,23 +625,26 @@ static int mpegts_push_data(AVFormatContext *s, MpegTSStream *tss,
                             codec_type = CODEC_TYPE_VIDEO;
                             codec_id = CODEC_ID_MPEG1VIDEO;
                         }
-                        st = av_new_stream(s, tss->pid);
+                        st = av_new_stream(pes->stream, pes->pid);
                         if (st) {
-                            st->priv_data = tss;
+                            st->priv_data = pes;
                             st->codec.codec_type = codec_type;
                             st->codec.codec_id = codec_id;
-                            tss->st = st;
+                            pes->st = st;
                         }
                     }
-                    tss->state = MPEGTS_PESHEADER_FILL;
-                    tss->payload_size = (tss->header[4] << 8) | tss->header[5];
-                    if (tss->payload_size == 0)
-                        tss->payload_size = 65536;
+                    pes->state = MPEGTS_PESHEADER_FILL;
+                    pes->total_size = (pes->header[4] << 8) | pes->header[5];
+                    /* NOTE: a zero total size means the PES size is
+                       unbounded */
+                    if (pes->total_size)
+                        pes->total_size += 6;
+                    pes->pes_header_size = pes->header[8] + 9;
                 } else {
                     /* otherwise, it should be a table */
                     /* skip packet */
                 skip:
-                    tss->state = MPEGTS_SKIP;
+                    pes->state = MPEGTS_SKIP;
                     continue;
                 }
             }
@@ -176,49 +652,54 @@ static int mpegts_push_data(AVFormatContext *s, MpegTSStream *tss,
             /**********************************************/
             /* PES packing parsing */
         case MPEGTS_PESHEADER_FILL:
-            /* skip filling */
-            code = *p++;
-            buf_size--;
-            tss->payload_size--;
-            if (code != 0xff) {
-                if ((code & 0xc0) != 0x80)
-                    goto skip;
-                tss->state = MPEGTS_PESHEADER_FLAGS;
-            }
-            break;
-        case MPEGTS_PESHEADER_FLAGS:
-            code = *p++;
-            buf_size--;
-            tss->payload_size--;
-            tss->state = MPEGTS_PESHEADER_SIZE;
-            break;
-        case MPEGTS_PESHEADER_SIZE:
-            tss->pes_header_size = *p++;
-            buf_size--;
-            tss->payload_size--;
-            tss->state = MPEGTS_PESHEADER_READ;
-            break;
-        case MPEGTS_PESHEADER_READ:
-            /* currently we do nothing except skipping */
-            if (len > tss->pes_header_size)
-                len = tss->pes_header_size;
+            len = pes->pes_header_size - pes->data_index;
+            if (len > buf_size)
+                len = buf_size;
+            memcpy(pes->header + pes->data_index, p, len);
+            pes->data_index += len;
             p += len;
             buf_size -= len;
-            tss->pes_header_size -= len;
-            tss->payload_size -= len;
-            if (tss->pes_header_size == 0)
-                tss->state = MPEGTS_PAYLOAD;
+            if (pes->data_index == pes->pes_header_size) {
+                const uint8_t *r;
+                unsigned int flags;
+
+                flags = pes->header[7];
+                r = pes->header + 9;
+                pes->pts = AV_NOPTS_VALUE;
+                pes->dts = AV_NOPTS_VALUE;
+                if ((flags & 0xc0) == 0x80) {
+                    pes->pts = get_pts(r);
+                    r += 5;
+                } else if ((flags & 0xc0) == 0xc0) {
+                    pes->pts = get_pts(r);
+                    r += 5;
+                    pes->dts = get_pts(r);
+                    r += 5;
+                }
+                /* we got the full header. We parse it and get the payload */
+                pes->state = MPEGTS_PAYLOAD;
+            }
             break;
         case MPEGTS_PAYLOAD:
-            if (len > tss->payload_size)
-                len = tss->payload_size;
+            if (pes->total_size) {
+                len = pes->total_size - pes->data_index;
+                if (len > buf_size)
+                    len = buf_size;
+            } else {
+                len = buf_size;
+            }
             if (len > 0) {
-                if (tss->st && av_new_packet(pkt, buf_size) == 0) {
-                    memcpy(pkt->data, p, buf_size);
-                    pkt->stream_index = tss->st->index;
-                    return 1;
+                AVPacket *pkt = ts->pkt;
+                if (pes->st && av_new_packet(pkt, len) == 0) {
+                    memcpy(pkt->data, p, len);
+                    pkt->stream_index = pes->st->index;
+                    pkt->pts = pes->pts;
+                    /* reset pts values */
+                    pes->pts = AV_NOPTS_VALUE;
+                    pes->dts = AV_NOPTS_VALUE;
+                    ts->stop_parse = 1;
+                    return;
                 }
-                tss->payload_size -= len;
             }
             buf_size = 0;
             break;
@@ -227,20 +708,110 @@ static int mpegts_push_data(AVFormatContext *s, MpegTSStream *tss,
             break;
         }
     }
+}
+
+static int add_pes_stream(AVFormatContext *s, int pid)
+{
+    MpegTSContext *ts = s->priv_data;
+    MpegTSFilter *tss;
+    PESContext *pes;
+
+    /* if no pid found, then add a pid context */
+    pes = av_mallocz(sizeof(PESContext));
+    if (!pes)
+        return -1;
+    pes->stream = s;
+    pes->pid = pid;
+    tss = mpegts_open_pes_filter(ts, pid, mpegts_push_data, pes);
+    if (!tss) {
+        av_free(pes);
+        return -1;
+    }
     return 0;
 }
 
-static int mpegts_read_packet(AVFormatContext *s,
-                              AVPacket *pkt)
+/* handle one TS packet */
+static void handle_packet(AVFormatContext *s, uint8_t *packet)
 {
     MpegTSContext *ts = s->priv_data;
-    MpegTSStream *tss;
-    ByteIOContext *pb = &s->pb;
-    unsigned char packet[TS_FEC_PACKET_SIZE];
-    int len, pid, cc, cc_ok, afc;
-    const unsigned char *p;
+    MpegTSFilter *tss;
+    int len, pid, cc, cc_ok, afc, is_start;
+    const uint8_t *p, *p_end;
+
+    pid = ((packet[1] & 0x1f) << 8) | packet[2];
+    is_start = packet[1] & 0x40;
+    tss = ts->pids[pid];
+    if (ts->auto_guess && tss == NULL && is_start) {
+        add_pes_stream(s, pid);
+        tss = ts->pids[pid];
+    }
+    if (!tss)
+        return;
+
+    /* continuity check (currently not used) */
+    cc = (packet[3] & 0xf);
+    cc_ok = (tss->last_cc < 0) || ((((tss->last_cc + 1) & 0x0f) == cc));
+    tss->last_cc = cc;
     
+    /* skip adaptation field */
+    afc = (packet[3] >> 4) & 3;
+    p = packet + 4;
+    if (afc == 0) /* reserved value */
+        return;
+    if (afc == 2) /* adaptation field only */
+        return;
+    if (afc == 3) {
+        /* skip adapation field */
+        p += p[0] + 1;
+    }
+    /* if past the end of packet, ignore */
+    p_end = packet + TS_PACKET_SIZE;
+    if (p >= p_end)
+        return;
+    
+    if (tss->type == MPEGTS_SECTION) {
+        if (is_start) {
+            /* pointer field present */
+            len = *p++;
+            if (p + len > p_end)
+                return;
+            if (len && cc_ok) {
+                /* write remaning section bytes */
+                write_section_data(s, tss, 
+                                   p, len, 0);
+            }
+            p += len;
+            if (p < p_end) {
+                write_section_data(s, tss, 
+                                   p, p_end - p, 1);
+            }
+        } else {
+            if (cc_ok) {
+                write_section_data(s, tss, 
+                                   p, p_end - p, 0);
+                }
+        }
+    } else {
+        tss->u.pes_filter.pes_cb(tss->u.pes_filter.opaque, 
+                                 p, p_end - p, is_start);
+    }
+}
+
+static int handle_packets(AVFormatContext *s, int nb_packets)
+{
+    MpegTSContext *ts = s->priv_data;
+    ByteIOContext *pb = &s->pb;
+    uint8_t packet[TS_FEC_PACKET_SIZE];
+    int packet_num, len;
+
+    ts->stop_parse = 0;
+    packet_num = 0;
     for(;;) {
+        if (ts->stop_parse)
+            break;
+        packet_num++;
+        if (nb_packets != 0 && packet_num >= nb_packets)
+            break;
         len = get_buffer(pb, packet, ts->raw_packet_size);
         if (len != ts->raw_packet_size)
             return AVERROR_IO;
@@ -248,45 +819,93 @@ static int mpegts_read_packet(AVFormatContext *s,
         /* XXX: accept to resync ? */
         if (packet[0] != 0x47)
             return AVERROR_INVALIDDATA;
-        
-        pid = ((packet[1] & 0x1f) << 8) | packet[2];
-        tss = ts->pids[pid];
-        if (tss == NULL) {
-            /* if no pid found, then add a pid context */
-            tss = av_mallocz(sizeof(MpegTSStream));
-            if (!tss) 
-                continue;
-            ts->pids[pid] = tss;
-            tss->pid = pid;
-            tss->last_cc = -1;
-            //            printf("new pid=0x%x\n", pid);
-        }
+        handle_packet(s, packet);
+    }
+    return 0;
+}
 
-        /* continuity check (currently not used) */
-        cc = (packet[3] & 0xf);
-        cc_ok = (tss->last_cc < 0) || ((((tss->last_cc + 1) & 0x0f) == cc));
-        tss->last_cc = cc;
-        
-        /* skip adaptation field */
-        afc = (packet[3] >> 4) & 3;
-        p = packet + 4;
-        if (afc == 0) /* reserved value */
-            continue;
-        if (afc == 2) /* adaptation field only */
-            continue;
-        if (afc == 3) {
-            /* skip adapation field */
-            p += p[0] + 1;
-        }
-        /* if past the end of packet, ignore */
-        if (p >= packet + TS_PACKET_SIZE)
-            continue;
+static int mpegts_probe(AVProbeData *p)
+{
+    int size;
+    size = get_packet_size(p->buf, p->buf_size);
+    if (size < 0)
+        return 0;
+    return AVPROBE_SCORE_MAX - 1;
+}
+
+void set_service_cb(void *opaque, int ret)
+{
+    MpegTSContext *ts = opaque;
+    ts->set_service_ret = ret;
+    ts->stop_parse = 1;
+}
+
+static int mpegts_read_header(AVFormatContext *s,
+                              AVFormatParameters *ap)
+{
+    MpegTSContext *ts = s->priv_data;
+    ByteIOContext *pb = &s->pb;
+    uint8_t buf[1024];
+    int len;
+    int64_t pos;
+    MpegTSService *service;
     
-        if (mpegts_push_data(s, tss, pkt, p, TS_PACKET_SIZE - (p - packet), 
-                             packet[1] & 0x40))
-            break;
+    /* read the first 1024 bytes to get packet size */
+    pos = url_ftell(pb);
+    len = get_buffer(pb, buf, sizeof(buf));
+    if (len != sizeof(buf))
+        goto fail;
+    ts->raw_packet_size = get_packet_size(buf, sizeof(buf));
+    if (ts->raw_packet_size <= 0)
+        goto fail;
+    ts->auto_guess = 0;
+    
+    if (!ts->auto_guess) {
+
+        /* first do a scaning to get all the services */
+        url_fseek(pb, pos, SEEK_SET);
+        mpegts_scan_sdt(ts);
+        
+        handle_packets(s, MAX_SCAN_PACKETS);
+        
+        /* if no service found, no need to do anything */
+        if (ts->nb_services <= 0)
+            return -1;
+        
+        /* now find the info for the first service */
+        
+        url_fseek(pb, pos, SEEK_SET);
+        service = ts->services[0];
+#ifdef DEBUG_SI
+        printf("tuning to '%s'\n", service->name);
+#endif
+        /* tune to first service found */
+        ts->stream = s;
+        mpegts_set_service(ts, service->sid, set_service_cb, ts);
+        
+        handle_packets(s, MAX_SCAN_PACKETS);
+
+        /* if could not find service, exit */
+        if (ts->set_service_ret != 0)
+            return -1;
+
+#ifdef DEBUG_SI
+        printf("tuning done\n");
+#endif
     }
+
+    url_fseek(pb, pos, SEEK_SET);
     return 0;
+ fail:
+    return -1;
+}
+
+static int mpegts_read_packet(AVFormatContext *s,
+                              AVPacket *pkt)
+{
+    MpegTSContext *ts = s->priv_data;
+    ts->pkt = pkt;
+    return handle_packets(s, 0);
 }
 
 static int mpegts_read_close(AVFormatContext *s)
@@ -312,5 +931,6 @@ AVInputFormat mpegts_demux = {
 int mpegts_init(void)
 {
     av_register_input_format(&mpegts_demux);
+    av_register_output_format(&mpegts_mux);
     return 0;
 }