* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/crc.h"
#include "avformat.h"
-#include "crc.h"
#include "mpegts.h"
-#include "allformats.h"
+#include "internal.h"
//#define DEBUG_SI
//#define DEBUG_SEEK
/* maximum size in which we look for synchronisation if
synchronisation is lost */
#define MAX_RESYNC_SIZE 4096
+#define REGISTRATION_DESCRIPTOR 5
typedef struct PESContext PESContext;
-static PESContext* add_pes_stream(MpegTSContext *ts, int pid, int stream_type);
+static PESContext* add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type);
static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code);
enum MpegTSFilterType {
MPEGTS_SECTION,
};
-typedef void PESCallback(void *opaque, const uint8_t *buf, int len, int is_start);
+typedef struct MpegTSFilter MpegTSFilter;
+
+typedef void PESCallback(MpegTSFilter *f, const uint8_t *buf, int len, int is_start);
typedef struct MpegTSPESFilter {
PESCallback *pes_cb;
void *opaque;
} MpegTSPESFilter;
-typedef void SectionCallback(void *opaque, const uint8_t *buf, int len);
+typedef void SectionCallback(MpegTSFilter *f, const uint8_t *buf, int len);
typedef void SetServiceCallback(void *opaque, int ret);
int section_index;
int section_h_size;
uint8_t *section_buf;
- int check_crc:1;
- int end_of_section_reached:1;
+ unsigned int check_crc:1;
+ unsigned int end_of_section_reached:1;
SectionCallback *section_cb;
void *opaque;
} MpegTSSectionFilter;
-typedef struct MpegTSFilter {
+struct MpegTSFilter {
int pid;
int last_cc; /* last cc code (-1 if first packet) */
enum MpegTSFilterType type;
MpegTSPESFilter pes_filter;
MpegTSSectionFilter section_filter;
} u;
-} MpegTSFilter;
+};
-typedef struct MpegTSService {
- int running:1;
- int sid; /**< MPEG Program Number of stream */
- char *provider_name; /**< DVB Network name, "" if not DVB stream */
- char *name; /**< DVB Service name, "MPEG Program [sid]" if not DVB stream*/
-} MpegTSService;
+#define MAX_PIDS_PER_PROGRAM 64
+typedef struct {
+ unsigned int id; //program id/service id
+ unsigned int nb_pids;
+ unsigned int pids[MAX_PIDS_PER_PROGRAM];
+} Program_t;
struct MpegTSContext {
/* user data */
AVFormatContext *stream;
/** raw packet size, including FEC if present */
int raw_packet_size;
+
+ int pos47;
+
/** if true, all pids are analyzed to find streams */
int auto_guess;
- int set_service_ret;
/** compute exact PCR for each transport stream packet */
int mpeg2ts_compute_pcr;
int64_t cur_pcr; /**< used to estimate the exact PCR */
int pcr_incr; /**< used to estimate the exact PCR */
- int pcr_pid; /**< used to estimate the exact PCR */
/* data needed to handle file based ts */
/** stop parsing loop */
/******************************************/
/* private mpegts data */
/* scan context */
- MpegTSFilter *sdt_filter;
- /** number of PMTs in the last PAT seen */
- int nb_services;
- /** list of PMTs in the last PAT seen */
- MpegTSService **services;
-
- /* set service context (XXX: allocated it ?) */
- SetServiceCallback *set_service_cb;
- void *set_service_opaque;
- /** filter for the PAT */
- MpegTSFilter *pat_filter;
- /** filter for the PMT for the MPEG program number specified by req_sid */
- MpegTSFilter *pmt_filter;
- /** MPEG program number of stream we want to decode */
- int req_sid;
+ /** structure to keep track of Program->pids mapping */
+ unsigned int nb_prg;
+ Program_t *prg;
+
/** filters for various streams specified by PMT + for the PAT and PMT */
MpegTSFilter *pids[NB_PID_MAX];
};
+/* 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)
+
+struct PESContext {
+ int pid;
+ int pcr_pid; /**< if -1 then all packets containing PCR are considered */
+ int stream_type;
+ MpegTSContext *ts;
+ 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];
+};
+
+extern AVInputFormat mpegts_demuxer;
+
+static void clear_program(MpegTSContext *ts, unsigned int programid)
+{
+ int i;
+
+ for(i=0; i<ts->nb_prg; i++)
+ if(ts->prg[i].id == programid)
+ ts->prg[i].nb_pids = 0;
+}
+
+static void clear_programs(MpegTSContext *ts)
+{
+ av_freep(&ts->prg);
+ ts->nb_prg=0;
+}
+
+static void add_pat_entry(MpegTSContext *ts, unsigned int programid)
+{
+ Program_t *p;
+ void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(Program_t));
+ if(!tmp)
+ return;
+ ts->prg = tmp;
+ p = &ts->prg[ts->nb_prg];
+ p->id = programid;
+ p->nb_pids = 0;
+ ts->nb_prg++;
+}
+
+static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid)
+{
+ int i;
+ Program_t *p = NULL;
+ for(i=0; i<ts->nb_prg; i++) {
+ if(ts->prg[i].id == programid) {
+ p = &ts->prg[i];
+ break;
+ }
+ }
+ if(!p)
+ return;
+
+ if(p->nb_pids >= MAX_PIDS_PER_PROGRAM)
+ return;
+ p->pids[p->nb_pids++] = pid;
+}
+
+/**
+ * \brief discard_pid() decides if the pid is to be discarded according
+ * to caller's programs selection
+ * \param ts : - TS context
+ * \param pid : - pid
+ * \return 1 if the pid is only comprised in programs that have .discard=AVDISCARD_ALL
+ * 0 otherwise
+ */
+static int discard_pid(MpegTSContext *ts, unsigned int pid)
+{
+ int i, j, k;
+ int used = 0, discarded = 0;
+ Program_t *p;
+ for(i=0; i<ts->nb_prg; i++) {
+ p = &ts->prg[i];
+ for(j=0; j<p->nb_pids; j++) {
+ if(p->pids[j] != pid)
+ continue;
+ //is program with id p->id set to be discarded?
+ for(k=0; k<ts->stream->nb_programs; k++) {
+ if(ts->stream->programs[k]->id == p->id) {
+ if(ts->stream->programs[k]->discard == AVDISCARD_ALL)
+ discarded++;
+ else
+ used++;
+ }
+ }
+ }
+ }
+
+ return !used && discarded;
+}
+
/**
* Assembles PES packets out of TS packets, and then calls the "section_cb"
* function when they are complete.
/* 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;
+ len = (AV_RB16(tss->section_buf + 1) & 0xfff) + 3;
if (len > 4096)
return;
tss->section_h_size = len;
if (tss->section_h_size != -1 && tss->section_index >= tss->section_h_size) {
tss->end_of_section_reached = 1;
if (!tss->check_crc ||
- av_crc(av_crc04C11DB7, -1, tss->section_buf, tss->section_h_size) == 0)
- tss->section_cb(tss->opaque, tss->section_buf, tss->section_h_size);
+ av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1,
+ tss->section_buf, tss->section_h_size) == 0)
+ tss->section_cb(tss1, tss->section_buf, tss->section_h_size);
}
}
pid = filter->pid;
if (filter->type == MPEGTS_SECTION)
av_freep(&filter->u.section_filter.section_buf);
- else if (filter->type == MPEGTS_PES)
- av_freep(&filter->u.pes_filter.opaque);
av_free(filter);
ts->pids[pid] = NULL;
memset(stat, 0, packet_size*sizeof(int));
- for(x=i=0; i<size; i++){
- if(buf[i] == 0x47){
+ for(x=i=0; i<size-3; i++){
+ if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && (buf[i+3] & 0x30)){
stat[x]++;
if(stat[x] > best_score){
best_score= stat[x];
p = *pp;
if ((p + 1) >= p_end)
return -1;
- c = (p[0] << 8) | p[1];
+ c = AV_RB16(p);
p += 2;
*pp = p;
return c;
return 0;
}
-static MpegTSService *new_service(MpegTSContext *ts, int sid,
- char *provider_name, char *name)
-{
- MpegTSService *service;
-
-#ifdef DEBUG_SI
- av_log(ts->stream, AV_LOG_DEBUG, "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)
+static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
- MpegTSContext *ts = opaque;
+ MpegTSContext *ts = filter->u.section_filter.opaque;
SectionHeader h1, *h = &h1;
PESContext *pes;
AVStream *st;
int desc_list_len, desc_len, desc_tag;
int comp_page = 0, anc_page = 0; /* initialize to kill warnings */
char language[4] = {0}; /* initialize to kill warnings */
+ int has_hdmv_descr = 0;
+ int has_dirac_descr = 0;
#ifdef DEBUG_SI
av_log(ts->stream, AV_LOG_DEBUG, "PMT: len %i\n", section_len);
av_log(ts->stream, AV_LOG_DEBUG, "sid=0x%x sec_num=%d/%d\n",
h->id, h->sec_num, h->last_sec_num);
#endif
- if (h->tid != PMT_TID || (ts->req_sid >= 0 && h->id != ts->req_sid) )
+ if (h->tid != PMT_TID)
return;
+ clear_program(ts, h->id);
pcr_pid = get16(&p, p_end) & 0x1fff;
if (pcr_pid < 0)
return;
- ts->pcr_pid = pcr_pid;
+ add_pid_to_pmt(ts, h->id, pcr_pid);
#ifdef DEBUG_SI
av_log(ts->stream, AV_LOG_DEBUG, "pcr_pid=0x%x\n", pcr_pid);
#endif
program_info_length = get16(&p, p_end) & 0xfff;
if (program_info_length < 0)
return;
+ while(program_info_length >= 2) {
+ uint8_t tag, len;
+ tag = get8(&p, p_end);
+ len = get8(&p, p_end);
+ if(len > program_info_length - 2)
+ //something else is broken, exit the program_descriptors_loop
+ break;
+ program_info_length -= len + 2;
+ if(tag == REGISTRATION_DESCRIPTOR && len >= 4) {
+ uint8_t bytes[4];
+ bytes[0] = get8(&p, p_end);
+ bytes[1] = get8(&p, p_end);
+ bytes[2] = get8(&p, p_end);
+ bytes[3] = get8(&p, p_end);
+ len -= 4;
+ if(bytes[0] == 'H' && bytes[1] == 'D' &&
+ bytes[2] == 'M' && bytes[3] == 'V')
+ has_hdmv_descr = 1;
+ }
+ p += len;
+ }
p += program_info_length;
if (p >= p_end)
return;
language[2] = get8(&p, desc_end);
language[3] = 0;
break;
+ case REGISTRATION_DESCRIPTOR: /*MPEG-2 Registration descriptor */
+ {
+ uint8_t bytes[4];
+ bytes[0] = get8(&p, desc_end);
+ bytes[1] = get8(&p, desc_end);
+ bytes[2] = get8(&p, desc_end);
+ bytes[3] = get8(&p, desc_end);
+ if(bytes[0] == 'd' && bytes[1] == 'r' &&
+ bytes[2] == 'a' && bytes[3] == 'c')
+ has_dirac_descr = 1;
+ break;
+ }
default:
break;
}
case STREAM_TYPE_VIDEO_MPEG4:
case STREAM_TYPE_VIDEO_H264:
case STREAM_TYPE_VIDEO_VC1:
+ case STREAM_TYPE_VIDEO_DIRAC:
case STREAM_TYPE_AUDIO_AAC:
case STREAM_TYPE_AUDIO_AC3:
case STREAM_TYPE_AUDIO_DTS:
+ case STREAM_TYPE_AUDIO_HDMV_DTS:
case STREAM_TYPE_SUBTITLE_DVB:
- pes = add_pes_stream(ts, pid, stream_type);
- if (pes)
- st = new_pes_av_stream(pes, 0);
+ if((stream_type == STREAM_TYPE_AUDIO_HDMV_DTS && !has_hdmv_descr)
+ || (stream_type == STREAM_TYPE_VIDEO_DIRAC && !has_dirac_descr))
+ break;
+ if(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES){
+ pes= ts->pids[pid]->u.pes_filter.opaque;
+ st= pes->st;
+ }else{
+ if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably
+ pes = add_pes_stream(ts, pid, pcr_pid, stream_type);
+ if (pes)
+ st = new_pes_av_stream(pes, 0);
+ }
+ add_pid_to_pmt(ts, h->id, pid);
+ if(st)
+ av_program_add_stream_index(ts->stream, h->id, st->index);
break;
default:
/* we ignore the other streams */
if (st) {
if (language[0] != 0) {
- st->language[0] = language[0];
- st->language[1] = language[1];
- st->language[2] = language[2];
- st->language[3] = language[3];
+ memcpy(st->language, language, 4);
}
if (stream_type == STREAM_TYPE_SUBTITLE_DVB) {
}
}
/* all parameters are there */
- ts->set_service_cb(ts->set_service_opaque, 0);
- mpegts_close_filter(ts, ts->pmt_filter);
- ts->pmt_filter = NULL;
+ ts->stop_parse++;
+ mpegts_close_filter(ts, filter);
}
-static void pat_cb(void *opaque, const uint8_t *section, int section_len)
+static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
- MpegTSContext *ts = opaque;
+ MpegTSContext *ts = filter->u.section_filter.opaque;
SectionHeader h1, *h = &h1;
const uint8_t *p, *p_end;
int sid, pmt_pid;
if (h->tid != PAT_TID)
return;
+ clear_programs(ts);
for(;;) {
sid = get16(&p, p_end);
if (sid < 0)
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;
- }
+ av_new_program(ts->stream, sid);
+ ts->stop_parse--;
+ mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
+ add_pat_entry(ts, sid);
+ add_pid_to_pmt(ts, sid, 0); //add pat pid to program
+ add_pid_to_pmt(ts, sid, pmt_pid);
}
}
/* not found */
- ts->set_service_cb(ts->set_service_opaque, -1);
+ ts->stop_parse++;
- found:
- mpegts_close_filter(ts, ts->pat_filter);
- ts->pat_filter = NULL;
+ mpegts_close_filter(ts, filter);
}
-/* add all services found in the PAT */
-static void pat_scan_cb(void *opaque, const uint8_t *section, int section_len)
+static void mpegts_set_service(MpegTSContext *ts)
{
- MpegTSContext *ts = opaque;
- SectionHeader h1, *h = &h1;
- const uint8_t *p, *p_end;
- int sid, pmt_pid;
- char *provider_name, *name;
- char buf[256];
-
-#ifdef DEBUG_SI
- av_log(ts->stream, AV_LOG_DEBUG, "PAT:\n");
- av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (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
- av_log(ts->stream, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
-#endif
- if (sid == 0x0000) {
- /* NIT info */
- } else {
- /* add the service with a dummy name */
- snprintf(buf, sizeof(buf), "Service %x\n", sid);
- name = av_strdup(buf);
- provider_name = av_strdup("");
- if (name && provider_name) {
- new_service(ts, sid, provider_name, name);
- } else {
- av_freep(&name);
- av_freep(&provider_name);
- }
- }
- }
- ts->stop_parse = 1;
-
- /* remove filter */
- mpegts_close_filter(ts, ts->pat_filter);
- ts->pat_filter = NULL;
-}
-
-static 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,
+ mpegts_open_section_filter(ts, PAT_PID,
pat_cb, ts, 1);
}
-static void sdt_cb(void *opaque, const uint8_t *section, int section_len)
+static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
- MpegTSContext *ts = opaque;
+ MpegTSContext *ts = filter->u.section_filter.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;
if (!provider_name)
break;
name = getstr8(&p, p_end);
- if (!name)
- break;
- new_service(ts, sid, provider_name, name);
+ if (name) {
+ AVProgram *program = av_new_program(ts->stream, sid);
+ if(program)
+ av_set_program_name(program, provider_name, name);
+ }
+ av_free(name);
+ av_free(provider_name);
break;
default:
break;
}
p = desc_list_end;
}
- ts->stop_parse = 1;
-
- /* remove filter */
- mpegts_close_filter(ts, ts->sdt_filter);
- ts->sdt_filter = NULL;
}
/* scan services in a transport stream by looking at the SDT */
static void mpegts_scan_sdt(MpegTSContext *ts)
{
- ts->sdt_filter = mpegts_open_section_filter(ts, SDT_PID,
+ mpegts_open_section_filter(ts, SDT_PID,
sdt_cb, ts, 1);
}
-/* scan services in a transport stream by looking at the PAT (better
- than nothing !) */
-static void mpegts_scan_pat(MpegTSContext *ts)
-{
- ts->pat_filter = mpegts_open_section_filter(ts, PAT_PID,
- pat_scan_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)
-
-struct PESContext {
- int pid;
- int stream_type;
- MpegTSContext *ts;
- 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];
-};
-
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);
+ int64_t pts = (int64_t)((p[0] >> 1) & 0x07) << 30;
+ pts |= (AV_RB16(p + 1) >> 1) << 15;
+ pts |= AV_RB16(p + 3) >> 1;
return pts;
}
/* return non zero if a packet could be constructed */
-static void mpegts_push_data(void *opaque,
+static void mpegts_push_data(MpegTSFilter *filter,
const uint8_t *buf, int buf_size, int is_start)
{
- PESContext *pes = opaque;
+ PESContext *pes = filter->u.pes_filter.opaque;
MpegTSContext *ts = pes->ts;
const uint8_t *p;
int len, code;
+ if(!ts->pkt)
+ return;
+
if (is_start) {
pes->state = MPEGTS_HEADER;
pes->data_index = 0;
new_pes_av_stream(pes, code);
}
pes->state = MPEGTS_PESHEADER_FILL;
- pes->total_size = (pes->header[4] << 8) | pes->header[5];
+ pes->total_size = AV_RB16(pes->header + 4);
/* NOTE: a zero total size means the PES size is
unbounded */
if (pes->total_size)
static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code)
{
AVStream *st;
- int codec_type, codec_id;
+ enum CodecID codec_id;
+ enum CodecType codec_type;
switch(pes->stream_type){
case STREAM_TYPE_AUDIO_MPEG1:
codec_type = CODEC_TYPE_VIDEO;
codec_id = CODEC_ID_VC1;
break;
+ case STREAM_TYPE_VIDEO_DIRAC:
+ codec_type = CODEC_TYPE_VIDEO;
+ codec_id = CODEC_ID_DIRAC;
+ break;
case STREAM_TYPE_AUDIO_AAC:
codec_type = CODEC_TYPE_AUDIO;
codec_id = CODEC_ID_AAC;
codec_id = CODEC_ID_AC3;
break;
case STREAM_TYPE_AUDIO_DTS:
+ case STREAM_TYPE_AUDIO_HDMV_DTS:
codec_type = CODEC_TYPE_AUDIO;
codec_id = CODEC_ID_DTS;
break;
codec_id = CODEC_ID_AC3;
} else {
codec_type = CODEC_TYPE_VIDEO;
- codec_id = CODEC_ID_MPEG1VIDEO;
+ codec_id = CODEC_ID_PROBE;
}
break;
}
}
-static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int stream_type)
+static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type)
{
MpegTSFilter *tss;
PESContext *pes;
pes->ts = ts;
pes->stream = ts->stream;
pes->pid = pid;
+ pes->pcr_pid = pcr_pid;
pes->stream_type = stream_type;
tss = mpegts_open_pes_filter(ts, pid, mpegts_push_data, pes);
if (!tss) {
int len, pid, cc, cc_ok, afc, is_start;
const uint8_t *p, *p_end;
- pid = ((packet[1] & 0x1f) << 8) | packet[2];
+ pid = AV_RB16(packet + 1) & 0x1fff;
+ if(pid && discard_pid(ts, pid))
+ return;
is_start = packet[1] & 0x40;
tss = ts->pids[pid];
if (ts->auto_guess && tss == NULL && is_start) {
- add_pes_stream(ts, pid, 0);
+ add_pes_stream(ts, pid, -1, 0);
tss = ts->pids[pid];
}
if (!tss)
if (p >= p_end)
return;
+ ts->pos47= url_ftell(ts->stream->pb) % ts->raw_packet_size;
+
if (tss->type == MPEGTS_SECTION) {
if (is_start) {
/* pointer field present */
}
}
} else {
- tss->u.pes_filter.pes_cb(tss->u.pes_filter.opaque,
+ tss->u.pes_filter.pes_cb(tss,
p, p_end - p, is_start);
}
}
for(;;) {
len = get_buffer(pb, buf, TS_PACKET_SIZE);
if (len != TS_PACKET_SIZE)
- return AVERROR_IO;
+ return AVERROR(EIO);
/* check paquet sync byte */
if (buf[0] != 0x47) {
/* find a new packet start */
static int handle_packets(MpegTSContext *ts, int nb_packets)
{
AVFormatContext *s = ts->stream;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
uint8_t packet[TS_PACKET_SIZE];
int packet_num, ret;
ts->stop_parse = 0;
packet_num = 0;
for(;;) {
- if (ts->stop_parse)
+ if (ts->stop_parse>0)
break;
packet_num++;
if (nb_packets != 0 && packet_num >= nb_packets)
#endif
}
-static void set_service_cb(void *opaque, int ret)
-{
- MpegTSContext *ts = opaque;
- ts->set_service_ret = ret;
- ts->stop_parse = 1;
-}
-
-/* return the 90 kHz PCR and the extension for the 27 MHz PCR. return
+/* return the 90kHz PCR and the extension for the 27MHz PCR. return
(-1) if not available */
static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
const uint8_t *packet)
return -1;
if (len < 6)
return -1;
- v = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
+ v = AV_RB32(p);
*ppcr_high = ((int64_t)v << 1) | (p[4] >> 7);
*ppcr_low = ((p[4] & 1) << 8) | p[5];
return 0;
AVFormatParameters *ap)
{
MpegTSContext *ts = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
uint8_t buf[1024];
- int len, sid, i;
+ int len;
int64_t pos;
- MpegTSService *service;
if (ap) {
ts->mpeg2ts_compute_pcr = ap->mpeg2ts_compute_pcr;
if (s->iformat == &mpegts_demuxer) {
/* normal demux */
- if (!ts->auto_guess) {
- ts->set_service_ret = -1;
-
- /* first do a scaning to get all the services */
- url_fseek(pb, pos, SEEK_SET);
- mpegts_scan_sdt(ts);
-
- handle_packets(ts, s->probesize);
-
- if (ts->nb_services <= 0) {
- /* no SDT found, we try to look at the PAT */
+ /* first do a scaning to get all the services */
+ url_fseek(pb, pos, SEEK_SET);
+ mpegts_scan_sdt(ts);
- /* First remove the SDT filters from each PID */
- int i;
- for (i=0; i < NB_PID_MAX; i++) {
- if (ts->pids[i])
- mpegts_close_filter(ts, ts->pids[i]);
- }
- url_fseek(pb, pos, SEEK_SET);
- mpegts_scan_pat(ts);
+ mpegts_set_service(ts);
- handle_packets(ts, s->probesize);
- }
+ handle_packets(ts, s->probesize);
+ /* if could not find service, enable auto_guess */
- if (ts->nb_services <= 0) {
- /* raw transport stream */
- ts->auto_guess = 1;
- s->ctx_flags |= AVFMTCTX_NOHEADER;
- goto do_pcr;
- }
+ ts->auto_guess = 1;
- /* tune to first service found */
- for(i=0; i<ts->nb_services && ts->set_service_ret; i++){
- service = ts->services[i];
- sid = service->sid;
#ifdef DEBUG_SI
- av_log(ts->stream, AV_LOG_DEBUG, "tuning to '%s'\n", service->name);
+ av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");
#endif
-
- /* now find the info for the first service if we found any,
- otherwise try to filter all PATs */
-
- url_fseek(pb, pos, SEEK_SET);
- mpegts_set_service(ts, sid, set_service_cb, ts);
-
- handle_packets(ts, s->probesize);
- }
- /* if could not find service, enable auto_guess */
-
- if (ts->set_service_ret != 0)
- ts->auto_guess = 1;
-
-#ifdef DEBUG_SI
- av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");
-#endif
- }
s->ctx_flags |= AVFMTCTX_NOHEADER;
} else {
AVStream *st;
/* only read packets */
- do_pcr:
st = av_new_stream(s, 0);
if (!st)
goto fail;
nb_pcrs = 0;
nb_packets = 0;
for(;;) {
- ret = read_packet(&s->pb, packet, ts->raw_packet_size);
+ ret = read_packet(s->pb, packet, ts->raw_packet_size);
if (ret < 0)
return -1;
- pid = ((packet[1] & 0x1f) << 8) | packet[2];
+ pid = AV_RB16(packet + 1) & 0x1fff;
if ((pcr_pid == -1 || pcr_pid == pid) &&
parse_pcr(&pcr_h, &pcr_l, packet) == 0) {
pcr_pid = pid;
}
nb_packets++;
}
- ts->pcr_pid = pcr_pid;
/* NOTE1: the bitrate is computed without the FEC */
/* NOTE2: it is only the bitrate of the start of the stream */
if (av_new_packet(pkt, TS_PACKET_SIZE) < 0)
return AVERROR(ENOMEM);
- pkt->pos= url_ftell(&s->pb);
- ret = read_packet(&s->pb, pkt->data, ts->raw_packet_size);
+ pkt->pos= url_ftell(s->pb);
+ ret = read_packet(s->pb, pkt->data, ts->raw_packet_size);
if (ret < 0) {
av_free_packet(pkt);
return ret;
/* compute exact PCR for each packet */
if (parse_pcr(&pcr_h, &pcr_l, pkt->data) == 0) {
/* we read the next PCR (XXX: optimize it by using a bigger buffer */
- pos = url_ftell(&s->pb);
+ pos = url_ftell(s->pb);
for(i = 0; i < MAX_PACKET_READAHEAD; i++) {
- url_fseek(&s->pb, pos + i * ts->raw_packet_size, SEEK_SET);
- get_buffer(&s->pb, pcr_buf, 12);
+ url_fseek(s->pb, pos + i * ts->raw_packet_size, SEEK_SET);
+ get_buffer(s->pb, pcr_buf, 12);
if (parse_pcr(&next_pcr_h, &next_pcr_l, pcr_buf) == 0) {
/* XXX: not precise enough */
ts->pcr_incr = ((next_pcr_h - pcr_h) * 300 + (next_pcr_l - pcr_l)) /
break;
}
}
- url_fseek(&s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, pos, SEEK_SET);
/* no next PCR found: we use previous increment */
ts->cur_pcr = pcr_h * 300 + pcr_l;
}
{
MpegTSContext *ts = s->priv_data;
int i;
+
+ clear_programs(ts);
+
for(i=0;i<NB_PID_MAX;i++)
if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);
- for(i = 0; i < ts->nb_services; i++){
- av_free(ts->services[i]->provider_name);
- av_free(ts->services[i]->name);
- av_free(ts->services[i]);
- }
- av_freep(&ts->services);
-
return 0;
}
MpegTSContext *ts = s->priv_data;
int64_t pos, timestamp;
uint8_t buf[TS_PACKET_SIZE];
- int pcr_l, pid;
+ int pcr_l, pcr_pid = ((PESContext*)s->streams[stream_index]->priv_data)->pcr_pid;
const int find_next= 1;
- pos = ((*ppos + ts->raw_packet_size - 1) / ts->raw_packet_size) * ts->raw_packet_size;
+ pos = ((*ppos + ts->raw_packet_size - 1 - ts->pos47) / ts->raw_packet_size) * ts->raw_packet_size + ts->pos47;
if (find_next) {
for(;;) {
- url_fseek(&s->pb, pos, SEEK_SET);
- if (get_buffer(&s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
+ url_fseek(s->pb, pos, SEEK_SET);
+ if (get_buffer(s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
return AV_NOPTS_VALUE;
- pid = ((buf[1] & 0x1f) << 8) | buf[2];
- if (pid == ts->pcr_pid &&
+ if ((pcr_pid < 0 || (AV_RB16(buf + 1) & 0x1fff) == pcr_pid) &&
parse_pcr(×tamp, &pcr_l, buf) == 0) {
break;
}
pos -= ts->raw_packet_size;
if (pos < 0)
return AV_NOPTS_VALUE;
- url_fseek(&s->pb, pos, SEEK_SET);
- if (get_buffer(&s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
+ url_fseek(s->pb, pos, SEEK_SET);
+ if (get_buffer(s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
return AV_NOPTS_VALUE;
- pid = ((buf[1] & 0x1f) << 8) | buf[2];
- if (pid == ts->pcr_pid &&
+ if ((pcr_pid < 0 || (AV_RB16(buf + 1) & 0x1fff) == pcr_pid) &&
parse_pcr(×tamp, &pcr_l, buf) == 0) {
break;
}
if(av_seek_frame_binary(s, stream_index, target_ts, flags) < 0)
return -1;
- pos= url_ftell(&s->pb);
+ pos= url_ftell(s->pb);
for(;;) {
- url_fseek(&s->pb, pos, SEEK_SET);
- if (get_buffer(&s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
+ url_fseek(s->pb, pos, SEEK_SET);
+ if (get_buffer(s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
return -1;
-// pid = ((buf[1] & 0x1f) << 8) | buf[2];
+// pid = AV_RB16(buf + 1) & 0x1fff;
if(buf[1] & 0x40) break;
pos += ts->raw_packet_size;
}
- url_fseek(&s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, pos, SEEK_SET);
return 0;
}
ts->pkt = pkt;
ts->stop_parse = 0;
for(;;) {
- if (ts->stop_parse)
+ if (ts->stop_parse>0)
break;
if (len < TS_PACKET_SIZE)
return -1;
AVInputFormat mpegts_demuxer = {
"mpegts",
- "MPEG2 transport stream format",
+ NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
sizeof(MpegTSContext),
mpegts_probe,
mpegts_read_header,
mpegts_read_close,
read_seek,
mpegts_get_pcr,
- .flags = AVFMT_SHOW_IDS,
+ .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
};
AVInputFormat mpegtsraw_demuxer = {
"mpegtsraw",
- "MPEG2 raw transport stream format",
+ NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),
sizeof(MpegTSContext),
- mpegts_probe,
+ NULL,
mpegts_read_header,
mpegts_raw_read_packet,
mpegts_read_close,
read_seek,
mpegts_get_pcr,
- .flags = AVFMT_SHOW_IDS,
+ .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
};
projects / ffmpeg / blobdiff