Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
2c578058
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,发现更多精彩内容 >>
提交
2c578058
编写于
5月 19, 2005
作者:
M
Måns Rullgård
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
accept old extradata format
Originally committed as revision 4281 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
d381c505
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
67 addition
and
42 deletion
+67
-42
libavcodec/oggvorbis.c
libavcodec/oggvorbis.c
+37
-28
libavcodec/vorbis.c
libavcodec/vorbis.c
+30
-14
未找到文件。
libavcodec/oggvorbis.c
浏览文件 @
2c578058
...
...
@@ -180,13 +180,11 @@ AVCodec oggvorbis_encoder = {
.
capabilities
=
CODEC_CAP_DELAY
,
}
;
static
int
oggvorbis_decode_init
(
AVCodecContext
*
avccontext
)
{
OggVorbisContext
*
context
=
avccontext
->
priv_data
;
uint8_t
*
p
=
avccontext
->
extradata
;
int
i
,
hsizes
[
3
];
unsigned
char
*
headers
[
3
],
*
extradata
=
avccontext
->
extradata
;
unsigned
int
offset
;
vorbis_info_init
(
&
context
->
vi
)
;
vorbis_comment_init
(
&
context
->
vc
)
;
...
...
@@ -195,12 +193,16 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) {
av_log
(
avccontext
,
AV_LOG_ERROR
,
"vorbis extradata absent
\n
"
);
return
-
1
;
}
if
(
*
p
!=
2
)
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"vorbis initial header len is wrong: %d
\n
"
,
*
p
);
return
-
1
;
if
(
p
[
0
]
==
0
&&
p
[
1
]
==
30
)
{
for
(
i
=
0
;
i
<
3
;
i
++
){
hsizes
[
i
]
=
*
p
++
<<
8
;
hsizes
[
i
]
+=
*
p
++
;
headers
[
i
]
=
p
;
p
+=
hsizes
[
i
];
}
offset
=
1
;
}
else
if
(
*
p
==
2
)
{
unsigned
int
offset
=
1
;
p
++
;
for
(
i
=
0
;
i
<
2
;
i
++
)
{
hsizes
[
i
]
=
0
;
...
...
@@ -210,14 +212,15 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) {
p
++
;
}
if
(
offset
>=
avccontext
->
extradata_size
-
1
)
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"vorbis header sizes damaged
\n
"
);
av_log
(
avccontext
,
AV_LOG_ERROR
,
"vorbis header sizes damaged
\n
"
);
return
-
1
;
}
hsizes
[
i
]
+=
*
p
;
offset
++
;
p
++
;
}
hsizes
[
2
]
=
avccontext
->
extradata_size
-
hsizes
[
0
]
-
hsizes
[
1
]
-
offset
;
hsizes
[
2
]
=
avccontext
->
extradata_size
-
hsizes
[
0
]
-
hsizes
[
1
]
-
offset
;
#if 0
av_log(avccontext, AV_LOG_DEBUG,
"vorbis header sizes: %d, %d, %d, / extradata_len is %d \n",
...
...
@@ -226,6 +229,11 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) {
headers
[
0
]
=
extradata
+
offset
;
headers
[
1
]
=
extradata
+
offset
+
hsizes
[
0
];
headers
[
2
]
=
extradata
+
offset
+
hsizes
[
0
]
+
hsizes
[
1
];
}
else
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"vorbis initial header len is wrong: %d
\n
"
,
*
p
);
return
-
1
;
}
for
(
i
=
0
;
i
<
3
;
i
++
){
context
->
op
.
b_o_s
=
i
==
0
;
...
...
@@ -236,6 +244,7 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) {
return
-
1
;
}
}
avccontext
->
channels
=
context
->
vi
.
channels
;
avccontext
->
sample_rate
=
context
->
vi
.
rate
;
avccontext
->
time_base
=
(
AVRational
){
1
,
avccontext
->
sample_rate
};
...
...
libavcodec/vorbis.c
浏览文件 @
2c578058
...
...
@@ -759,17 +759,26 @@ static int vorbis_decode_init(AVCodecContext *avccontext) {
vorbis_context
*
vc
=
avccontext
->
priv_data
;
uint8_t
*
headers
=
avccontext
->
extradata
;
int
headers_len
=
avccontext
->
extradata_size
;
uint8_t
*
header_start
[
3
];
int
header_len
[
3
];
GetBitContext
*
gb
=
&
(
vc
->
gb
);
int
i
,
j
,
hdr_type
;
vc
->
avccontext
=
avccontext
;
if
(
!
headers_len
||
headers
[
0
]
!=
2
)
{
if
(
!
headers_len
)
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"Extradata corrupt.
\n
"
);
return
-
1
;
}
if
(
headers
[
0
]
==
0
&&
headers
[
1
]
==
30
)
{
for
(
i
=
0
;
i
<
3
;
i
++
){
header_len
[
i
]
=
*
headers
++
<<
8
;
header_len
[
i
]
+=
*
headers
++
;
header_start
[
i
]
=
headers
;
headers
+=
header_len
[
i
];
}
}
else
if
(
headers
[
0
]
==
2
)
{
for
(
j
=
1
,
i
=
0
;
i
<
2
;
++
i
,
++
j
)
{
header_len
[
i
]
=
0
;
while
(
j
<
headers_len
&&
headers
[
j
]
==
0xff
)
{
...
...
@@ -784,8 +793,15 @@ static int vorbis_decode_init(AVCodecContext *avccontext) {
}
header_len
[
2
]
=
headers_len
-
header_len
[
0
]
-
header_len
[
1
]
-
j
;
headers
+=
j
;
header_start
[
0
]
=
headers
;
header_start
[
1
]
=
header_start
[
0
]
+
header_len
[
0
];
header_start
[
2
]
=
header_start
[
1
]
+
header_len
[
1
];
}
else
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"Extradata corrupt.
\n
"
);
return
-
1
;
}
init_get_bits
(
gb
,
header
s
,
header_len
[
0
]
*
8
);
init_get_bits
(
gb
,
header
_start
[
0
]
,
header_len
[
0
]
*
8
);
hdr_type
=
get_bits
(
gb
,
8
);
if
(
hdr_type
!=
1
)
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"First header is not the id header.
\n
"
);
...
...
@@ -797,7 +813,7 @@ static int vorbis_decode_init(AVCodecContext *avccontext) {
return
-
1
;
}
init_get_bits
(
gb
,
header
s
+
header_len
[
0
]
+
header_len
[
1
],
header_len
[
2
]
*
8
);
init_get_bits
(
gb
,
header
_start
[
2
],
header_len
[
2
]
*
8
);
hdr_type
=
get_bits
(
gb
,
8
);
if
(
hdr_type
!=
5
)
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"Third header is not the setup header.
\n
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录