generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add streams even if they are not present in PMT, fix #1092 and #835

Browse Source 
Originally committed as revision 19011 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-05-31 03:55:23 +00:00
parent e6eb74d84c
commit ffdbada6c1
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/mpegts.c
View File

@ -540,7 +540,7 @@ static void mpegts_find_stream_type(AVStream *st,
}
}
static AVStream *new_pes_av_stream(PESContext *pes, uint32_t prog_reg_desc)
static AVStream *new_pes_av_stream(PESContext *pes, uint32_t prog_reg_desc, uint32_t code)
{
AVStream *st = av_new_stream(pes->stream, pes->pid);
@ -564,6 +564,17 @@ static AVStream *new_pes_av_stream(PESContext *pes, uint32_t prog_reg_desc)
if (st->codec->codec_id == CODEC_ID_PROBE)
mpegts_find_stream_type(st, pes->stream_type, MISC_types);
/* stream was not present in PMT, guess based on PES start code */
if (st->codec->codec_id == CODEC_ID_PROBE) {
if (code >= 0x1c0 && code <= 0x1df) {
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_MP2;
} else if (code == 0x1bd) {
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_AC3;
}
}
return st;
}
@ -642,7 +653,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
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, prog_reg_desc);
st = new_pes_av_stream(pes, prog_reg_desc, 0);
}
if (!st)
@ -910,7 +921,14 @@ static int mpegts_push_data(MpegTSFilter *filter,
pes->header[2] == 0x01) {
/* it must be an mpeg2 PES stream */
code = pes->header[3] | 0x100;
if (!pes->st || pes->st->discard == AVDISCARD_ALL ||
/* stream not present in PMT */
if (!pes->st)
pes->st = new_pes_av_stream(pes, 0, code);
if (!pes->st)
return AVERROR(ENOMEM);
if (pes->st->discard == AVDISCARD_ALL ||
!((code >= 0x1c0 && code <= 0x1df) ||
(code >= 0x1e0 && code <= 0x1ef) ||
(code == 0x1bd) || (code == 0x1fd)))