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);
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;
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;
- /** 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;
/** 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];
+};
+
/**
* 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;
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);
+ tss->section_cb(tss1, tss->section_buf, tss->section_h_size);
}
}
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 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;
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;
pcr_pid = get16(&p, p_end) & 0x1fff;
if (pcr_pid < 0)
return;
- ts->pcr_pid = pcr_pid;
#ifdef DEBUG_SI
av_log(ts->stream, AV_LOG_DEBUG, "pcr_pid=0x%x\n", pcr_pid);
#endif
case STREAM_TYPE_AUDIO_AC3:
case STREAM_TYPE_AUDIO_DTS:
case STREAM_TYPE_SUBTITLE_DVB:
- pes = add_pes_stream(ts, pid, stream_type);
- if (pes)
- st = new_pes_av_stream(pes, 0);
+ if(ts->pids[pid]){
+ assert(ts->pids[pid].type == MPEGTS_PES);
+ pes= ts->pids[pid]->u.pes_filter.opaque;
+ st= pes->st;
+ }else{
+ pes = add_pes_stream(ts, pid, pcr_pid, stream_type);
+ if (pes)
+ st = new_pes_av_stream(pes, 0);
+ }
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->stop_parse=1;
- 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
- 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 {
- if (ts->req_sid == sid) {
- ts->pmt_filter = mpegts_open_section_filter(ts, pmt_pid,
- pmt_cb, ts, 1);
- goto found;
- }
- }
- }
- /* not found */
- ts->stop_parse=1;
-
- found:
- mpegts_close_filter(ts, ts->pat_filter);
- ts->pat_filter = NULL;
+ ts->stop_parse++;
+ 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 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;
/* NIT info */
} else {
new_service(ts, sid, NULL, NULL);
+ ts->stop_parse--;
+ mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
}
}
- ts->stop_parse = 1;
+ /* not found */
+ ts->stop_parse++;
- /* remove filter */
- mpegts_close_filter(ts, ts->pat_filter);
- ts->pat_filter = NULL;
+ mpegts_close_filter(ts, filter);
}
-static void mpegts_set_service(MpegTSContext *ts, int sid)
+static void mpegts_set_service(MpegTSContext *ts)
{
- 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;
}
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;
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 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;
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)
}
}
} 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);
}
}
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)
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;
MpegTSContext *ts = s->priv_data;
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;
url_fseek(pb, pos, SEEK_SET);
mpegts_scan_sdt(ts);
- handle_packets(ts, s->probesize);
+ mpegts_set_service(ts);
- if (ts->nb_services <= 0) {
- /* no SDT found, we try to look at the PAT */
-
- /* 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);
-
- handle_packets(ts, s->probesize);
- }
-
- if (ts->nb_services <= 0) {
- /* raw transport stream */
- ts->auto_guess = 1;
- s->ctx_flags |= AVFMTCTX_NOHEADER;
- goto do_pcr;
- }
-
- /* tune to first service found */
- for(i=0; i<ts->nb_services; i++){
- service = ts->services[i];
- sid = service->sid;
-#ifdef DEBUG_SI
- av_log(ts->stream, AV_LOG_DEBUG, "tuning to '%s'\n", service->name);
-#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);
-
- handle_packets(ts, s->probesize);
- }
+ handle_packets(ts, s->probesize);
/* if could not find service, enable auto_guess */
ts->auto_guess = 1;
/* only read packets */
- do_pcr:
st = av_new_stream(s, 0);
if (!st)
goto fail;
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 */
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;
if (find_next) {
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;
}
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;
}
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;
}
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;
projects / ffmpeg / blobdiff