opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

implemented hls target duration as max fragment length within current window

Browse Source
This commit is contained in:
Roman Arutyunyan
2013-04-15 11:31:28 +04:00
parent 5d8a534aa4
commit 05e0a68281
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hls/ngx_rtmp_hls_module.c
View File

@ -255,7 +255,7 @@ ngx_rtmp_hls_write_playlist(ngx_rtmp_session_t *s)
ngx_rtmp_hls_app_conf_t *hacf;
ngx_int_t nretry;
ngx_rtmp_hls_frag_t *f;
ngx_uint_t i;
ngx_uint_t i, max_frag;
hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
@ -283,7 +283,14 @@ retry:
return NGX_ERROR;
}
/*TODO set target duration big enough*/
max_frag = hacf->fraglen / 1000;
for (i = 0; i < ctx->nfrags; i++) {
f = ngx_rtmp_hls_get_frag(s, i);
if (f->duration > max_frag) {
max_frag = f->duration + .5;
}
}
p = ngx_snprintf(buffer, sizeof(buffer),
"#EXTM3U\n"
@ -291,7 +298,7 @@ retry:
"#EXT-X-MEDIA-SEQUENCE:%uL\n"
"#EXT-X-TARGETDURATION:%ui\n"
"#EXT-X-ALLOW-CACHE:NO\n\n",
ctx->frag, (ngx_uint_t) (hacf->fraglen / 1000));
ctx->frag, max_frag);
n = write(fd, buffer, p - buffer);
if (n < 0) {
@ -301,7 +308,7 @@ retry:
return NGX_ERROR;
}
for (i = 0; i < ctx->nfrags; ++i) {
for (i = 0; i < ctx->nfrags; i++) {
f = ngx_rtmp_hls_get_frag(s, i);
p = ngx_snprintf(buffer, sizeof(buffer),