Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
5f3a081b
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,发现更多精彩内容 >>
提交
5f3a081b
编写于
11月 28, 2015
作者:
L
Luca Barbato
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avi: Spin out the logic to position to the next non-interleaved stream
Signed-off-by:
N
Luca Barbato
<
lu_zero@gentoo.org
>
上级
cb49bb10
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
72 addition
and
62 deletion
+72
-62
libavformat/avidec.c
libavformat/avidec.c
+72
-62
未找到文件。
libavformat/avidec.c
浏览文件 @
5f3a081b
...
...
@@ -1094,6 +1094,75 @@ start_sync:
return
AVERROR_EOF
;
}
static
int
ni_prepare_read
(
AVFormatContext
*
s
)
{
AVIContext
*
avi
=
s
->
priv_data
;
int
best_stream_index
=
0
;
AVStream
*
best_st
=
NULL
;
AVIStream
*
best_ast
;
int64_t
best_ts
=
INT64_MAX
;
int
i
;
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
AVStream
*
st
=
s
->
streams
[
i
];
AVIStream
*
ast
=
st
->
priv_data
;
int64_t
ts
=
ast
->
frame_offset
;
int64_t
last_ts
;
if
(
!
st
->
nb_index_entries
)
continue
;
last_ts
=
st
->
index_entries
[
st
->
nb_index_entries
-
1
].
timestamp
;
if
(
!
ast
->
remaining
&&
ts
>
last_ts
)
continue
;
ts
=
av_rescale_q
(
ts
,
st
->
time_base
,
(
AVRational
)
{
FFMAX
(
1
,
ast
->
sample_size
),
AV_TIME_BASE
});
av_log
(
s
,
AV_LOG_TRACE
,
"%"
PRId64
" %d/%d %"
PRId64
"
\n
"
,
ts
,
st
->
time_base
.
num
,
st
->
time_base
.
den
,
ast
->
frame_offset
);
if
(
ts
<
best_ts
)
{
best_ts
=
ts
;
best_st
=
st
;
best_stream_index
=
i
;
}
}
if
(
!
best_st
)
return
AVERROR_EOF
;
best_ast
=
best_st
->
priv_data
;
best_ts
=
av_rescale_q
(
best_ts
,
(
AVRational
)
{
FFMAX
(
1
,
best_ast
->
sample_size
),
AV_TIME_BASE
},
best_st
->
time_base
);
if
(
best_ast
->
remaining
)
{
i
=
av_index_search_timestamp
(
best_st
,
best_ts
,
AVSEEK_FLAG_ANY
|
AVSEEK_FLAG_BACKWARD
);
}
else
{
i
=
av_index_search_timestamp
(
best_st
,
best_ts
,
AVSEEK_FLAG_ANY
);
if
(
i
>=
0
)
best_ast
->
frame_offset
=
best_st
->
index_entries
[
i
].
timestamp
;
}
if
(
i
>=
0
)
{
int64_t
pos
=
best_st
->
index_entries
[
i
].
pos
;
pos
+=
best_ast
->
packet_size
-
best_ast
->
remaining
;
avio_seek
(
s
->
pb
,
pos
+
8
,
SEEK_SET
);
assert
(
best_ast
->
remaining
<=
best_ast
->
packet_size
);
avi
->
stream_index
=
best_stream_index
;
if
(
!
best_ast
->
remaining
)
best_ast
->
packet_size
=
best_ast
->
remaining
=
best_st
->
index_entries
[
i
].
size
;
}
return
0
;
}
static
int
avi_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
AVIContext
*
avi
=
s
->
priv_data
;
...
...
@@ -1109,68 +1178,9 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
}
if
(
avi
->
non_interleaved
)
{
int
best_stream_index
=
0
;
AVStream
*
best_st
=
NULL
;
AVIStream
*
best_ast
;
int64_t
best_ts
=
INT64_MAX
;
int
i
;
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
AVStream
*
st
=
s
->
streams
[
i
];
AVIStream
*
ast
=
st
->
priv_data
;
int64_t
ts
=
ast
->
frame_offset
;
int64_t
last_ts
;
if
(
!
st
->
nb_index_entries
)
continue
;
last_ts
=
st
->
index_entries
[
st
->
nb_index_entries
-
1
].
timestamp
;
if
(
!
ast
->
remaining
&&
ts
>
last_ts
)
continue
;
ts
=
av_rescale_q
(
ts
,
st
->
time_base
,
(
AVRational
)
{
FFMAX
(
1
,
ast
->
sample_size
),
AV_TIME_BASE
});
av_log
(
s
,
AV_LOG_TRACE
,
"%"
PRId64
" %d/%d %"
PRId64
"
\n
"
,
ts
,
st
->
time_base
.
num
,
st
->
time_base
.
den
,
ast
->
frame_offset
);
if
(
ts
<
best_ts
)
{
best_ts
=
ts
;
best_st
=
st
;
best_stream_index
=
i
;
}
}
if
(
!
best_st
)
return
AVERROR_EOF
;
best_ast
=
best_st
->
priv_data
;
best_ts
=
av_rescale_q
(
best_ts
,
(
AVRational
)
{
FFMAX
(
1
,
best_ast
->
sample_size
),
AV_TIME_BASE
},
best_st
->
time_base
);
if
(
best_ast
->
remaining
)
{
i
=
av_index_search_timestamp
(
best_st
,
best_ts
,
AVSEEK_FLAG_ANY
|
AVSEEK_FLAG_BACKWARD
);
}
else
{
i
=
av_index_search_timestamp
(
best_st
,
best_ts
,
AVSEEK_FLAG_ANY
);
if
(
i
>=
0
)
best_ast
->
frame_offset
=
best_st
->
index_entries
[
i
].
timestamp
;
}
if
(
i
>=
0
)
{
int64_t
pos
=
best_st
->
index_entries
[
i
].
pos
;
pos
+=
best_ast
->
packet_size
-
best_ast
->
remaining
;
avio_seek
(
s
->
pb
,
pos
+
8
,
SEEK_SET
);
assert
(
best_ast
->
remaining
<=
best_ast
->
packet_size
);
avi
->
stream_index
=
best_stream_index
;
if
(
!
best_ast
->
remaining
)
best_ast
->
packet_size
=
best_ast
->
remaining
=
best_st
->
index_entries
[
i
].
size
;
}
err
=
ni_prepare_read
(
s
);
if
(
err
<
0
)
return
err
;
}
resync:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录