Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
a1aa37dd
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,发现更多精彩内容 >>
提交
a1aa37dd
编写于
4月 29, 2014
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
matroskaenc: write CodecDelay
上级
1c0210c7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
25 deletion
+38
-25
libavformat/matroskaenc.c
libavformat/matroskaenc.c
+13
-0
tests/ref/lavf/mkv
tests/ref/lavf/mkv
+3
-3
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mkv
+22
-22
未找到文件。
libavformat/matroskaenc.c
浏览文件 @
a1aa37dd
...
...
@@ -78,6 +78,7 @@ typedef struct {
typedef
struct
{
int
write_dts
;
int64_t
ts_offset
;
}
mkv_track
;
#define MODE_MATROSKAv2 0x01
...
...
@@ -600,6 +601,16 @@ static int mkv_write_tracks(AVFormatContext *s)
if
(
!
(
st
->
disposition
&
AV_DISPOSITION_DEFAULT
))
put_ebml_uint
(
pb
,
MATROSKA_ID_TRACKFLAGDEFAULT
,
!!
(
st
->
disposition
&
AV_DISPOSITION_DEFAULT
));
if
(
codec
->
codec_type
==
AVMEDIA_TYPE_AUDIO
&&
codec
->
delay
)
{
mkv
->
tracks
[
i
].
ts_offset
=
av_rescale_q
(
codec
->
delay
,
(
AVRational
){
1
,
codec
->
sample_rate
},
st
->
time_base
);
put_ebml_uint
(
pb
,
MATROSKA_ID_CODECDELAY
,
av_rescale_q
(
codec
->
delay
,
(
AVRational
){
1
,
codec
->
sample_rate
},
(
AVRational
){
1
,
1000000000
}));
}
// look for a codec ID string specific to mkv to use,
// if none are found, use AVI codes
for
(
j
=
0
;
ff_mkv_codec_tags
[
j
].
id
!=
AV_CODEC_ID_NONE
;
j
++
)
{
...
...
@@ -1261,6 +1272,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
av_log
(
s
,
AV_LOG_ERROR
,
"Can't write packet with unknown timestamp
\n
"
);
return
AVERROR
(
EINVAL
);
}
ts
+=
mkv
->
tracks
[
pkt
->
stream_index
].
ts_offset
;
if
(
!
s
->
pb
->
seekable
)
{
if
(
!
mkv
->
dyn_bc
)
...
...
@@ -1312,6 +1324,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
cluster_time
=
pkt
->
dts
-
mkv
->
cluster_pts
;
else
cluster_time
=
pkt
->
pts
-
mkv
->
cluster_pts
;
cluster_time
+=
mkv
->
tracks
[
pkt
->
stream_index
].
ts_offset
;
// start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
// after 4k and on a keyframe
...
...
tests/ref/lavf/mkv
浏览文件 @
a1aa37dd
7
c21e1e6b4fe71f361564f8eebedf4e1
*./tests/data/lavf/lavf.mkv
3202
68
./tests/data/lavf/lavf.mkv
./tests/data/lavf/lavf.mkv CRC=0x
7d5
d3cda
7
53261b6299d2ef36cfba70f6e6fa848
*./tests/data/lavf/lavf.mkv
3202
75
./tests/data/lavf/lavf.mkv
./tests/data/lavf/lavf.mkv CRC=0x
be7
d3cda
tests/ref/seek/lavf-mkv
浏览文件 @
a1aa37dd
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000000 pos: 518
size: 208
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011000 pos: 525
size: 208
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st:
0 flags:1 dts: 0.011000 pts: 0.011000 pos: 734 size: 27837
ret: 0 st:
1 flags:1 dts:-0.011000 pts:-0.011000 pos: 525 size: 208
ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
56
size: 27834
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
63
size: 27834
ret: 0 st: 0 flags:0 ts: 0.788000
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
56
size: 27834
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
63
size: 27834
ret: 0 st: 0 flags:1 ts:-0.317000
ret: 0 st:
0 flags:1 dts: 0.011000 pts: 0.011000 pos: 734 size: 27837
ret: 0 st:
1 flags:1 dts:-0.011000 pts:-0.011000 pos: 525 size: 208
ret: 0 st: 1 flags:0 ts: 2.577000
ret:-EOF
ret: 0 st: 1 flags:1 ts: 1.471000
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993000 pos: 319997
size: 209
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982000 pos: 320004
size: 209
ret: 0 st:-1 flags:0 ts: 0.365002
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 1467
09
size: 27925
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 1467
16
size: 27925
ret: 0 st:-1 flags:1 ts:-0.740831
ret: 0 st:
0 flags:1 dts: 0.011000 pts: 0.011000 pos: 734 size: 27837
ret: 0 st:
1 flags:1 dts:-0.011000 pts:-0.011000 pos: 525 size: 208
ret: 0 st: 0 flags:0 ts: 2.153000
ret:-EOF
ret: 0 st: 0 flags:1 ts: 1.048000
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
56
size: 27834
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
63
size: 27834
ret: 0 st: 1 flags:0 ts:-0.058000
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000000 pos: 518
size: 208
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011000 pos: 525
size: 208
ret: 0 st: 1 flags:1 ts: 2.836000
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993000 pos: 319997
size: 209
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982000 pos: 320004
size: 209
ret: 0 st:-1 flags:0 ts: 1.730004
ret:-EOF
ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 1467
09
size: 27925
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 1467
16
size: 27925
ret: 0 st: 0 flags:0 ts:-0.482000
ret: 0 st:
0 flags:1 dts: 0.011000 pts: 0.011000 pos: 734 size: 27837
ret: 0 st:
1 flags:1 dts:-0.011000 pts:-0.011000 pos: 525 size: 208
ret: 0 st: 0 flags:1 ts: 2.413000
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
56
size: 27834
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
63
size: 27834
ret: 0 st: 1 flags:0 ts: 1.307000
ret:-EOF
ret: 0 st: 1 flags:1 ts: 0.201000
ret: 0 st: 1 flags:1 dts:
0.000000 pts: 0.000000 pos: 518
size: 208
ret: 0 st: 1 flags:1 dts:
-0.011000 pts:-0.011000 pos: 525
size: 208
ret: 0 st:-1 flags:0 ts:-0.904994
ret: 0 st:
0 flags:1 dts: 0.011000 pts: 0.011000 pos: 734 size: 27837
ret: 0 st:
1 flags:1 dts:-0.011000 pts:-0.011000 pos: 525 size: 208
ret: 0 st:-1 flags:1 ts: 1.989173
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
56
size: 27834
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
63
size: 27834
ret: 0 st: 0 flags:0 ts: 0.883000
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
56
size: 27834
ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 2921
63
size: 27834
ret: 0 st: 0 flags:1 ts:-0.222000
ret: 0 st:
0 flags:1 dts: 0.011000 pts: 0.011000 pos: 734 size: 27837
ret: 0 st:
1 flags:1 dts:-0.011000 pts:-0.011000 pos: 525 size: 208
ret: 0 st: 1 flags:0 ts: 2.672000
ret:-EOF
ret: 0 st: 1 flags:1 ts: 1.566000
ret: 0 st: 1 flags:1 dts: 0.9
93000 pts: 0.993000 pos: 319997
size: 209
ret: 0 st: 1 flags:1 dts: 0.9
82000 pts: 0.982000 pos: 320004
size: 209
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 1467
09
size: 27925
ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 1467
16
size: 27925
ret: 0 st:-1 flags:1 ts:-0.645825
ret: 0 st:
0 flags:1 dts: 0.011000 pts: 0.011000 pos: 734 size: 27837
ret: 0 st:
1 flags:1 dts:-0.011000 pts:-0.011000 pos: 525 size: 208
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录