Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
1033f56b
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,发现更多精彩内容 >>
提交
1033f56b
编写于
1月 24, 2017
作者:
S
Steven Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avformat/hlsenc: improve to write m3u8 head block
Signed-off-by:
N
Steven Liu
<
lq@chinaffmpeg.org
>
上级
25f4f08b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
19 deletion
+15
-19
libavformat/hlsenc.c
libavformat/hlsenc.c
+15
-19
未找到文件。
libavformat/hlsenc.c
浏览文件 @
1033f56b
...
@@ -660,6 +660,19 @@ static void set_http_options(AVDictionary **options, HLSContext *c)
...
@@ -660,6 +660,19 @@ static void set_http_options(AVDictionary **options, HLSContext *c)
av_dict_set
(
options
,
"method"
,
c
->
method
,
0
);
av_dict_set
(
options
,
"method"
,
c
->
method
,
0
);
}
}
static
void
write_m3u8_head_block
(
HLSContext
*
hls
,
AVIOContext
*
out
,
int
version
,
int
target_duration
,
int64_t
sequence
)
{
avio_printf
(
out
,
"#EXTM3U
\n
"
);
avio_printf
(
out
,
"#EXT-X-VERSION:%d
\n
"
,
version
);
if
(
hls
->
allowcache
==
0
||
hls
->
allowcache
==
1
)
{
avio_printf
(
out
,
"#EXT-X-ALLOW-CACHE:%s
\n
"
,
hls
->
allowcache
==
0
?
"NO"
:
"YES"
);
}
avio_printf
(
out
,
"#EXT-X-TARGETDURATION:%d
\n
"
,
target_duration
);
avio_printf
(
out
,
"#EXT-X-MEDIA-SEQUENCE:%"
PRId64
"
\n
"
,
sequence
);
av_log
(
hls
,
AV_LOG_VERBOSE
,
"EXT-X-MEDIA-SEQUENCE:%"
PRId64
"
\n
"
,
sequence
);
}
static
int
hls_window
(
AVFormatContext
*
s
,
int
last
)
static
int
hls_window
(
AVFormatContext
*
s
,
int
last
)
{
{
HLSContext
*
hls
=
s
->
priv_data
;
HLSContext
*
hls
=
s
->
priv_data
;
...
@@ -699,21 +712,13 @@ static int hls_window(AVFormatContext *s, int last)
...
@@ -699,21 +712,13 @@ static int hls_window(AVFormatContext *s, int last)
}
}
hls
->
discontinuity_set
=
0
;
hls
->
discontinuity_set
=
0
;
avio_printf
(
out
,
"#EXTM3U
\n
"
);
write_m3u8_head_block
(
hls
,
out
,
version
,
target_duration
,
sequence
);
avio_printf
(
out
,
"#EXT-X-VERSION:%d
\n
"
,
version
);
if
(
hls
->
allowcache
==
0
||
hls
->
allowcache
==
1
)
{
avio_printf
(
out
,
"#EXT-X-ALLOW-CACHE:%s
\n
"
,
hls
->
allowcache
==
0
?
"NO"
:
"YES"
);
}
avio_printf
(
out
,
"#EXT-X-TARGETDURATION:%d
\n
"
,
target_duration
);
avio_printf
(
out
,
"#EXT-X-MEDIA-SEQUENCE:%"
PRId64
"
\n
"
,
sequence
);
if
(
hls
->
pl_type
==
PLAYLIST_TYPE_EVENT
)
{
if
(
hls
->
pl_type
==
PLAYLIST_TYPE_EVENT
)
{
avio_printf
(
out
,
"#EXT-X-PLAYLIST-TYPE:EVENT
\n
"
);
avio_printf
(
out
,
"#EXT-X-PLAYLIST-TYPE:EVENT
\n
"
);
}
else
if
(
hls
->
pl_type
==
PLAYLIST_TYPE_VOD
)
{
}
else
if
(
hls
->
pl_type
==
PLAYLIST_TYPE_VOD
)
{
avio_printf
(
out
,
"#EXT-X-PLAYLIST-TYPE:VOD
\n
"
);
avio_printf
(
out
,
"#EXT-X-PLAYLIST-TYPE:VOD
\n
"
);
}
}
av_log
(
s
,
AV_LOG_VERBOSE
,
"EXT-X-MEDIA-SEQUENCE:%"
PRId64
"
\n
"
,
sequence
);
if
((
hls
->
flags
&
HLS_DISCONT_START
)
&&
sequence
==
hls
->
start_sequence
&&
hls
->
discontinuity_set
==
0
){
if
((
hls
->
flags
&
HLS_DISCONT_START
)
&&
sequence
==
hls
->
start_sequence
&&
hls
->
discontinuity_set
==
0
){
avio_printf
(
out
,
"#EXT-X-DISCONTINUITY
\n
"
);
avio_printf
(
out
,
"#EXT-X-DISCONTINUITY
\n
"
);
hls
->
discontinuity_set
=
1
;
hls
->
discontinuity_set
=
1
;
...
@@ -775,16 +780,7 @@ static int hls_window(AVFormatContext *s, int last)
...
@@ -775,16 +780,7 @@ static int hls_window(AVFormatContext *s, int last)
if
(
hls
->
vtt_m3u8_name
)
{
if
(
hls
->
vtt_m3u8_name
)
{
if
((
ret
=
s
->
io_open
(
s
,
&
sub_out
,
hls
->
vtt_m3u8_name
,
AVIO_FLAG_WRITE
,
&
options
))
<
0
)
if
((
ret
=
s
->
io_open
(
s
,
&
sub_out
,
hls
->
vtt_m3u8_name
,
AVIO_FLAG_WRITE
,
&
options
))
<
0
)
goto
fail
;
goto
fail
;
avio_printf
(
sub_out
,
"#EXTM3U
\n
"
);
write_m3u8_head_block
(
hls
,
sub_out
,
version
,
target_duration
,
sequence
);
avio_printf
(
sub_out
,
"#EXT-X-VERSION:%d
\n
"
,
version
);
if
(
hls
->
allowcache
==
0
||
hls
->
allowcache
==
1
)
{
avio_printf
(
sub_out
,
"#EXT-X-ALLOW-CACHE:%s
\n
"
,
hls
->
allowcache
==
0
?
"NO"
:
"YES"
);
}
avio_printf
(
sub_out
,
"#EXT-X-TARGETDURATION:%d
\n
"
,
target_duration
);
avio_printf
(
sub_out
,
"#EXT-X-MEDIA-SEQUENCE:%"
PRId64
"
\n
"
,
sequence
);
av_log
(
s
,
AV_LOG_VERBOSE
,
"EXT-X-MEDIA-SEQUENCE:%"
PRId64
"
\n
"
,
sequence
);
for
(
en
=
hls
->
segments
;
en
;
en
=
en
->
next
)
{
for
(
en
=
hls
->
segments
;
en
;
en
=
en
->
next
)
{
avio_printf
(
sub_out
,
"#EXTINF:%f,
\n
"
,
en
->
duration
);
avio_printf
(
sub_out
,
"#EXTINF:%f,
\n
"
,
en
->
duration
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录