add live stage and stage time

sunwenhao2017 · Mar 6, 2019 · 30d9565 · 30d9565
1 parent 2d13318
commit 30d9565
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 3 deletions.
diff --git a/http/ngx_http_flv_live_module.c b/http/ngx_http_flv_live_module.c
@@ -577,6 +577,9 @@ ngx_http_flv_live_handler(ngx_http_request_t *r)
 
     s->prepare_handler = ngx_http_flv_live_prepare_out_chain;
 
+    s->stage = NGX_LIVE_PLAY;
+    s->ptime = ngx_current_msec;
+
     if (ngx_rtmp_play_filter(s, &v) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }

diff --git a/ngx_live_relay_httpflv.c b/ngx_live_relay_httpflv.c
@@ -476,6 +476,9 @@ ngx_live_relay_httpflv_recv(void *request, ngx_http_request_t *hcr)
     s = request;
     status_code = ngx_http_client_status_code(hcr);
 
+    s->stage = NGX_LIVE_PLAY;
+    s->ptime = ngx_current_msec;
+
     if (status_code != NGX_HTTP_OK) {
         ngx_live_relay_httpflv_error(s, status_code);
         ngx_http_client_finalize_request(hcr, 1);
@@ -534,6 +537,9 @@ ngx_live_relay_httpflv_send_request(ngx_rtmp_session_t *s,
         { ngx_null_string,          ngx_null_string }
     };
 
+    s->stage = NGX_LIVE_CONNECT;
+    s->connect_time = ngx_current_msec;
+
     hcr = ngx_http_client_get(s->log, &request_url, headers, s);
     ngx_http_client_set_read_handler(hcr, ngx_live_relay_httpflv_recv);
 

diff --git a/ngx_live_relay_rtmp.c b/ngx_live_relay_rtmp.c
@@ -234,6 +234,9 @@ ngx_live_relay_rtmp_send_connect(ngx_rtmp_session_t *s)
     h.csid = NGX_RTMP_RELAY_CSID_AMF_INI;
     h.type = NGX_RTMP_MSG_AMF_CMD;
 
+    s->status = NGX_LIVE_CONNECT;
+    s->connect_time = ngx_current_msec;
+
     return ngx_rtmp_send_chunk_size(s, cscf->chunk_size) != NGX_OK
         || ngx_rtmp_send_ack_size(s, cscf->ack_window) != NGX_OK
         || ngx_rtmp_send_amf(s, &h, out_elts,
@@ -270,6 +273,9 @@ ngx_live_relay_rtmp_send_create_stream(ngx_rtmp_session_t *s)
     h.csid = NGX_RTMP_RELAY_CSID_AMF_INI;
     h.type = NGX_RTMP_MSG_AMF_CMD;
 
+    s->stage = NGX_LIVE_CREATE_STREAM;
+    s->create_stream_time = ngx_current_msec;
+
     return ngx_rtmp_send_amf(s, &h, out_elts,
             sizeof(out_elts) / sizeof(out_elts[0]));
 }
@@ -333,6 +339,9 @@ ngx_live_relay_rtmp_send_publish(ngx_rtmp_session_t *s)
     h.msid = NGX_RTMP_RELAY_MSID;
     h.type = NGX_RTMP_MSG_AMF_CMD;
 
+    s->stage = NGX_LIVE_PUBLISH;
+    s->ptime = ngx_current_msec;
+
     return ngx_rtmp_send_amf(s, &h, out_elts,
             sizeof(out_elts) / sizeof(out_elts[0]));
 }
@@ -406,6 +415,9 @@ ngx_live_relay_rtmp_send_play(ngx_rtmp_session_t *s)
     h.msid = NGX_RTMP_RELAY_MSID;
     h.type = NGX_RTMP_MSG_AMF_CMD;
 
+    s->stage = NGX_LIVE_PLAY;
+    s->ptime = ngx_current_msec;
+
     return ngx_rtmp_send_amf(s, &h, out_elts,
             sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK
            || ngx_rtmp_send_set_buflen(s, NGX_RTMP_RELAY_MSID,

diff --git a/ngx_rtmp.h b/ngx_rtmp.h
@@ -174,6 +174,17 @@ typedef struct ngx_live_stream_s    ngx_live_stream_t;
 typedef struct ngx_live_server_s    ngx_live_server_t;
 typedef struct ngx_rtmp_addr_conf_s ngx_rtmp_addr_conf_t;
 
+#define NGX_LIVE_INIT               0
+#define NGX_LIVE_HANDSHAKE_DONE     1
+#define NGX_LIVE_CONNECT            2
+#define NGX_LIVE_CREATE_STREAM      3
+#define NGX_LIVE_PUBLISH            4
+#define NGX_LIVE_PLAY               5
+#define NGX_LIVE_AV                 6
+#define NGX_LIVE_CLOSE              7
+
+extern char *ngx_live_stage[];
+
 struct ngx_rtmp_session_s {
     uint32_t                signature;  /* "RTMP" */ /* <-- FIXME wtf */
 
@@ -289,6 +300,19 @@ struct ngx_rtmp_session_s {
     ngx_uint_t              nframe;
     ngx_rtmp_prepared_pt    prepare_handler;
 
+    /* for trace and statistics */
+    ngx_uint_t              stage;
+    ngx_msec_t              init_time;
+    ngx_msec_t              handshake_done_time;
+    ngx_msec_t              connect_time;
+    ngx_msec_t              create_stream_time;
+    ngx_msec_t              ptime;                  /* publish or play time */
+    ngx_msec_t              first_data;             /* audio video or metadata*/
+    ngx_msec_t              first_metadata;
+    ngx_msec_t              first_audio;
+    ngx_msec_t              first_video;
+    ngx_msec_t              close_stream_time;
+
     /* circular buffer of RTMP message pointers */
     ngx_msec_t              timeout;
     uint32_t                out_bytes;

diff --git a/ngx_rtmp_cmd_module.c b/ngx_rtmp_cmd_module.c
@@ -250,8 +250,7 @@ ngx_rtmp_play_filter(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
 }
 
 ngx_int_t
-ngx_rtmp_close_stream_filter(ngx_rtmp_session_t *s,
-    ngx_rtmp_close_stream_t *v)
+ngx_rtmp_close_stream_filter(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
 {
     if (s->closed) {
         ngx_log_error(NGX_LOG_INFO, s->log, 0, "session has been closed");
@@ -415,6 +414,9 @@ ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
     s->live_server = ngx_live_create_server(&s->serverid);
 
+    s->stage = NGX_LIVE_CONNECT;
+    s->connect_time = ngx_current_msec;
+
     return ngx_rtmp_connect(s, &v);
 }
 
@@ -551,6 +553,9 @@ ngx_rtmp_cmd_create_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
     ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->log, 0, "createStream");
 
+    s->stage = NGX_LIVE_CREATE_STREAM;
+    s->create_stream_time = ngx_current_msec;
+
     return ngx_rtmp_create_stream(s, &v);
 }
 
@@ -710,6 +715,9 @@ ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
                    "publish: name='%s' args='%s' type=%s silent=%d",
                    v.name, v.args, v.type, v.silent);
 
+    s->stage = NGX_LIVE_PUBLISH;
+    s->ptime = ngx_current_msec;
+
     return ngx_rtmp_publish_filter(s, &v);
 }
 
@@ -779,6 +787,9 @@ ngx_rtmp_cmd_play_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
                    (ngx_int_t) v.duration, (ngx_int_t) v.reset,
                    (ngx_int_t) v.silent);
 
+    s->stage = NGX_LIVE_PLAY;
+    s->ptime = ngx_current_msec;
+
     return ngx_rtmp_play_filter(s, &v);
 }
 
@@ -913,6 +924,9 @@ static ngx_int_t
 ngx_rtmp_cmd_disconnect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
                         ngx_chain_t *in)
 {
+    s->stage = NGX_LIVE_CLOSE;
+    s->close_stream_time = ngx_current_msec;
+
     ngx_log_error(NGX_LOG_INFO, s->log, 0, "disconnect");
 
     return ngx_rtmp_disconnect(s);

diff --git a/ngx_rtmp_handshake.c b/ngx_rtmp_handshake.c
@@ -371,6 +371,9 @@ ngx_rtmp_handshake_done(ngx_rtmp_session_t *s)
         return;
     }
 
+    s->stage = NGX_LIVE_HANDSHAKE_DONE;
+    s->handshake_done_time = ngx_current_msec;
+
     ngx_rtmp_cycle(s);
 }
 

diff --git a/ngx_rtmp_init.c b/ngx_rtmp_init.c
@@ -27,6 +27,18 @@ typedef struct {
 } ngx_rtmp_error_log_ctx_t;
 
 
+char *ngx_live_stage[] = {
+    "init",
+    "handshake_done",
+    "connect",
+    "create_stream",
+    "publish",
+    "play",
+    "audio_video",
+    "close_stream",
+};
+
+
 void
 ngx_rtmp_init_connection(ngx_connection_t *c)
 {
@@ -185,7 +197,8 @@ ngx_rtmp_log_error(ngx_log_t *log, u_char *buf, size_t len)
         return p;
     }
 
-    p = ngx_snprintf(buf, len, ", server: %V, session: %p", s->addr_text, s);
+    p = ngx_snprintf(buf, len, ", server: %V, session: %p, stage: %s",
+            s->addr_text, s, ngx_live_stage[s->stage]);
     len -= p - buf;
     buf = p;
 
@@ -645,6 +658,9 @@ ngx_rtmp_create_session(ngx_rtmp_addr_conf_t *addr_conf)
     s->log->handler = ngx_rtmp_log_error;
     s->log->data = ctx;
 
+    s->stage = NGX_LIVE_INIT;
+    s->init_time = ngx_current_msec;
+
     return s;
 
 destroy:

diff --git a/ngx_rtmp_monitor_module.c b/ngx_rtmp_monitor_module.c
@@ -203,6 +203,21 @@ ngx_rtmp_monitor_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
     return NGX_OK;
 }
 
+static ngx_int_t
+ngx_rtmp_monitor_meta_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    if (s->first_metadata == 0) {
+        s->stage = NGX_LIVE_AV;
+        s->first_metadata = ngx_current_msec;
+        s->first_data = s->first_data == 0? ngx_current_msec: s->first_data;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->log, 0, "receive metadata");
+
+    return NGX_OK;
+}
+
 static ngx_int_t
 ngx_rtmp_monitor_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
 {
@@ -229,6 +244,34 @@ ngx_rtmp_monitor_frame(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
     ngx_rtmp_monitor_app_conf_t    *macf;
     ngx_rtmp_monitor_ctx_t         *ctx;
 
+    if (s->first_audio == 0 && h->type == NGX_RTMP_MSG_AUDIO) {
+        s->stage = NGX_LIVE_AV;
+        s->first_audio = ngx_current_msec;
+        s->first_data = s->first_data == 0? ngx_current_msec: s->first_data;
+    }
+
+    if (s->first_video == 0 && h->type == NGX_RTMP_MSG_VIDEO) {
+        s->stage = NGX_LIVE_AV;
+        s->first_video = ngx_current_msec;
+        s->first_data = s->first_data == 0? ngx_current_msec: s->first_data;
+    }
+
+    if (h->type == NGX_RTMP_MSG_AUDIO && is_header) {
+        if (s->publishing) {
+            ngx_log_error(NGX_LOG_INFO, s->log, 0, "receive audio header");
+        } else {
+            ngx_log_error(NGX_LOG_INFO, s->log, 0, "send audio header");
+        }
+    }
+
+    if (h->type == NGX_RTMP_MSG_VIDEO && is_header) {
+        if (s->publishing) {
+            ngx_log_error(NGX_LOG_INFO, s->log, 0, "receive video header");
+        } else {
+            ngx_log_error(NGX_LOG_INFO, s->log, 0, "send video header");
+        }
+    }
+
     if (h->type != NGX_RTMP_MSG_VIDEO) {
         return;
     }
@@ -354,6 +397,7 @@ ngx_rtmp_monitor_postconfiguration(ngx_conf_t *cf)
 {
     ngx_rtmp_core_main_conf_t          *cmcf;
     ngx_rtmp_handler_pt                *h;
+    ngx_rtmp_amf_handler_t             *ch;
 
     cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
 
@@ -363,6 +407,20 @@ ngx_rtmp_monitor_postconfiguration(ngx_conf_t *cf)
     h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
     *h = ngx_rtmp_monitor_av;
 
+    /* register metadata handler */
+    ch = ngx_array_push(&cmcf->amf);
+    if (ch == NULL) {
+        return NGX_ERROR;
+    }
+    ngx_str_set(&ch->name, "@setDataFrame");
+    ch->handler = ngx_rtmp_monitor_meta_data;
+
+    ch = ngx_array_push(&cmcf->amf);
+    if (ch == NULL) {
+        return NGX_ERROR;
+    }
+    ngx_str_set(&ch->name, "onMetaData");
+    ch->handler = ngx_rtmp_monitor_meta_data;
 
     next_close_stream = ngx_rtmp_close_stream;
     ngx_rtmp_close_stream = ngx_rtmp_monitor_close_stream;
-Original file line number
+Diff line change
@@ Expand Up / @@ -371,6 +371,9 @@ ngx_rtmp_handshake_done(ngx_rtmp_session_t *s) @@
             return;
         }
+        s->stage = NGX_LIVE_HANDSHAKE_DONE;
+        s->handshake_done_time = ngx_current_msec;
         ngx_rtmp_cycle(s);
     }
@@ Expand Down @@