Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
ffe7cc89
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,体验更适合开发者的 AI 搜索 >>
提交
ffe7cc89
编写于
2月 19, 2018
作者:
V
Vishwanath Dixit
提交者:
Karthick Jeyapal
2月 24, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avformat/dashenc: opening a segment file when its first frame is ready
上级
74afa545
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
21 deletion
+36
-21
libavformat/dashenc.c
libavformat/dashenc.c
+36
-21
未找到文件。
libavformat/dashenc.c
浏览文件 @
ffe7cc89
...
...
@@ -81,6 +81,9 @@ typedef struct OutputStream {
char
bandwidth_str
[
64
];
char
codec_str
[
100
];
char
filename
[
1024
];
char
full_path
[
1024
];
char
temp_path
[
1024
];
}
OutputStream
;
typedef
struct
DASHContext
{
...
...
@@ -1134,7 +1137,6 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
OutputStream
*
os
=
&
c
->
streams
[
i
];
AVStream
*
st
=
s
->
streams
[
i
];
char
filename
[
1024
]
=
""
,
full_path
[
1024
],
temp_path
[
1024
];
int
range_length
,
index_length
=
0
;
if
(
!
os
->
packets_written
)
...
...
@@ -1152,24 +1154,11 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
continue
;
}
if
(
!
os
->
init_range_length
)
{
flush_init_segment
(
s
,
os
);
}
if
(
!
c
->
single_file
)
{
AVDictionary
*
opts
=
NULL
;
ff_dash_fill_tmpl_params
(
filename
,
sizeof
(
filename
),
c
->
media_seg_name
,
i
,
os
->
segment_index
,
os
->
bit_rate
,
os
->
start_pts
);
snprintf
(
full_path
,
sizeof
(
full_path
),
"%s%s"
,
c
->
dirname
,
filename
);
snprintf
(
temp_path
,
sizeof
(
temp_path
),
use_rename
?
"%s.tmp"
:
"%s"
,
full_path
);
set_http_options
(
&
opts
,
c
);
ret
=
dashenc_io_open
(
s
,
&
os
->
out
,
temp_path
,
&
opts
);
if
(
ret
<
0
)
break
;
av_dict_free
(
&
opts
);
if
(
!
strcmp
(
os
->
format_name
,
"mp4"
))
write_styp
(
os
->
ctx
->
pb
);
}
else
{
snprintf
(
full_path
,
sizeof
(
full_path
),
"%s%s"
,
c
->
dirname
,
os
->
initfile
);
snprintf
(
os
->
full_path
,
sizeof
(
os
->
full_path
),
"%s%s"
,
c
->
dirname
,
os
->
initfile
);
}
ret
=
flush_dynbuf
(
os
,
&
range_length
);
...
...
@@ -1178,12 +1167,12 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
os
->
packets_written
=
0
;
if
(
c
->
single_file
)
{
find_index_range
(
s
,
full_path
,
os
->
pos
,
&
index_length
);
find_index_range
(
s
,
os
->
full_path
,
os
->
pos
,
&
index_length
);
}
else
{
dashenc_io_close
(
s
,
&
os
->
out
,
temp_path
);
dashenc_io_close
(
s
,
&
os
->
out
,
os
->
temp_path
);
if
(
use_rename
)
{
ret
=
avpriv_io_move
(
temp_path
,
full_path
);
ret
=
avpriv_io_move
(
os
->
temp_path
,
os
->
full_path
);
if
(
ret
<
0
)
break
;
}
...
...
@@ -1200,8 +1189,8 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
" bandwidth=
\"
%d
\"
"
,
os
->
bit_rate
);
}
}
add_segment
(
os
,
filename
,
os
->
start_pts
,
os
->
max_pts
-
os
->
start_pts
,
os
->
pos
,
range_length
,
index_length
);
av_log
(
s
,
AV_LOG_VERBOSE
,
"Representation %d media segment %d written to: %s
\n
"
,
i
,
os
->
segment_index
,
full_path
);
add_segment
(
os
,
os
->
filename
,
os
->
start_pts
,
os
->
max_pts
-
os
->
start_pts
,
os
->
pos
,
range_length
,
index_length
);
av_log
(
s
,
AV_LOG_VERBOSE
,
"Representation %d media segment %d written to: %s
\n
"
,
i
,
os
->
segment_index
,
os
->
full_path
);
os
->
pos
+=
range_length
;
}
...
...
@@ -1303,7 +1292,33 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
else
os
->
max_pts
=
FFMAX
(
os
->
max_pts
,
pkt
->
pts
+
pkt
->
duration
);
os
->
packets_written
++
;
return
ff_write_chained
(
os
->
ctx
,
0
,
pkt
,
s
,
0
);
if
((
ret
=
ff_write_chained
(
os
->
ctx
,
0
,
pkt
,
s
,
0
))
<
0
)
return
ret
;
if
(
!
os
->
init_range_length
)
flush_init_segment
(
s
,
os
);
//open the output context when the first frame of a segment is ready
if
(
!
c
->
single_file
&&
!
os
->
out
)
{
AVDictionary
*
opts
=
NULL
;
const
char
*
proto
=
avio_find_protocol_name
(
s
->
filename
);
int
use_rename
=
proto
&&
!
strcmp
(
proto
,
"file"
);
os
->
filename
[
0
]
=
os
->
full_path
[
0
]
=
os
->
temp_path
[
0
]
=
'\0'
;
ff_dash_fill_tmpl_params
(
os
->
filename
,
sizeof
(
os
->
filename
),
c
->
media_seg_name
,
pkt
->
stream_index
,
os
->
segment_index
,
os
->
bit_rate
,
os
->
start_pts
);
snprintf
(
os
->
full_path
,
sizeof
(
os
->
full_path
),
"%s%s"
,
c
->
dirname
,
os
->
filename
);
snprintf
(
os
->
temp_path
,
sizeof
(
os
->
temp_path
),
use_rename
?
"%s.tmp"
:
"%s"
,
os
->
full_path
);
set_http_options
(
&
opts
,
c
);
ret
=
dashenc_io_open
(
s
,
&
os
->
out
,
os
->
temp_path
,
&
opts
);
if
(
ret
<
0
)
return
ret
;
av_dict_free
(
&
opts
);
}
return
ret
;
}
static
int
dash_write_trailer
(
AVFormatContext
*
s
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录