Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
8b84af74
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,发现更多精彩内容 >>
提交
8b84af74
编写于
6月 29, 2011
作者:
A
Alex Converse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avidec: Factor out the sync fucntionality.
上级
29651e1d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
128 addition
and
116 deletion
+128
-116
libavformat/avidec.c
libavformat/avidec.c
+128
-116
未找到文件。
libavformat/avidec.c
浏览文件 @
8b84af74
...
...
@@ -836,13 +836,137 @@ static int get_stream_idx(int *d){
}
}
static
int
avi_
read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
static
int
avi_
sync
(
AVFormatContext
*
s
)
{
AVIContext
*
avi
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
int
n
,
d
[
8
];
unsigned
int
size
;
int64_t
i
,
sync
;
start_sync:
memset
(
d
,
-
1
,
sizeof
(
int
)
*
8
);
for
(
i
=
sync
=
avio_tell
(
pb
);
!
pb
->
eof_reached
;
i
++
)
{
int
j
;
for
(
j
=
0
;
j
<
7
;
j
++
)
d
[
j
]
=
d
[
j
+
1
];
d
[
7
]
=
avio_r8
(
pb
);
size
=
d
[
4
]
+
(
d
[
5
]
<<
8
)
+
(
d
[
6
]
<<
16
)
+
(
d
[
7
]
<<
24
);
n
=
get_stream_idx
(
d
+
2
);
//av_log(s, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
if
(
i
+
(
uint64_t
)
size
>
avi
->
fsize
||
d
[
0
]
<
0
)
continue
;
//parse ix##
if
(
(
d
[
0
]
==
'i'
&&
d
[
1
]
==
'x'
&&
n
<
s
->
nb_streams
)
//parse JUNK
||
(
d
[
0
]
==
'J'
&&
d
[
1
]
==
'U'
&&
d
[
2
]
==
'N'
&&
d
[
3
]
==
'K'
)
||
(
d
[
0
]
==
'i'
&&
d
[
1
]
==
'd'
&&
d
[
2
]
==
'x'
&&
d
[
3
]
==
'1'
)){
avio_skip
(
pb
,
size
);
//av_log(s, AV_LOG_DEBUG, "SKIP\n");
goto
start_sync
;
}
//parse stray LIST
if
(
d
[
0
]
==
'L'
&&
d
[
1
]
==
'I'
&&
d
[
2
]
==
'S'
&&
d
[
3
]
==
'T'
){
avio_skip
(
pb
,
4
);
goto
start_sync
;
}
n
=
get_stream_idx
(
d
);
if
(
!
((
i
-
avi
->
last_pkt_pos
)
&
1
)
&&
get_stream_idx
(
d
+
1
)
<
s
->
nb_streams
)
continue
;
//detect ##ix chunk and skip
if
(
d
[
2
]
==
'i'
&&
d
[
3
]
==
'x'
&&
n
<
s
->
nb_streams
){
avio_skip
(
pb
,
size
);
goto
start_sync
;
}
//parse ##dc/##wb
if
(
n
<
s
->
nb_streams
){
AVStream
*
st
;
AVIStream
*
ast
;
st
=
s
->
streams
[
n
];
ast
=
st
->
priv_data
;
if
(
s
->
nb_streams
>=
2
){
AVStream
*
st1
=
s
->
streams
[
1
];
AVIStream
*
ast1
=
st1
->
priv_data
;
//workaround for broken small-file-bug402.avi
if
(
d
[
2
]
==
'w'
&&
d
[
3
]
==
'b'
&&
n
==
0
&&
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
st1
->
codec
->
codec_type
==
AVMEDIA_TYPE_AUDIO
&&
ast
->
prefix
==
'd'
*
256
+
'c'
&&
(
d
[
2
]
*
256
+
d
[
3
]
==
ast1
->
prefix
||
!
ast1
->
prefix_count
)
){
n
=
1
;
st
=
st1
;
ast
=
ast1
;
av_log
(
s
,
AV_LOG_WARNING
,
"Invalid stream + prefix combination, assuming audio.
\n
"
);
}
}
if
(
(
st
->
discard
>=
AVDISCARD_DEFAULT
&&
size
==
0
)
/*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/
//FIXME needs a little reordering
||
st
->
discard
>=
AVDISCARD_ALL
){
ast
->
frame_offset
+=
get_duration
(
ast
,
size
);
avio_skip
(
pb
,
size
);
goto
start_sync
;
}
if
(
d
[
2
]
==
'p'
&&
d
[
3
]
==
'c'
&&
size
<=
4
*
256
+
4
)
{
int
k
=
avio_r8
(
pb
);
int
last
=
(
k
+
avio_r8
(
pb
)
-
1
)
&
0xFF
;
avio_rl16
(
pb
);
//flags
for
(;
k
<=
last
;
k
++
)
ast
->
pal
[
k
]
=
avio_rb32
(
pb
)
>>
8
;
// b + (g << 8) + (r << 16);
ast
->
has_pal
=
1
;
goto
start_sync
;
}
else
if
(
((
ast
->
prefix_count
<
5
||
sync
+
9
>
i
)
&&
d
[
2
]
<
128
&&
d
[
3
]
<
128
)
||
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
/*||
(d[2] == 'd' && d[3] == 'c') ||
(d[2] == 'w' && d[3] == 'b')*/
)
{
//av_log(s, AV_LOG_DEBUG, "OK\n");
if
(
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
)
ast
->
prefix_count
++
;
else
{
ast
->
prefix
=
d
[
2
]
*
256
+
d
[
3
];
ast
->
prefix_count
=
0
;
}
avi
->
stream_index
=
n
;
ast
->
packet_size
=
size
+
8
;
ast
->
remaining
=
size
;
if
(
size
||
!
ast
->
sample_size
){
uint64_t
pos
=
avio_tell
(
pb
)
-
8
;
if
(
!
st
->
index_entries
||
!
st
->
nb_index_entries
||
st
->
index_entries
[
st
->
nb_index_entries
-
1
].
pos
<
pos
){
av_add_index_entry
(
st
,
pos
,
ast
->
frame_offset
,
size
,
0
,
AVINDEX_KEYFRAME
);
}
}
return
0
;
}
}
}
return
AVERROR_EOF
;
}
static
int
avi_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
AVIContext
*
avi
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
int
err
;
void
*
dstr
;
if
(
CONFIG_DV_DEMUXER
&&
avi
->
dv_demux
)
{
...
...
@@ -993,121 +1117,9 @@ resync:
return
size
;
}
memset
(
d
,
-
1
,
sizeof
(
int
)
*
8
);
for
(
i
=
sync
=
avio_tell
(
pb
);
!
pb
->
eof_reached
;
i
++
)
{
int
j
;
for
(
j
=
0
;
j
<
7
;
j
++
)
d
[
j
]
=
d
[
j
+
1
];
d
[
7
]
=
avio_r8
(
pb
);
size
=
d
[
4
]
+
(
d
[
5
]
<<
8
)
+
(
d
[
6
]
<<
16
)
+
(
d
[
7
]
<<
24
);
n
=
get_stream_idx
(
d
+
2
);
//av_log(s, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
if
(
i
+
(
uint64_t
)
size
>
avi
->
fsize
||
d
[
0
]
<
0
)
continue
;
//parse ix##
if
(
(
d
[
0
]
==
'i'
&&
d
[
1
]
==
'x'
&&
n
<
s
->
nb_streams
)
//parse JUNK
||
(
d
[
0
]
==
'J'
&&
d
[
1
]
==
'U'
&&
d
[
2
]
==
'N'
&&
d
[
3
]
==
'K'
)
||
(
d
[
0
]
==
'i'
&&
d
[
1
]
==
'd'
&&
d
[
2
]
==
'x'
&&
d
[
3
]
==
'1'
)){
avio_skip
(
pb
,
size
);
//av_log(s, AV_LOG_DEBUG, "SKIP\n");
goto
resync
;
}
//parse stray LIST
if
(
d
[
0
]
==
'L'
&&
d
[
1
]
==
'I'
&&
d
[
2
]
==
'S'
&&
d
[
3
]
==
'T'
){
avio_skip
(
pb
,
4
);
goto
resync
;
}
n
=
get_stream_idx
(
d
);
if
(
!
((
i
-
avi
->
last_pkt_pos
)
&
1
)
&&
get_stream_idx
(
d
+
1
)
<
s
->
nb_streams
)
continue
;
//detect ##ix chunk and skip
if
(
d
[
2
]
==
'i'
&&
d
[
3
]
==
'x'
&&
n
<
s
->
nb_streams
){
avio_skip
(
pb
,
size
);
goto
resync
;
}
//parse ##dc/##wb
if
(
n
<
s
->
nb_streams
){
AVStream
*
st
;
AVIStream
*
ast
;
st
=
s
->
streams
[
n
];
ast
=
st
->
priv_data
;
if
(
s
->
nb_streams
>=
2
){
AVStream
*
st1
=
s
->
streams
[
1
];
AVIStream
*
ast1
=
st1
->
priv_data
;
//workaround for broken small-file-bug402.avi
if
(
d
[
2
]
==
'w'
&&
d
[
3
]
==
'b'
&&
n
==
0
&&
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
st1
->
codec
->
codec_type
==
AVMEDIA_TYPE_AUDIO
&&
ast
->
prefix
==
'd'
*
256
+
'c'
&&
(
d
[
2
]
*
256
+
d
[
3
]
==
ast1
->
prefix
||
!
ast1
->
prefix_count
)
){
n
=
1
;
st
=
st1
;
ast
=
ast1
;
av_log
(
s
,
AV_LOG_WARNING
,
"Invalid stream + prefix combination, assuming audio.
\n
"
);
}
}
if
(
(
st
->
discard
>=
AVDISCARD_DEFAULT
&&
size
==
0
)
/*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/
//FIXME needs a little reordering
||
st
->
discard
>=
AVDISCARD_ALL
){
ast
->
frame_offset
+=
get_duration
(
ast
,
size
);
avio_skip
(
pb
,
size
);
goto
resync
;
}
if
(
d
[
2
]
==
'p'
&&
d
[
3
]
==
'c'
&&
size
<=
4
*
256
+
4
)
{
int
k
=
avio_r8
(
pb
);
int
last
=
(
k
+
avio_r8
(
pb
)
-
1
)
&
0xFF
;
avio_rl16
(
pb
);
//flags
for
(;
k
<=
last
;
k
++
)
ast
->
pal
[
k
]
=
avio_rb32
(
pb
)
>>
8
;
// b + (g << 8) + (r << 16);
ast
->
has_pal
=
1
;
goto
resync
;
}
else
if
(
((
ast
->
prefix_count
<
5
||
sync
+
9
>
i
)
&&
d
[
2
]
<
128
&&
d
[
3
]
<
128
)
||
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
/*||
(d[2] == 'd' && d[3] == 'c') ||
(d[2] == 'w' && d[3] == 'b')*/
)
{
//av_log(s, AV_LOG_DEBUG, "OK\n");
if
(
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
)
ast
->
prefix_count
++
;
else
{
ast
->
prefix
=
d
[
2
]
*
256
+
d
[
3
];
ast
->
prefix_count
=
0
;
}
avi
->
stream_index
=
n
;
ast
->
packet_size
=
size
+
8
;
ast
->
remaining
=
size
;
if
(
size
||
!
ast
->
sample_size
){
uint64_t
pos
=
avio_tell
(
pb
)
-
8
;
if
(
!
st
->
index_entries
||
!
st
->
nb_index_entries
||
st
->
index_entries
[
st
->
nb_index_entries
-
1
].
pos
<
pos
){
av_add_index_entry
(
st
,
pos
,
ast
->
frame_offset
,
size
,
0
,
AVINDEX_KEYFRAME
);
}
}
goto
resync
;
}
}
}
return
AVERROR_EOF
;
if
((
err
=
avi_sync
(
s
))
<
0
)
return
err
;
goto
resync
;
}
/* XXX: We make the implicit supposition that the positions are sorted
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录