From b4ee055393163a5cd811a838e3b9a9ab42ec5afe Mon Sep 17 00:00:00 2001 From: Benedict Endemann Date: Fri, 20 Apr 2018 13:02:34 +0200 Subject: [PATCH 1/5] Added millisecond accuracy to EXT-X-PROGRAM-DATE-TIME to become more compatible to: https://tools.ietf.org/html/draft-pantos-http-live-streaming-23#section-4.3.2.6 (see "EXT-X-PROGRAM-DATE-TIME tags SHOULD provide millisecond accuracy."). --- hls/ngx_rtmp_hls_module.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hls/ngx_rtmp_hls_module.c b/hls/ngx_rtmp_hls_module.c index fbf2bcb..48e8e3b 100644 --- a/hls/ngx_rtmp_hls_module.c +++ b/hls/ngx_rtmp_hls_module.c @@ -914,12 +914,13 @@ ngx_rtmp_hls_get_fragment_datetime(ngx_rtmp_session_t *s, uint64_t ts) msec += (ts / 90); ngx_gmtime(msec / 1000, &tm); - datetime->data = (u_char *) ngx_pcalloc(s->connection->pool, ngx_cached_http_log_iso8601.len * sizeof(u_char)); - (void) ngx_sprintf(datetime->data, "%4d-%02d-%02dT%02d:%02d:%02d-00:00", + datetime->len = sizeof("1970-01-01T00:00:00.000-00:00") - 1; + datetime->data = (u_char *) ngx_pcalloc(s->connection->pool, datetime->len * sizeof(u_char)); + (void) ngx_sprintf(datetime->data, "%4d-%02d-%02dT%02d:%02d:%02d.%03d-00:00", tm.ngx_tm_year, tm.ngx_tm_mon, tm.ngx_tm_mday, tm.ngx_tm_hour, - tm.ngx_tm_min, tm.ngx_tm_sec); - datetime->len = ngx_cached_http_log_iso8601.len; + tm.ngx_tm_min, tm.ngx_tm_sec, + msec % 1000); return datetime; case NGX_RTMP_HLS_DATETIME_SYSTEM: From 00fd6cfa532e085993c47e8073f3ec2de54b2bf9 Mon Sep 17 00:00:00 2001 From: Quentin Renard Date: Sun, 17 Feb 2019 11:09:10 +0100 Subject: [PATCH 2/5] Fix fallthrough --- ngx_rtmp_eval.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ngx_rtmp_eval.c b/ngx_rtmp_eval.c index 1e5195a..c658f14 100644 --- a/ngx_rtmp_eval.c +++ b/ngx_rtmp_eval.c @@ -166,6 +166,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out, state = ESCAPE; continue; } + /* fall through */ case ESCAPE: ngx_rtmp_eval_append(&b, &c, 1, log); From b2049f3c39dc0abd65cd2670af7e3a976eb80b62 Mon Sep 17 00:00:00 2001 From: ssamjh Date: Sat, 4 May 2019 13:55:18 +1200 Subject: [PATCH 3/5] Fix URL (attempt 2) --- doc/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/getting_started.md b/doc/getting_started.md index ff4a578..fe95a60 100644 --- a/doc/getting_started.md +++ b/doc/getting_started.md @@ -9,7 +9,7 @@ $ cd /usr/build Download & unpack latest nginx-rtmp (you can also use http) ```sh -$ git clone git://github.com/arut/nginx-rtmp-module.git +$ git clone git://github.com/sergey-dryabzhinsky/nginx-rtmp-module ``` Download & unpack nginx (you can also use svn) From ce5a10a0d1a1fadcd63831e6fc7596b269c940a9 Mon Sep 17 00:00:00 2001 From: adrian Date: Wed, 3 Jul 2019 15:42:04 +1200 Subject: [PATCH 4/5] Aglin case use with Adobe FMS --- ngx_rtmp_live_module.c | 6 +++--- ngx_rtmp_send.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c index 8380d94..73d67be 100644 --- a/ngx_rtmp_live_module.c +++ b/ngx_rtmp_live_module.c @@ -1227,7 +1227,7 @@ ngx_rtmp_live_on_fi(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, { NGX_RTMP_AMF_STRING, ngx_null_string, - "onFi", 0 }, + "onFI", 0 }, { NGX_RTMP_AMF_MIXED_ARRAY, ngx_null_string, @@ -1254,7 +1254,7 @@ ngx_rtmp_live_on_fi(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, if (res == NGX_OK) { ngx_log_error(NGX_LOG_DEBUG, s->connection->log, 0, - "live: onFi: date='%s', time='%s'", + "live: onFI: date='%s', time='%s'", v.date, v.time); out_dt_elts[0].data = v.date; @@ -1513,7 +1513,7 @@ ngx_rtmp_live_postconfiguration(ngx_conf_t *cf) ch->handler = ngx_rtmp_live_on_cue_point; ch = ngx_array_push(&cmcf->amf); - ngx_str_set(&ch->name, "onFi"); + ngx_str_set(&ch->name, "onFI"); ch->handler = ngx_rtmp_live_on_fi; ch = ngx_array_push(&cmcf->amf); diff --git a/ngx_rtmp_send.c b/ngx_rtmp_send.c index 69dfed9..316df69 100644 --- a/ngx_rtmp_send.c +++ b/ngx_rtmp_send.c @@ -895,7 +895,7 @@ ngx_rtmp_create_fi(ngx_rtmp_session_t *s) { NGX_RTMP_AMF_STRING, ngx_null_string, - "onFi", 0 }, + "onFI", 0 }, { NGX_RTMP_AMF_NUMBER, ngx_null_string, From a0a55be8872b2c41bacf57751090d0fdac8362aa Mon Sep 17 00:00:00 2001 From: southernsun Date: Thu, 23 Apr 2020 08:57:00 +0200 Subject: [PATCH 5/5] Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d53d0e6..b5e26fe 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ streaming. While this feature can be enabled through rtmp_auto_push on|off direc application big { live on; - # On every pusblished stream run this command (ffmpeg) + # On every published stream run this command (ffmpeg) # with substitutions: $app/${app}, $name/${name} for application & stream name. # # This ffmpeg call receives stream from this application &