Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
28924f4b
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 搜索 >>
提交
28924f4b
编写于
2月 19, 2018
作者:
V
Vishwanath Dixit
提交者:
Karthick Jeyapal
2月 24, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avformat/dashenc: chunk streaming support for low latency use cases
上级
ffe7cc89
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
3 deletion
+26
-3
doc/muxers.texi
doc/muxers.texi
+3
-0
libavformat/dashenc.c
libavformat/dashenc.c
+23
-3
未找到文件。
doc/muxers.texi
浏览文件 @
28924f4b
...
...
@@ -254,6 +254,9 @@ Use persistent HTTP connections. Applicable only for HTTP output.
@item -hls_playlist @var{hls_playlist}
Generate HLS playlist files as well. The master playlist is generated with the filename master.m3u8.
One media playlist file is generated for each stream with filenames media_0.m3u8, media_1.m3u8, etc.
@item -streaming @var{streaming}
Enable (1) or disable (0) chunk streaming mode of output. In chunk streaming
mode, each frame will be a moof fragment which forms a chunk.
@item -adaptation_sets @var{adaptation_sets}
Assign streams to AdaptationSets. Syntax is "id=x,streams=a,b,c id=y,streams=d,e" with x and y being the IDs
of the adaptation sets and a,b,c,d and e are the indices of the mapped streams.
...
...
libavformat/dashenc.c
浏览文件 @
28924f4b
...
...
@@ -81,6 +81,7 @@ typedef struct OutputStream {
char
bandwidth_str
[
64
];
char
codec_str
[
100
];
int
written_len
;
char
filename
[
1024
];
char
full_path
[
1024
];
char
temp_path
[
1024
];
...
...
@@ -114,6 +115,7 @@ typedef struct DASHContext {
int
master_playlist_created
;
AVIOContext
*
mpd_out
;
AVIOContext
*
m3u8_out
;
int
streaming
;
}
DASHContext
;
static
struct
codec_string
{
...
...
@@ -250,7 +252,8 @@ static int flush_dynbuf(OutputStream *os, int *range_length)
// write out to file
*
range_length
=
avio_close_dyn_buf
(
os
->
ctx
->
pb
,
&
buffer
);
os
->
ctx
->
pb
=
NULL
;
avio_write
(
os
->
out
,
buffer
,
*
range_length
);
avio_write
(
os
->
out
,
buffer
+
os
->
written_len
,
*
range_length
-
os
->
written_len
);
os
->
written_len
=
0
;
av_free
(
buffer
);
// re-open buffer
...
...
@@ -960,7 +963,10 @@ static int dash_init(AVFormatContext *s)
os
->
init_start_pos
=
0
;
if
(
!
strcmp
(
os
->
format_name
,
"mp4"
))
{
av_dict_set
(
&
opts
,
"movflags"
,
"frag_custom+dash+delay_moov"
,
0
);
if
(
c
->
streaming
)
av_dict_set
(
&
opts
,
"movflags"
,
"frag_every_frame+dash+delay_moov"
,
0
);
else
av_dict_set
(
&
opts
,
"movflags"
,
"frag_custom+dash+delay_moov"
,
0
);
}
else
{
av_dict_set_int
(
&
opts
,
"cluster_time_limit"
,
c
->
min_seg_duration
/
1000
,
0
);
av_dict_set_int
(
&
opts
,
"cluster_size_limit"
,
5
*
1024
*
1024
,
0
);
// set a large cluster size limit
...
...
@@ -1155,7 +1161,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
}
if
(
!
c
->
single_file
)
{
if
(
!
strcmp
(
os
->
format_name
,
"mp4"
))
if
(
!
strcmp
(
os
->
format_name
,
"mp4"
)
&&
!
os
->
written_len
)
write_styp
(
os
->
ctx
->
pb
);
}
else
{
snprintf
(
os
->
full_path
,
sizeof
(
os
->
full_path
),
"%s%s"
,
c
->
dirname
,
os
->
initfile
);
...
...
@@ -1318,6 +1324,19 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
av_dict_free
(
&
opts
);
}
//write out the data immediately in streaming mode
if
(
c
->
streaming
&&
!
strcmp
(
os
->
format_name
,
"mp4"
))
{
int
len
=
0
;
uint8_t
*
buf
=
NULL
;
if
(
!
os
->
written_len
)
write_styp
(
os
->
ctx
->
pb
);
avio_flush
(
os
->
ctx
->
pb
);
len
=
avio_get_dyn_buf
(
os
->
ctx
->
pb
,
&
buf
);
avio_write
(
os
->
out
,
buf
+
os
->
written_len
,
len
-
os
->
written_len
);
os
->
written_len
=
len
;
avio_flush
(
os
->
out
);
}
return
ret
;
}
...
...
@@ -1394,6 +1413,7 @@ static const AVOption options[] = {
{
"http_user_agent"
,
"override User-Agent field in HTTP header"
,
OFFSET
(
user_agent
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
0
,
0
,
E
},
{
"http_persistent"
,
"Use persistent HTTP connections"
,
OFFSET
(
http_persistent
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
E
},
{
"hls_playlist"
,
"Generate HLS playlist files(master.m3u8, media_%d.m3u8)"
,
OFFSET
(
hls_playlist
),
AV_OPT_TYPE_BOOL
,
{
.
i64
=
0
},
0
,
1
,
E
},
{
"streaming"
,
"Enable/Disable streaming mode of output. Each frame will be moof fragment"
,
OFFSET
(
streaming
),
AV_OPT_TYPE_BOOL
,
{
.
i64
=
0
},
0
,
1
,
E
},
{
NULL
},
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录