Skip to content

Fix to update timeShiftBufferDepth based on duration #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix to update timeShiftBufferDepth based on duration #1794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion dash/ngx_rtmp_dash_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
struct tm tm;
ngx_str_t noname, *name;
ngx_uint_t i;
ngx_uint_t depth_hour, depth_min, depth_msec;
ngx_rtmp_dash_ctx_t *ctx;
ngx_rtmp_codec_ctx_t *codec_ctx;
ngx_rtmp_dash_frag_t *f;
Expand All @@ -230,6 +231,7 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
static u_char buffer[NGX_RTMP_DASH_BUFSIZE];
static u_char start_time[sizeof("1970-09-28T12:00:00Z")];
static u_char pub_time[sizeof("1970-09-28T12:00:00Z")];
static u_char buffer_depth[sizeof("PT1234H00M00.00S")];

dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
Expand Down Expand Up @@ -261,7 +263,7 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
" publishTime=\"%s\"\n" \
" minimumUpdatePeriod=\"PT%uiS\"\n" \
" minBufferTime=\"PT%uiS\"\n" \
" timeShiftBufferDepth=\"PT%uiS\"\n" \
" timeShiftBufferDepth=\"%s\"\n" \
" profiles=\"urn:hbbtv:dash:profile:isoff-live:2012," \
"urn:mpeg:dash:profile:isoff-live:2011\"\n" \
" xmlns:xsi=\"http://www.w3.org/2011/XMLSchema-instance\"\n" \
Expand Down Expand Up @@ -350,13 +352,29 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
tm.tm_mday, tm.tm_hour,
tm.tm_min, tm.tm_sec);

depth_msec = (ngx_uint_t) (
ngx_rtmp_dash_get_frag(s, ctx->nfrags - 1)->timestamp +
ngx_rtmp_dash_get_frag(s, ctx->nfrags - 1)->duration -
ngx_rtmp_dash_get_frag(s, 0)->timestamp);

depth_hour = (ngx_uint_t) (depth_msec / 3600 / 1000);
depth_msec -= depth_hour * 3600000;
depth_min = (ngx_uint_t) (depth_msec / 60 / 1000);
depth_msec -= depth_min * 60000;

ngx_sprintf(buffer_depth, "PT%dH%02dM%02d.%02dS",
depth_hour, depth_min,
(ngx_uint_t) (depth_msec / 1000),
depth_msec % 1000);

last = buffer + sizeof(buffer);

p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_HEADER,
start_time,
pub_time,
(ngx_uint_t) (dacf->fraglen / 1000),
(ngx_uint_t) (dacf->fraglen / 1000),
buffer_depth,
(ngx_uint_t) (dacf->fraglen / 250 + 1));

/*
Expand Down