Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
fec28364
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fec28364
编写于
10月 05, 2011
作者:
A
Alex Converse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mpegts: Replace the MP4 descriptor parser with a recursive parser.
上级
c3bc6096
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
140 addition
and
34 deletion
+140
-34
libavformat/mpegts.c
libavformat/mpegts.c
+140
-34
未找到文件。
libavformat/mpegts.c
浏览文件 @
fec28364
...
...
@@ -870,38 +870,147 @@ static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid)
return
pes
;
}
static
int
mp4_read_iods
(
AVFormatContext
*
s
,
const
uint8_t
*
buf
,
unsigned
size
,
int
*
es_id
,
uint8_t
**
dec_config_descr
,
int
*
dec_config_descr_size
)
{
#define MAX_LEVEL 4
typedef
struct
{
AVFormatContext
*
s
;
AVIOContext
pb
;
Mp4Descr
*
descr
;
Mp4Descr
*
active_descr
;
int
descr_count
;
int
max_descr_count
;
int
level
;
}
MP4DescrParseContext
;
static
int
init_MP4DescrParseContext
(
MP4DescrParseContext
*
d
,
AVFormatContext
*
s
,
const
uint8_t
*
buf
,
unsigned
size
,
Mp4Descr
*
descr
,
int
max_descr_count
)
{
int
ret
;
if
(
size
>
(
1
<<
30
))
return
AVERROR_INVALIDDATA
;
if
((
ret
=
ffio_init_context
(
&
d
->
pb
,
(
unsigned
char
*
)
buf
,
size
,
0
,
NULL
,
NULL
,
NULL
,
NULL
))
<
0
)
return
ret
;
d
->
s
=
s
;
d
->
level
=
0
;
d
->
descr_count
=
0
;
d
->
descr
=
descr
;
d
->
active_descr
=
NULL
;
d
->
max_descr_count
=
max_descr_count
;
return
0
;
}
static
void
update_offsets
(
AVIOContext
*
pb
,
int64_t
*
off
,
int
*
len
)
{
int64_t
new_off
=
avio_tell
(
pb
);
(
*
len
)
-=
new_off
-
*
off
;
*
off
=
new_off
;
}
static
int
parse_mp4_descr
(
MP4DescrParseContext
*
d
,
int64_t
off
,
int
len
,
int
target_tag
);
static
int
parse_mp4_descr_arr
(
MP4DescrParseContext
*
d
,
int64_t
off
,
int
len
)
{
while
(
len
>
0
)
{
if
(
parse_mp4_descr
(
d
,
off
,
len
,
0
)
<
0
)
return
-
1
;
update_offsets
(
&
d
->
pb
,
&
off
,
&
len
);
}
return
0
;
}
static
int
parse_MP4IODescrTag
(
MP4DescrParseContext
*
d
,
int64_t
off
,
int
len
)
{
avio_rb16
(
&
d
->
pb
);
// ID
avio_r8
(
&
d
->
pb
);
avio_r8
(
&
d
->
pb
);
avio_r8
(
&
d
->
pb
);
avio_r8
(
&
d
->
pb
);
avio_r8
(
&
d
->
pb
);
update_offsets
(
&
d
->
pb
,
&
off
,
&
len
);
return
parse_mp4_descr_arr
(
d
,
off
,
len
);
}
static
int
parse_MP4ESDescrTag
(
MP4DescrParseContext
*
d
,
int64_t
off
,
int
len
)
{
int
es_id
=
0
;
if
(
d
->
descr_count
>=
d
->
max_descr_count
)
return
-
1
;
ff_mp4_parse_es_descr
(
&
d
->
pb
,
&
es_id
);
d
->
active_descr
=
d
->
descr
+
(
d
->
descr_count
++
);
d
->
active_descr
->
es_id
=
es_id
;
update_offsets
(
&
d
->
pb
,
&
off
,
&
len
);
parse_mp4_descr
(
d
,
off
,
len
,
MP4DecConfigDescrTag
);
//SLConfigDescriptor
d
->
active_descr
=
NULL
;
return
0
;
}
static
int
parse_MP4DecConfigDescrTag
(
MP4DescrParseContext
*
d
,
int64_t
off
,
int
len
)
{
Mp4Descr
*
descr
=
d
->
active_descr
;
if
(
!
descr
)
return
-
1
;
d
->
active_descr
->
dec_config_descr
=
av_malloc
(
len
);
if
(
!
descr
->
dec_config_descr
)
return
AVERROR
(
ENOMEM
);
descr
->
dec_config_descr_len
=
len
;
avio_read
(
&
d
->
pb
,
descr
->
dec_config_descr
,
len
);
return
0
;
}
static
int
parse_mp4_descr
(
MP4DescrParseContext
*
d
,
int64_t
off
,
int
len
,
int
target_tag
)
{
int
tag
;
unsigned
len
;
ffio_init_context
(
&
pb
,
buf
,
size
,
0
,
NULL
,
NULL
,
NULL
,
NULL
);
len
=
ff_mp4_read_descr
(
s
,
&
pb
,
&
tag
);
if
(
tag
==
MP4IODescrTag
)
{
avio_rb16
(
&
pb
);
// ID
avio_r8
(
&
pb
);
avio_r8
(
&
pb
);
avio_r8
(
&
pb
);
avio_r8
(
&
pb
);
avio_r8
(
&
pb
);
len
=
ff_mp4_read_descr
(
s
,
&
pb
,
&
tag
);
if
(
tag
==
MP4ESDescrTag
)
{
ff_mp4_parse_es_descr
(
&
pb
,
es_id
);
av_dlog
(
s
,
"ES_ID %#x
\n
"
,
*
es_id
);
len
=
ff_mp4_read_descr
(
s
,
&
pb
,
&
tag
);
if
(
tag
==
MP4DecConfigDescrTag
)
{
*
dec_config_descr
=
av_malloc
(
len
);
if
(
!*
dec_config_descr
)
return
AVERROR
(
ENOMEM
);
*
dec_config_descr_size
=
len
;
avio_read
(
&
pb
,
*
dec_config_descr
,
len
);
}
}
int
len1
=
ff_mp4_read_descr
(
d
->
s
,
&
d
->
pb
,
&
tag
);
update_offsets
(
&
d
->
pb
,
&
off
,
&
len
);
if
(
len
<
0
||
len1
>
len
||
len1
<=
0
)
{
av_log
(
d
->
s
,
AV_LOG_ERROR
,
"Tag %x length violation new length %d bytes remaining %d
\n
"
,
tag
,
len1
,
len
);
return
-
1
;
}
if
(
d
->
level
++
>=
MAX_LEVEL
)
{
av_log
(
d
->
s
,
AV_LOG_ERROR
,
"Maximum MP4 descriptor level exceeded
\n
"
);
goto
done
;
}
if
(
target_tag
&&
tag
!=
target_tag
)
{
av_log
(
d
->
s
,
AV_LOG_ERROR
,
"Found tag %x expected %x
\n
"
,
tag
,
target_tag
);
goto
done
;
}
switch
(
tag
)
{
case
MP4IODescrTag
:
parse_MP4IODescrTag
(
d
,
off
,
len1
);
break
;
case
MP4ESDescrTag
:
parse_MP4ESDescrTag
(
d
,
off
,
len1
);
break
;
case
MP4DecConfigDescrTag
:
parse_MP4DecConfigDescrTag
(
d
,
off
,
len1
);
break
;
}
done:
d
->
level
--
;
avio_seek
(
&
d
->
pb
,
off
+
len1
,
SEEK_SET
);
return
0
;
}
static
int
mp4_read_iods
(
AVFormatContext
*
s
,
const
uint8_t
*
buf
,
unsigned
size
,
Mp4Descr
*
descr
,
int
*
descr_count
,
int
max_descr_count
)
{
MP4DescrParseContext
d
;
if
(
init_MP4DescrParseContext
(
&
d
,
s
,
buf
,
size
,
descr
,
max_descr_count
)
<
0
)
return
-
1
;
parse_mp4_descr
(
&
d
,
avio_tell
(
&
d
.
pb
),
size
,
MP4IODescrTag
);
*
descr_count
=
d
.
descr_count
;
return
0
;
}
...
...
@@ -1080,11 +1189,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
get8
(
&
p
,
p_end
);
// scope
get8
(
&
p
,
p_end
);
// label
len
-=
2
;
if
(
mp4_descr_count
<
MAX_MP4_DESCR_COUNT
)
{
mp4_descr_count
++
;
mp4_read_iods
(
ts
->
stream
,
p
,
len
,
&
mp4_descr
->
es_id
,
&
mp4_descr
->
dec_config_descr
,
&
mp4_descr
->
dec_config_descr_len
);
}
mp4_read_iods
(
ts
->
stream
,
p
,
len
,
mp4_descr
+
mp4_descr_count
,
&
mp4_descr_count
,
MAX_MP4_DESCR_COUNT
);
}
else
if
(
tag
==
0x05
&&
len
>=
4
)
{
// registration descriptor
prog_reg_desc
=
bytestream_get_le32
(
&
p
);
len
-=
4
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录