Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
30a43f2d
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,发现更多精彩内容 >>
提交
30a43f2d
编写于
3月 01, 2006
作者:
M
Michael Niedermayer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add size to AVIndex
Originally committed as revision 5083 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
26d6d032
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
19 addition
and
14 deletion
+19
-14
libavformat/asf.c
libavformat/asf.c
+1
-1
libavformat/avformat.h
libavformat/avformat.h
+3
-3
libavformat/avidec.c
libavformat/avidec.c
+8
-5
libavformat/mpeg.c
libavformat/mpeg.c
+1
-1
libavformat/nut.c
libavformat/nut.c
+1
-0
libavformat/rm.c
libavformat/rm.c
+2
-2
libavformat/utils.c
libavformat/utils.c
+3
-2
未找到文件。
libavformat/asf.c
浏览文件 @
30a43f2d
...
...
@@ -813,7 +813,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos,
assert
((
asf_st
->
packet_pos
-
s
->
data_offset
)
%
asf
->
packet_size
==
0
);
pos
=
asf_st
->
packet_pos
;
av_add_index_entry
(
s
->
streams
[
i
],
pos
,
pts
,
pos
-
start_pos
[
i
]
+
1
,
AVINDEX_KEYFRAME
);
av_add_index_entry
(
s
->
streams
[
i
],
pos
,
p
kt
->
size
,
p
ts
,
pos
-
start_pos
[
i
]
+
1
,
AVINDEX_KEYFRAME
);
start_pos
[
i
]
=
asf_st
->
packet_pos
+
1
;
if
(
pkt
->
stream_index
==
stream_index
)
...
...
libavformat/avformat.h
浏览文件 @
30a43f2d
...
...
@@ -208,8 +208,8 @@ typedef struct AVIndexEntry {
int64_t
pos
;
int64_t
timestamp
;
#define AVINDEX_KEYFRAME 0x0001
/* the following 2 flags indicate that the next/prev keyframe is known, and scaning for it isnt needed */
int
flags
;
int
flags
:
2
;
int
size
:
30
;
//yeah trying to keep the size of this small to reduce memory requirements (its 24 vs 32 byte due to possible 8byte align)
int
min_distance
;
/* min distance between this and the previous keyframe, used to avoid unneeded searching */
}
AVIndexEntry
;
...
...
@@ -641,7 +641,7 @@ void av_set_pts_info(AVStream *s, int pts_wrap_bits,
int
av_find_default_stream_index
(
AVFormatContext
*
s
);
int
av_index_search_timestamp
(
AVStream
*
st
,
int64_t
timestamp
,
int
flags
);
int
av_add_index_entry
(
AVStream
*
st
,
int64_t
pos
,
int64_t
timestamp
,
int
distance
,
int
flags
);
int64_t
pos
,
int64_t
timestamp
,
int
size
,
int
distance
,
int
flags
);
int
av_seek_frame_binary
(
AVFormatContext
*
s
,
int
stream_index
,
int64_t
target_ts
,
int
flags
);
/* media file output */
...
...
libavformat/avidec.c
浏览文件 @
30a43f2d
...
...
@@ -55,6 +55,7 @@ typedef struct {
}
AVIContext
;
static
int
avi_load_index
(
AVFormatContext
*
s
);
static
int
guess_ni_flag
(
AVFormatContext
*
s
);
#ifdef DEBUG
static
void
print_tag
(
const
char
*
str
,
unsigned
int
tag
,
int
size
)
...
...
@@ -118,12 +119,14 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
for
(
i
=
0
;
i
<
entries_in_use
;
i
++
){
if
(
index_type
){
int64_t
pos
=
get_le32
(
pb
)
+
base
;
int64_t
pos
=
get_le32
(
pb
)
+
base
-
8
;
int
len
=
get_le32
(
pb
);
av_add_index_entry
(
st
,
pos
,
ast
->
cum_len
,
0
,
(
len
<
0
)
?
0
:
AVINDEX_KEYFRAME
);
int
key
=
len
>=
0
;
len
&=
0x7FFFFFFF
;
//av_log(s, AV_LOG_ERROR, "pos:%Ld, len:%X\n", pos, len);
av_add_index_entry
(
st
,
pos
,
ast
->
cum_len
,
len
,
0
,
key
?
AVINDEX_KEYFRAME
:
0
);
if
(
ast
->
sample_size
)
ast
->
cum_len
+=
len
/
ast
->
sample_size
;
else
...
...
@@ -412,6 +415,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
if
(
!
avi
->
index_loaded
)
avi_load_index
(
s
);
avi
->
index_loaded
=
1
;
avi
->
non_interleaved
|=
guess_ni_flag
(
s
);
return
0
;
}
...
...
@@ -699,7 +703,7 @@ static int avi_read_idx1(AVFormatContext *s, int size)
if
(
last_pos
==
pos
)
avi
->
non_interleaved
=
1
;
else
av_add_index_entry
(
st
,
pos
,
ast
->
cum_len
,
0
,
(
flags
&
AVIIF_INDEX
)
?
AVINDEX_KEYFRAME
:
0
);
av_add_index_entry
(
st
,
pos
,
ast
->
cum_len
,
len
,
0
,
(
flags
&
AVIIF_INDEX
)
?
AVINDEX_KEYFRAME
:
0
);
if
(
ast
->
sample_size
)
ast
->
cum_len
+=
len
/
ast
->
sample_size
;
else
...
...
@@ -768,7 +772,6 @@ static int avi_load_index(AVFormatContext *s)
}
}
the_end:
avi
->
non_interleaved
|=
guess_ni_flag
(
s
);
url_fseek
(
pb
,
pos
,
SEEK_SET
);
return
0
;
}
...
...
libavformat/mpeg.c
浏览文件 @
30a43f2d
...
...
@@ -1541,7 +1541,7 @@ static int mpegps_read_pes_header(AVFormatContext *s,
int
i
;
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
){
if
(
startcode
==
s
->
streams
[
i
]
->
id
)
{
av_add_index_entry
(
s
->
streams
[
i
],
*
ppos
,
dts
,
0
,
AVINDEX_KEYFRAME
/* FIXME keyframe? */
);
av_add_index_entry
(
s
->
streams
[
i
],
*
ppos
,
dts
,
0
,
0
,
AVINDEX_KEYFRAME
/* FIXME keyframe? */
);
}
}
}
...
...
libavformat/nut.c
浏览文件 @
30a43f2d
...
...
@@ -1192,6 +1192,7 @@ static int decode_frame_header(NUTContext *nut, int *key_frame_ret, int64_t *pts
s
->
streams
[
stream_id
],
frame_start
,
pts
,
0
,
frame_start
-
nut
->
stream
[
stream_id
].
last_sync_pos
,
AVINDEX_KEYFRAME
);
nut
->
stream
[
stream_id
].
last_sync_pos
=
frame_start
;
...
...
libavformat/rm.c
浏览文件 @
30a43f2d
...
...
@@ -982,7 +982,7 @@ resync:
if
(
flags
&
2
){
pkt
->
flags
|=
PKT_FLAG_KEY
;
if
((
seq
&
0x7F
)
==
1
)
av_add_index_entry
(
st
,
pos
,
timestamp
,
0
,
AVINDEX_KEYFRAME
);
av_add_index_entry
(
st
,
pos
,
timestamp
,
0
,
0
,
AVINDEX_KEYFRAME
);
}
}
...
...
@@ -1054,7 +1054,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
if
((
flags
&
2
)
&&
(
seq
&
0x7F
)
==
1
){
// av_log(s, AV_LOG_DEBUG, "%d %d-%d %Ld %d\n", flags, stream_index2, stream_index, dts, seq);
av_add_index_entry
(
st
,
pos
,
dts
,
0
,
AVINDEX_KEYFRAME
);
av_add_index_entry
(
st
,
pos
,
dts
,
0
,
0
,
AVINDEX_KEYFRAME
);
if
(
stream_index2
==
stream_index
)
break
;
}
...
...
libavformat/utils.c
浏览文件 @
30a43f2d
...
...
@@ -1131,7 +1131,7 @@ static void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t time
* @param timestamp timestamp in the timebase of the given stream
*/
int
av_add_index_entry
(
AVStream
*
st
,
int64_t
pos
,
int64_t
timestamp
,
int
distance
,
int
flags
)
int64_t
pos
,
int64_t
timestamp
,
int
size
,
int
distance
,
int
flags
)
{
AVIndexEntry
*
entries
,
*
ie
;
int
index
;
...
...
@@ -1168,6 +1168,7 @@ int av_add_index_entry(AVStream *st,
ie
->
pos
=
pos
;
ie
->
timestamp
=
timestamp
;
ie
->
min_distance
=
distance
;
ie
->
size
=
size
;
ie
->
flags
=
flags
;
return
index
;
...
...
@@ -1193,7 +1194,7 @@ static void av_build_index_raw(AVFormatContext *s)
if
(
pkt
->
stream_index
==
0
&&
st
->
parser
&&
(
pkt
->
flags
&
PKT_FLAG_KEY
))
{
av_add_index_entry
(
st
,
st
->
parser
->
frame_offset
,
pkt
->
dts
,
0
,
AVINDEX_KEYFRAME
);
0
,
0
,
AVINDEX_KEYFRAME
);
}
av_free_packet
(
pkt
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录