detach http（hls） from rtmp-session

Author: im-pingo

http/ngx_http_flv_live_module.c

@@ -520,6 +520,11 @@ ngx_http_flv_live_handler(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
     s->connection = r->connection;
+    s->number = r->connection->number;
+    s->remote_addr_text.data = ngx_pcalloc(s->pool, r->connection->addr_text.len);
+    s->remote_addr_text.len = r->connection->addr_text.len;
+    ngx_memcpy(s->remote_addr_text.data,
+        r->connection->addr_text.data, r->connection->addr_text.len);
     ngx_rtmp_set_combined_log(s, r->connection->log->data,
             r->connection->log->handler);
     s->log->connection = r->connection->number;

http/ngx_http_ts_live_module.c

@@ -403,9 +403,14 @@ ngx_http_ts_live_handler(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
     s->connection = r->connection;
+    s->log->connection = c->number;
+    s->number = c->number;
+    s->remote_addr_text.data = ngx_pcalloc(s->pool, r->connection->addr_text.len);
+    s->remote_addr_text.len = r->connection->addr_text.len;
+    ngx_memcpy(s->remote_addr_text.data,
+        r->connection->addr_text.data, r->connection->addr_text.len);
     ngx_rtmp_set_combined_log(s, r->connection->log->data,
             r->connection->log->handler);
-    s->log->connection = r->connection->number;
     ctx->session = s;
 
     /* get host, app, stream name */

mpegts/ngx_hls_http_module.c

@@ -402,7 +402,7 @@ ngx_hls_http_cleanup(void *data)
     r = data;
     ctx = ngx_http_get_module_ctx(r, ngx_hls_http_module);
 
-    if (!ctx || !ctx->session) {
+    if (!ctx) {
         return;
     }
 /*
@@ -414,16 +414,19 @@ ngx_hls_http_cleanup(void *data)
     }
     ctx->out_chain = NULL;
 */
-    ctx->session->request = NULL;
-    ctx->session->connection = NULL;
+
+    if (ctx->session) {
+        ctx->session->request = NULL;
+        ctx->session->connection = NULL;
+    }
 
     ngx_log_error(NGX_LOG_DEBUG, r->connection->log, 0,
             "hls-http: cleanup_handler| http cleanup");
 
     if (ctx->frag) {
         ngx_log_error(NGX_LOG_DEBUG, r->connection->log, 0,
             "hls-http: cleanup_handler| free frag[%p]", ctx->frag);
-        ngx_hls_live_free_frag(ctx->session, ctx->frag);
+        ngx_hls_live_free_frag(ctx->frag);
         ctx->frag = NULL;
     }
 }
@@ -550,6 +553,8 @@ ngx_hls_http_create_session(ngx_http_request_t *r)
     }
     cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
 
+    s->log->connection = r->connection->number;
+    s->number = r->connection->number;
     s->live_type = NGX_HLS_LIVE;
     s->live_server = ngx_live_create_server(&s->serverid);
     s->remote_addr_text.data = ngx_pcalloc(s->pool, r->connection->addr_text.len);
@@ -586,13 +591,13 @@ ngx_hls_http_create_session(ngx_http_request_t *r)
 
     s->stage = NGX_LIVE_PLAY;
     s->ptime = ngx_current_msec;
-    s->connection = r->connection;
+//    s->connection = r->connection;
 
     if (ngx_rtmp_play_filter(s, &v) != NGX_OK) {
         return NULL;
     }
 
-//    ngx_add_timer(r->connection->write, s->timeout);
+    ngx_add_timer(r->connection->write, s->timeout);
 
     return s;
 }
@@ -631,7 +636,8 @@ ngx_hls_http_m3u8_handler(ngx_http_request_t *r, ngx_rtmp_addr_conf_t *addr_conf
         }
         s->log->connection = r->connection->number;
         s->number = r->connection->number;
-        s->sockaddr = r->connection->sockaddr;
+        s->sockaddr = ngx_pcalloc(s->pool, sizeof(struct sockaddr));
+        ngx_memcpy(s->sockaddr, r->connection->sockaddr, sizeof(struct sockaddr));
     }
 
     s->request = r;
@@ -1009,6 +1015,10 @@ ngx_hls_http_close(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_chain_t *in)
         return NGX_OK;
     }
 
+    s->request = NULL;
+    s->connection = NULL;
+    ctx->session = NULL;
+
     ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
         "hls-http: close| finalize http request");
 

mpegts/ngx_hls_live_module.c

@@ -22,6 +22,7 @@ static ngx_rtmp_close_stream_pt         next_close_stream;
 #define ngx_hls_live_prev(s, pos) (pos == 0 ? s->out_queue - 1 : pos - 1)
 
 static ngx_int_t ngx_hls_live_postconfiguration(ngx_conf_t *cf);
+static void * ngx_hls_live_create_main_conf(ngx_conf_t *cf);
 static void * ngx_hls_live_create_app_conf(ngx_conf_t *cf);
 static char * ngx_hls_live_merge_app_conf(ngx_conf_t *cf,
        void *parent, void *child);
@@ -46,11 +47,16 @@ typedef struct {
     ngx_flag_t                          cleanup;
     ngx_array_t                        *variant;
     ngx_str_t                           base_url;
-    ngx_hls_live_frag_t                *free_frag;
     ngx_pool_t                         *pool;
     ngx_msec_t                          timeout;
 } ngx_hls_live_app_conf_t;
 
+typedef struct {
+    ngx_hls_live_frag_t                *free_frag;
+    ngx_pool_t                         *pool;
+} ngx_hls_live_main_conf_t;
+
+ngx_hls_live_main_conf_t *ngx_hls_live_main_conf = NULL;
 
 #define NGX_RTMP_HLS_NAMING_SEQUENTIAL  1
 #define NGX_RTMP_HLS_NAMING_TIMESTAMP   2
@@ -173,7 +179,7 @@ static ngx_rtmp_module_t  ngx_hls_live_module_ctx = {
     NULL,                               /* preconfiguration */
     ngx_hls_live_postconfiguration,     /* postconfiguration */
 
-    NULL,                               /* create main configuration */
+    ngx_hls_live_create_main_conf,      /* create main configuration */
     NULL,                               /* init main configuration */
 
     NULL,                               /* create server configuration */
@@ -374,19 +380,13 @@ ngx_hls_live_prepare_out_chain(ngx_rtmp_session_t *s, ngx_hls_live_frag_t *frag,
     while (i < nframes && frag->content_pos != frag->content_last) {
         frame = frag->content[frag->content_pos];
 
-        cl = frame->chain;
-        while (cl) {
+        for (cl = frame->chain; cl; cl = cl->next) {
             *ll = ngx_get_chainbuf(0, 0);
-            *((*ll)->buf) = *(cl->buf);
+            (*ll)->buf->pos = cl->buf->pos;
+            (*ll)->buf->last = cl->buf->last;
             (*ll)->buf->flush = 1;
-            (*ll)->buf->memory = 1;
 
-            if (frag->content_pos == frag->content_last && cl->next == NULL) {
-                (*ll)->buf->last_in_chain = 1;
-            }
-
-            ll = &((*ll)->next);
-            cl = cl->next;
+            ll = &(*ll)->next;
         }
 
         *ll = NULL;
@@ -407,19 +407,13 @@ ngx_hls_live_prepare_frag(ngx_rtmp_session_t *s, ngx_hls_live_frag_t *frag)
     while (frag->content_pos != frag->content_last) {
         frame = frag->content[frag->content_pos];
 
-        cl = frame->chain;
-        while (cl) {
+        for (cl = frame->chain; cl; cl = cl->next) {
             *ll = ngx_get_chainbuf(0, 0);
-            *((*ll)->buf) = *(cl->buf);
-            (*ll)->buf->memory = 1;
-
-            if (frag->content_pos == frag->content_last && cl->next == NULL) {
-                (*ll)->buf->last_in_chain = 1;
-                (*ll)->buf->flush = 1;
-            }
+            (*ll)->buf->pos = cl->buf->pos;
+            (*ll)->buf->last = cl->buf->last;
+            (*ll)->buf->flush = 1;
 
-            ll = &((*ll)->next);
-            cl = cl->next;
+            ll = &(*ll)->next;
         }
 
         *ll = NULL;
@@ -494,47 +488,46 @@ ngx_hls_live_close_fragment(ngx_rtmp_session_t *s)
 
 
 void
-ngx_hls_live_free_frag(ngx_rtmp_session_t *s, ngx_hls_live_frag_t *frag)
+ngx_hls_live_free_frag(ngx_hls_live_frag_t *frag)
 {
     ngx_mpegts_frame_t        *frame;
     ngx_uint_t                 i;
-    ngx_hls_live_app_conf_t   *hacf;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_hls_live_module);
 
     frag->ref--;
 
-    ngx_log_error(NGX_LOG_DEBUG, s->log, 0,
-        "hls-live: free_frag| frag[%p] ref %ui", frag, frag->ref);
-
     if (frag->ref > 0) {
         return;
     }
 
+    ngx_log_error(NGX_LOG_DEBUG, ngx_cycle->log, 0,
+        "hls-live: free_frag| frag[%p] ref %ui", frag, frag->ref);
+
     for (i = 0; i < frag->content_last; ++i) {
         frame = frag->content[i];
         if (frame) {
             ngx_rtmp_shared_free_mpegts_frame(frame);
         }
     }
 
-    frag->next = hacf->free_frag;
-    hacf->free_frag = frag;
+    frag->next = ngx_hls_live_main_conf->free_frag;
+    ngx_hls_live_main_conf->free_frag = frag;
 }
 
 
 static ngx_hls_live_frag_t*
 ngx_hls_live_create_frag(ngx_rtmp_session_t *s) {
     ngx_hls_live_frag_t       *frag;
-    ngx_hls_live_app_conf_t   *hacf;
 
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_hls_live_module);
+    if (ngx_hls_live_main_conf->free_frag) {
+        frag = ngx_hls_live_main_conf->free_frag;
+        ngx_hls_live_main_conf->free_frag =
+            ngx_hls_live_main_conf->free_frag->next;
 
-    if (hacf->free_frag) {
-        frag = hacf->free_frag;
-        hacf->free_frag = hacf->free_frag->next;
+        ngx_memzero(frag, sizeof(ngx_hls_live_frag_t) +
+            sizeof(ngx_mpegts_frame_t*) * s->out_queue);
     } else {
-        frag = ngx_pcalloc(hacf->pool, sizeof(ngx_hls_live_frag_t) +
+        frag = ngx_pcalloc(ngx_hls_live_main_conf->pool,
+            sizeof(ngx_hls_live_frag_t) +
             sizeof(ngx_mpegts_frame_t*) * s->out_queue);
     }
 
@@ -571,7 +564,7 @@ ngx_hls_live_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
 
     ffrag = &(ctx->frags[id % (hacf->winfrags * 2 + 1)]);
     if (*ffrag) {
-        ngx_hls_live_free_frag(s, *ffrag);
+        ngx_hls_live_free_frag(*ffrag);
     }
     *ffrag = ngx_hls_live_create_frag(s);
 
@@ -587,7 +580,6 @@ ngx_hls_live_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
     ctx->opened = 1;
     ctx->frag_ts = ts;
 
-
     ngx_memzero(&patpmt, sizeof(patpmt));
     patpmt.buf = ngx_create_temp_buf(s->pool, 376);
     patpmt.buf->last = ngx_cpymem(patpmt.buf->pos,
@@ -623,7 +615,7 @@ ngx_hls_live_timeout(ngx_event_t *ev)
         return;
     }
 
-    ngx_add_timer(ev, (ctx->timeout + 3000) / 3);
+    ngx_add_timer(ev, (ctx->timeout + 3000));
 }
 
 
@@ -688,7 +680,7 @@ ngx_hls_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
     ctx->ev.log = s->log;
     ctx->timeout = hacf->timeout;
 
-    ngx_add_timer(&ctx->ev, (ctx->timeout + 3000) / 3);
+    ngx_add_timer(&ctx->ev, (ctx->timeout + 3000));
 
     return NGX_OK;
 }
@@ -753,7 +745,7 @@ ngx_hls_live_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
     for (i = 0; i < 2 * hacf->winfrags + 1; i++) {
         frag = ctx->frags[i % (hacf->winfrags * 2 + 1)];
         if (frag) {
-            ngx_hls_live_free_frag(s, frag);
+            ngx_hls_live_free_frag(frag);
         }
     }
 
@@ -866,6 +858,9 @@ ngx_hls_live_update(ngx_rtmp_session_t *s, ngx_rtmp_codec_ctx_t *codec_ctx)
     ngx_hls_live_ctx_t   *ctx;
     ngx_mpegts_frame_t   *frame;
     ngx_int_t             boundary;
+    ngx_buf_t            *b;
+
+    b = NULL;
 
     ctx = ngx_rtmp_get_module_ctx(s, ngx_hls_live_module);
 
@@ -888,8 +883,10 @@ ngx_hls_live_update(ngx_rtmp_session_t *s, ngx_rtmp_codec_ctx_t *codec_ctx)
         if (frame->type == NGX_MPEGTS_MSG_AUDIO) {
             boundary = codec_ctx->avc_header == NULL;
         } else if (frame->type == NGX_MPEGTS_MSG_VIDEO) {
+            b = ctx->aframe;
             boundary = frame->key &&
-                (codec_ctx->aac_header == NULL || !ctx->opened);
+                (codec_ctx->aac_header == NULL || !ctx->opened ||
+                (b && b->last > b->pos));
         } else {
             return NGX_ERROR;
         }
@@ -935,7 +932,7 @@ ngx_hls_live_av(ngx_rtmp_session_t *s, ngx_mpegts_frame_t *frame)
     for (ctx = live_stream->hls_ctx; ctx; ctx = ctx->next) {
         ss = ctx->session;
 
-        switch (ngx_mpegts_gop_link(s, ss, hacf->playlen, hacf->playlen)) {
+        switch (ngx_mpegts_gop_link(s, ss, 0, hacf->playlen)) {
         case NGX_DECLINED:
             continue;
         case NGX_ERROR:
@@ -957,6 +954,21 @@ ngx_hls_live_av(ngx_rtmp_session_t *s, ngx_mpegts_frame_t *frame)
     return NGX_ERROR;
 }
 
+static void *
+ngx_hls_live_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_hls_live_main_conf_t *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_hls_live_main_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->pool = ngx_create_pool(1024, ngx_cycle->log);
+    ngx_hls_live_main_conf = conf;
+
+    return conf;
+}
 
 static void *
 ngx_hls_live_create_app_conf(ngx_conf_t *cf)

mpegts/ngx_hls_live_module.h

@@ -80,7 +80,7 @@ ngx_hls_live_frag_t* ngx_hls_live_find_frag(ngx_rtmp_session_t *s,
     ngx_str_t *name);
 ngx_chain_t* ngx_hls_live_prepare_frag(ngx_rtmp_session_t *s,
     ngx_hls_live_frag_t *frag);
-void ngx_hls_live_free_frag(ngx_rtmp_session_t *s, ngx_hls_live_frag_t *frag);
+void ngx_hls_live_free_frag(ngx_hls_live_frag_t *frag);
 ngx_rtmp_session_t* ngx_hls_live_fetch_session(ngx_str_t *server,
     ngx_str_t *stream, ngx_str_t *session);
 void ngx_rtmp_shared_acquire_frag(ngx_hls_live_frag_t *frag);