---
libavformat/mpegts.c | 39 ++++++++++++++++++++++++++++++++++-----
libavformat/mpegts.h | 4 +++-
libavformat/wtv.c | 2 +-
3 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 6a50dc7..2a4e0e2 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1012,9 +1012,28 @@ static int mp4_read_iods(AVFormatContext *s, const
uint8_t *buf, unsigned size,
return 0;
}
+static void m4sl_cb(MpegTSFilter *filter, const uint8_t *section, int
section_len)
+{
+ MpegTSContext *ts = filter->u.section_filter.opaque;
+ SectionHeader h1, *h = &h1;
+ const uint8_t *p, *p_end;
+
+ av_dlog(ts->stream, "m4SL/od:\n");
+ hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
+
+ p_end = section + section_len - 4;
+ p = section;
+ if (parse_section_header(h, &p, p_end) < 0)
+ return;
+ if (h->tid != M4OD_TID)
+ return;
+
+}
+
int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int
stream_type,
const uint8_t **pp, const uint8_t *desc_list_end,
- Mp4Descr *mp4_descr, int mp4_descr_count, int
pid)
+ Mp4Descr *mp4_descr, int mp4_descr_count, int
pid,
+ MpegTSContext *ts)
{
const uint8_t *desc_end;
int desc_len, desc_tag, desc_es_id;
@@ -1050,6 +1069,8 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc,
AVStream *st, int stream_type
if (st->codec->codec_id == CODEC_ID_AAC &&
st->codec->extradata_size > 0)
st->need_parsing = 0;
+ if (st->codec->codec_id == CODEC_ID_MPEG4SYSTEMS)
+ mpegts_open_section_filter(ts, pid, m4sl_cb, ts, 1);
}
break;
case 0x1F: /* FMC descriptor */
@@ -1205,6 +1226,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t
*section, int section_len
for(;;) {
st = 0;
+ pes = NULL;
stream_type = get8(&p, p_end);
if (stream_type < 0)
break;
@@ -1218,17 +1240,24 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t
*section, int section_len
if (!pes->st)
pes->st = av_new_stream(pes->stream, pes->pid);
st = pes->st;
- } else {
+ } else if (stream_type != 0x13) {
if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]);
//wrongly added sdt filter probably
pes = add_pes_stream(ts, pid, pcr_pid);
if (pes)
st = av_new_stream(pes->stream, pes->pid);
+ } else {
+ int idx = ff_find_stream_index(ts->stream, pid);
+ if (idx >= 0) {
+ st = ts->stream->streams[idx];
+ } else {
+ st = av_new_stream(ts->stream, pid);
+ }
}
if (!st)
goto out;
- if (!pes->stream_type)
+ if (pes && !pes->stream_type)
mpegts_set_stream_info(st, pes, stream_type, prog_reg_desc);
add_pid_to_pmt(ts, h->id, pid);
@@ -1243,10 +1272,10 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t
*section, int section_len
break;
for(;;) {
if (ff_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p,
desc_list_end,
- mp4_descr, mp4_descr_count, pid) < 0)
+ mp4_descr, mp4_descr_count, pid, ts) < 0)
break;
- if (prog_reg_desc == AV_RL32("HDMV") && stream_type == 0x83 &&
pes->sub_st) {
+ if (pes && prog_reg_desc == AV_RL32("HDMV") && stream_type == 0x83
&& pes->sub_st) {
ff_program_add_stream_index(ts->stream, h->id,
pes->sub_st->index);
pes->sub_st->codec->codec_tag = st->codec->codec_tag;
}
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 15eee60..560637b 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -39,6 +39,7 @@
/* table ids */
#define PAT_TID 0x00
#define PMT_TID 0x02
+#define M4OD_TID 0x05
#define SDT_TID 0x42
#define STREAM_TYPE_VIDEO_MPEG1 0x01
@@ -85,6 +86,7 @@ typedef struct {
*/
int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int
stream_type,
const uint8_t **pp, const uint8_t *desc_list_end,
- Mp4Descr *mp4_descr, int mp4_descr_count, int
pid);
+ Mp4Descr *mp4_descr, int mp4_descr_count, int
pid,
+ MpegTSContext *ts);
#endif /* AVFORMAT_MPEGTS_H */
diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index 9d7228d..0fb9d48 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -836,7 +836,7 @@ static int parse_chunks(AVFormatContext *s, int mode,
int64_t seekts, int *len_p
buf_size = FFMIN(len - consumed, sizeof(buf));
avio_read(pb, buf, buf_size);
consumed += buf_size;
- ff_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size,
NULL, 0, 0);
+ ff_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size,
NULL, 0, 0, NULL);
}
} else if (!ff_guidcmp(g, EVENTID_AudioTypeSpanningEvent)) {
int stream_index = ff_find_stream_index(s, sid);
--
1.7.3.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
