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);
+extern void av_set_program_name(AVProgram *program, char *provider_name, char *name);
+extern void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
enum MpegTSFilterType {
MPEGTS_PES,
} u;
};
-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 */
/******************************************/
/* private mpegts data */
/* scan context */
- /** number of PMTs in the last PAT seen */
- int nb_services;
- /** list of PMTs in the last PAT seen */
- MpegTSService **services;
+ /** 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 */
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.
return 0;
}
-static MpegTSService *new_service(MpegTSContext *ts, int sid,
- char *provider_name, char *name)
-{
- MpegTSService *service=NULL;
- int i;
-
-#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
-
- for(i=0; i<ts->nb_services; i++)
- if(ts->services[i]->sid == sid)
- service= ts->services[i];
-
- if(!service){
- service = av_mallocz(sizeof(MpegTSService));
- if (!service)
- return NULL;
- dynarray_add(&ts->services, &ts->nb_services, service);
- }
- service->sid = sid;
- assert((!provider_name) == (!name));
- if(name){
- av_free(service->provider_name);
- av_free(service-> name);
- service->provider_name = provider_name;
- service-> name = name;
- }
- return service;
-}
static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
if (h->tid != PMT_TID)
return;
+ clear_program(ts, h->id);
pcr_pid = get16(&p, p_end) & 0x1fff;
if (pcr_pid < 0)
return;
+ 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
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 (h->tid != PAT_TID)
return;
+ clear_programs(ts);
for(;;) {
sid = get16(&p, p_end);
if (sid < 0)
if (sid == 0x0000) {
/* NIT info */
} else {
- new_service(ts, sid, NULL, NULL);
+ 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 */
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);
+ }
break;
default:
break;
const uint8_t *p, *p_end;
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) {
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;
}