libavformat.hg: mpegts.c comparison

comparison mpegts.c @ 4978:deaa9053dc97 libavformat

rework stream type and codec identification

author	bcoudurier
date	Sun, 31 May 2009 02:56:15 +0000
parents	586df9be38ad
children	c6796179d3fa

comparison

equal deleted inserted replaced

-:586df9be38ad
+:deaa9053dc97
 #define MAX_PES_PAYLOAD 200*1024
 typedef struct PESContext PESContext;
 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);
+static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code, uint32_t prog_reg_desc, uint32_t reg_desc);
 enum MpegTSFilterType {
 MPEGTS_PES,
 MPEGTS_SECTION,
 };
 const uint8_t *p, *p_end, *desc_list_end, *desc_end;
 int program_info_length, pcr_pid, pid, stream_type;
 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;
+uint32_t prog_reg_desc = 0; /* registration descriptor */
-int has_dirac_descr = 0;
 uint32_t reg_desc = 0; /* registration descriptor */
 #ifdef DEBUG
 dprintf(ts->stream, "PMT: len %i\n", section_len);
 av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (uint8_t *)section, section_len);
 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) {
-reg_desc = bytestream_get_le32(&p);
+prog_reg_desc = bytestream_get_le32(&p);
 len -= 4;
-if(reg_desc == AV_RL32("HDMV"))
-has_hdmv_descr = 1;
 }
 p += len;
 }
 p += program_info_length;
 if (p >= p_end)
 return;
 for(;;) {
+reg_desc = 0;
 language[0] = 0;
 st = 0;
 stream_type = get8(&p, p_end);
 if (stream_type < 0)
 break;
 desc_tag, desc_len);
 switch(desc_tag) {
 case DVB_SUBT_DESCID:
 if (stream_type == STREAM_TYPE_PRIVATE_DATA)
-stream_type = STREAM_TYPE_SUBTITLE_DVB;
+stream_type = STREAM_TYPE_SUBTITLE_DVB; // demuxer internal
 language[0] = get8(&p, desc_end);
 language[1] = get8(&p, desc_end);
 language[2] = get8(&p, desc_end);
 language[3] = 0;
 language[2] = get8(&p, desc_end);
 language[3] = 0;
 break;
 case REGISTRATION_DESCRIPTOR: /*MPEG-2 Registration descriptor */
 reg_desc = bytestream_get_le32(&p);
-if(reg_desc == AV_RL32("drac"))
-has_dirac_descr = 1;
-else if(reg_desc == AV_RL32("AC-3"))
-stream_type = STREAM_TYPE_AUDIO_AC3;
 break;
 default:
 break;
 }
 p = desc_end;
 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);
+st = new_pes_av_stream(pes, 0, prog_reg_desc, reg_desc);
 }
 add_pid_to_pmt(ts, h->id, pid);
 if(st) {
 }
 return 0;
 }
-static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code)
+typedef struct {
-{
+uint32_t stream_type;
-AVStream *st;
+enum CodecType codec_type;
 enum CodecID codec_id;
-enum CodecType codec_type;
+} StreamType;
-switch(pes->stream_type){
+static const StreamType ISO_types[] = {
-case STREAM_TYPE_AUDIO_MPEG1:
+{ 0x01, CODEC_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO },
-case STREAM_TYPE_AUDIO_MPEG2:
+{ 0x02, CODEC_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO },
-codec_type = CODEC_TYPE_AUDIO;
+{ 0x03, CODEC_TYPE_AUDIO,        CODEC_ID_MP3 },
-codec_id = CODEC_ID_MP3;
+{ 0x04, CODEC_TYPE_AUDIO,        CODEC_ID_MP3 },
-break;
+{ 0x0f, CODEC_TYPE_AUDIO,        CODEC_ID_AAC },
-case STREAM_TYPE_VIDEO_MPEG1:
+{ 0x10, CODEC_TYPE_VIDEO,      CODEC_ID_MPEG4 },
-case STREAM_TYPE_VIDEO_MPEG2:
+{ 0x1b, CODEC_TYPE_VIDEO,       CODEC_ID_H264 },
-codec_type = CODEC_TYPE_VIDEO;
+{ 0xd1, CODEC_TYPE_VIDEO,      CODEC_ID_DIRAC },
-codec_id = CODEC_ID_MPEG2VIDEO;
+{ 0xea, CODEC_TYPE_VIDEO,        CODEC_ID_VC1 },
-break;
+{ 0 },
-case STREAM_TYPE_VIDEO_MPEG4:
+};
-codec_type = CODEC_TYPE_VIDEO;
-codec_id = CODEC_ID_MPEG4;
+static const StreamType HDMV_types[] = {
-break;
+{ 0x81, CODEC_TYPE_AUDIO, CODEC_ID_AC3 },
-case STREAM_TYPE_VIDEO_H264:
+{ 0x82, CODEC_TYPE_AUDIO, CODEC_ID_DTS },
-codec_type = CODEC_TYPE_VIDEO;
+{ 0 },
-codec_id = CODEC_ID_H264;
+};
-break;
-case STREAM_TYPE_VIDEO_VC1:
+/* ATSC ? */
-codec_type = CODEC_TYPE_VIDEO;
+static const StreamType MISC_types[] = {
-codec_id = CODEC_ID_VC1;
+{ 0x81, CODEC_TYPE_AUDIO,   CODEC_ID_AC3 },
-break;
+{ 0x8a, CODEC_TYPE_AUDIO,   CODEC_ID_DTS },
-case STREAM_TYPE_VIDEO_DIRAC:
+{ STREAM_TYPE_SUBTITLE_DVB, CODEC_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE }, // demuxer internal
-codec_type = CODEC_TYPE_VIDEO;
+{ 0 },
-codec_id = CODEC_ID_DIRAC;
+};
-break;
-case STREAM_TYPE_AUDIO_AAC:
+static const StreamType REGD_types[] = {
-codec_type = CODEC_TYPE_AUDIO;
+{ MKTAG('d','r','a','c'), CODEC_TYPE_VIDEO, CODEC_ID_DIRAC },
-codec_id = CODEC_ID_AAC;
+{ MKTAG('A','C','-','3'), CODEC_TYPE_AUDIO,   CODEC_ID_AC3 },
-break;
+{ 0 },
-case STREAM_TYPE_AUDIO_AC3:
+};
-codec_type = CODEC_TYPE_AUDIO;
-codec_id = CODEC_ID_AC3;
+static void mpegts_find_stream_type(AVStream *st,
-break;
+uint32_t stream_type, const StreamType *types)
-case STREAM_TYPE_AUDIO_DTS:
+{
-case STREAM_TYPE_AUDIO_HDMV_DTS:
+for (; types->stream_type; types++) {
-codec_type = CODEC_TYPE_AUDIO;
+if (stream_type == types->stream_type) {
-codec_id = CODEC_ID_DTS;
+st->codec->codec_type = types->codec_type;
-break;
+st->codec->codec_id   = types->codec_id;
-case STREAM_TYPE_SUBTITLE_DVB:
+return;
-codec_type = CODEC_TYPE_SUBTITLE;
+}
-codec_id = CODEC_ID_DVB_SUBTITLE;
+}
-break;
+}
-default:
-if (code >= 0x1c0 && code <= 0x1df) {
+static AVStream *new_pes_av_stream(PESContext *pes, uint32_t code,
-codec_type = CODEC_TYPE_AUDIO;
+uint32_t prog_reg_desc, uint32_t reg_desc)
-codec_id = CODEC_ID_MP2;
+{
-} else if (code == 0x1bd) {
+AVStream *st = av_new_stream(pes->stream, pes->pid);
-codec_type = CODEC_TYPE_AUDIO;
-codec_id = CODEC_ID_AC3;
+if (!st)
-} else {
+return NULL;
-codec_type = CODEC_TYPE_DATA;
-codec_id = CODEC_ID_PROBE;
+av_set_pts_info(st, 33, 1, 90000);
-}
+st->priv_data = pes;
-break;
+st->codec->codec_type = CODEC_TYPE_DATA;
-}
+st->codec->codec_id   = CODEC_ID_PROBE;
-st = av_new_stream(pes->stream, pes->pid);
+st->need_parsing = AVSTREAM_PARSE_FULL;
-if (st) {
+pes->st = st;
-av_set_pts_info(st, 33, 1, 90000);
-st->priv_data = pes;
+dprintf(pes->stream, "stream_type=%x prog_reg_desc=%.4s reg_desc=%.4s\n",
-st->codec->codec_type = codec_type;
+pes->stream_type, (char*)&prog_reg_desc, (char*)&reg_desc);
-st->codec->codec_id = codec_id;
-st->need_parsing = AVSTREAM_PARSE_FULL;
+if (pes->stream_type == 0x06) { // private data carrying pes data
-pes->st = st;
+mpegts_find_stream_type(st, reg_desc, REGD_types);
-}
+} else {
+mpegts_find_stream_type(st, pes->stream_type, ISO_types);
+if (prog_reg_desc == AV_RL32("HDMV") &&
+st->codec->codec_id == CODEC_ID_PROBE)
+mpegts_find_stream_type(st, pes->stream_type, HDMV_types);
+if (st->codec->codec_id == CODEC_ID_PROBE)
+mpegts_find_stream_type(st, pes->stream_type, MISC_types);
+}
 return st;
 }
 static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type)

Mercurial > libavformat.hg

comparison mpegts.c @ 4978:deaa9053dc97 libavformat