From f6af3f2343e9f192da20131ee8b8a3acb97dcbe7 Mon Sep 17 00:00:00 2001 From: azure provisioned user Date: Sat, 23 Nov 2013 10:34:10 +0000 Subject: [PATCH 1/3] fixed MPD Validation issue --- dash/ngx_rtmp_dash_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dash/ngx_rtmp_dash_module.c b/dash/ngx_rtmp_dash_module.c index 6cb7ee9..9bacc32 100644 --- a/dash/ngx_rtmp_dash_module.c +++ b/dash/ngx_rtmp_dash_module.c @@ -253,7 +253,7 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s) " minimumUpdatePeriod=\"PT%uiS\"\n" \ " minBufferTime=\"PT%uiS\"\n" \ " timeShiftBufferDepth=\"PT0H0M0.00S\"\n" \ - " suggestedPresentationDelay=\"0\"\n" \ + " suggestedPresentationDelay=\"PT0S\"\n" \ " profiles=\"urn:mpeg:dash:profile:isoff-live:2011\">\n" \ " \n" From 9227aca90d92e7d6ebd8cb5a5e64ef461111254a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Calles?= Date: Sat, 23 Nov 2013 13:42:45 +0000 Subject: [PATCH 2/3] fixed times --- dash/ngx_rtmp_dash_module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dash/ngx_rtmp_dash_module.c b/dash/ngx_rtmp_dash_module.c index 9bacc32..5c6db53 100644 --- a/dash/ngx_rtmp_dash_module.c +++ b/dash/ngx_rtmp_dash_module.c @@ -253,7 +253,7 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s) " minimumUpdatePeriod=\"PT%uiS\"\n" \ " minBufferTime=\"PT%uiS\"\n" \ " timeShiftBufferDepth=\"PT0H0M0.00S\"\n" \ - " suggestedPresentationDelay=\"PT0S\"\n" \ + " suggestedPresentationDelay=\"PT%uiS\"\n" \ " profiles=\"urn:mpeg:dash:profile:isoff-live:2011\">\n" \ " \n" @@ -356,7 +356,8 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s) start_time, end_time, (ngx_uint_t) (dacf->fraglen / 1000), - (ngx_uint_t) (dacf->fraglen / 1000)); + (ngx_uint_t) (dacf->fraglen / 1000), + (ngx_uint_t) (dacf->fraglen / 500)); n = ngx_write_fd(fd, buffer, p - buffer); From a95065b90db1c8d4e48b456f1cd03002e3a5e96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Calles?= Date: Sat, 23 Nov 2013 16:19:41 +0000 Subject: [PATCH 3/3] fixed bandwith representation --- dash/ngx_rtmp_dash_module.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dash/ngx_rtmp_dash_module.c b/dash/ngx_rtmp_dash_module.c index 5c6db53..8c86a8e 100644 --- a/dash/ngx_rtmp_dash_module.c +++ b/dash/ngx_rtmp_dash_module.c @@ -273,7 +273,7 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s) " frameRate=\"%ui\"\n" \ " sar=\"1:1\"\n" \ " startWithSAP=\"1\"\n" \ - " bandwidth=\"0\">\n" \ + " bandwidth=\"%ui\">\n" \ " \n" \ + " bandwidth=\"%ui\">\n" \ " width, codec_ctx->height, - codec_ctx->frame_rate, + codec_ctx->frame_rate, codec_ctx->width, codec_ctx->height, - codec_ctx->frame_rate, + codec_ctx->frame_rate, + (ngx_uint_t) (codec_ctx->video_data_rate * 1000), &ctx->name, &ctx->name); @@ -388,6 +389,7 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s) codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC ? "40.2" : "6b", codec_ctx->sample_rate, + (ngx_uint_t) (codec_ctx->audio_data_rate * 1000), &ctx->name, &ctx->name);