Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
b565ea09
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,发现更多精彩内容 >>
提交
b565ea09
编写于
5月 11, 2006
作者:
B
Baptiste Coudurier
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix spliting chunks, simplify
Originally committed as revision 5363 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
baa3a937
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
25 addition
and
41 deletion
+25
-41
libavformat/mov.c
libavformat/mov.c
+25
-41
未找到文件。
libavformat/mov.c
浏览文件 @
b565ea09
...
...
@@ -66,10 +66,6 @@
/* Allows seeking */
#define MOV_SEEK
/* Special handling for movies created with Minolta Dimaxe Xi*/
/* this fix should not interfere with other .mov files, but just in case*/
#define MOV_MINOLTA_FIX
/* some streams in QT (and in MP4 mostly) aren't either video nor audio */
/* so we first list them as this, then clean up the list of streams we give back, */
/* getting rid of these */
...
...
@@ -1817,37 +1813,6 @@ again:
goto
again
;
}
/* now get the chunk size... */
for
(
i
=
0
;
i
<
mov
->
total_streams
;
i
++
)
{
MOVStreamContext
*
msc
=
mov
->
streams
[
i
];
if
((
msc
->
next_chunk
<
msc
->
chunk_count
)
&&
msc
->
chunk_offsets
[
msc
->
next_chunk
]
-
offset
<
size
&&
msc
->
chunk_offsets
[
msc
->
next_chunk
]
>
offset
)
size
=
msc
->
chunk_offsets
[
msc
->
next_chunk
]
-
offset
;
}
#ifdef MOV_MINOLTA_FIX
//Make sure that size is according to sample_size (Needed by .mov files
//created on a Minolta Dimage Xi where audio chunks contains waste data in the end)
//Maybe we should really not only check sc->sample_size, but also sc->sample_sizes
//but I have no such movies
if
(
sc
->
sample_size
>
0
)
{
int
foundsize
=
0
;
for
(
i
=
0
;
i
<
(
sc
->
sample_to_chunk_sz
);
i
++
)
{
if
(
(
sc
->
sample_to_chunk
[
i
].
first
)
<=
(
sc
->
next_chunk
)
)
{
foundsize
=
sc
->
sample_to_chunk
[
i
].
count
*
sc
->
sample_size
;
}
dprintf
(
"sample_to_chunk first=%ld count=%ld, id=%ld
\n
"
,
sc
->
sample_to_chunk
[
i
].
first
,
sc
->
sample_to_chunk
[
i
].
count
,
sc
->
sample_to_chunk
[
i
].
id
);
}
if
(
(
foundsize
>
0
)
&&
(
foundsize
<
size
)
)
{
size
=
foundsize
;
}
}
#endif //MOV_MINOLTA_FIX
idx
=
sc
->
sample_to_chunk_index
;
if
(
idx
+
1
<
sc
->
sample_to_chunk_sz
&&
sc
->
next_chunk
>=
sc
->
sample_to_chunk
[
idx
+
1
].
first
)
idx
++
;
...
...
@@ -1858,14 +1823,33 @@ again:
mov
->
partial
=
sc
;
/* we'll have to get those samples before next chunk */
sc
->
left_in_chunk
=
sc
->
sample_to_chunk
[
idx
].
count
-
1
;
size
=
(
sc
->
sample_size
>
1
)
?
sc
->
sample_size
:
sc
->
sample_sizes
[
sc
->
current_sample
];
}
size
=
(
sc
->
sample_size
>
1
)
?
sc
->
sample_size
:
sc
->
sample_sizes
[
sc
->
current_sample
];
next_sample
=
sc
->
current_sample
+
1
;
}
else
if
(
idx
<
sc
->
sample_to_chunk_sz
){
}
else
{
int
adjusted
=
0
;
/* get the chunk size... */
for
(
i
=
0
;
i
<
mov
->
total_streams
;
i
++
)
{
MOVStreamContext
*
msc
=
mov
->
streams
[
i
];
if
((
msc
->
next_chunk
<
msc
->
chunk_count
)
&&
msc
->
chunk_offsets
[
msc
->
next_chunk
]
-
offset
<
size
&&
msc
->
chunk_offsets
[
msc
->
next_chunk
]
>
offset
)
size
=
msc
->
chunk_offsets
[
msc
->
next_chunk
]
-
offset
;
}
//Make sure that size is according to sample_size (Needed by .mov files
//created on a Minolta Dimage Xi where audio chunks contains waste data in the end)
//needed for 'raw '
//sample_size is already adjusted in read_stsz
adjusted
=
sc
->
sample_to_chunk
[
idx
].
count
*
sc
->
sample_size
;
if
(
adjusted
<
size
)
{
dprintf
(
"adjusted %d, size %d, sample count %ld
\n
"
,
adjusted
,
size
,
sc
->
sample_to_chunk
[
idx
].
count
);
size
=
adjusted
;
}
if
(
idx
<
sc
->
sample_to_chunk_sz
){
next_sample
=
sc
->
current_sample
+
sc
->
sample_to_chunk
[
idx
].
count
;
}
else
next_sample
=
sc
->
current_sample
;
}
readchunk:
dprintf
(
"chunk: %"
PRId64
" -> %"
PRId64
" (%i)
\n
"
,
offset
,
offset
+
size
,
size
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录