[dev] refactor the calling order of modules (developing).

Author: winshining

config

@@ -45,7 +45,6 @@ RTMP_DEPS="                                                     \
                 $ngx_addon_dir/ngx_rtmp_netcall_module.h        \
                 $ngx_addon_dir/ngx_rtmp_play_module.h           \
                 $ngx_addon_dir/ngx_rtmp_record_module.h         \
-                $ngx_addon_dir/ngx_rtmp_notify_module.h         \
                 $ngx_addon_dir/ngx_rtmp_gop_cache_module.h      \
                 $ngx_addon_dir/ngx_rtmp_relay_module.h          \
                 $ngx_addon_dir/ngx_rtmp_exec_module.h           \

ngx_http_flv_live_module.c

@@ -8,7 +8,6 @@
 #include <ngx_http.h>
 #include "ngx_http_flv_live_module.h"
 #include "ngx_rtmp_relay_module.h"
-#include "ngx_rtmp_notify_module.h"
 #include "ngx_rtmp_exec_module.h"
 #include "ngx_rtmp_bandwidth.h"
 
@@ -1201,21 +1200,15 @@ ngx_int_t
 ngx_http_flv_live_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
 {
     ngx_rtmp_live_app_conf_t        *lacf;
-    ngx_rtmp_notify_app_conf_t      *nacf;
     ngx_http_request_t              *r;
 
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-    if (lacf == NULL || !lacf->live) {
+    r = s->data;
+    if (r == NULL) {
         goto next;
     }
 
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-    if (!s->relay && nacf && nacf->url[NGX_RTMP_NOTIFY_PLAY]) {
-        s->wait_notify_play = 1;
-    }
-
-    r = s->data;
-    if (r == NULL) {
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+    if (lacf == NULL || !lacf->live) {
         goto next;
     }
 
@@ -2096,7 +2089,6 @@ ngx_http_flv_live_connect_init(ngx_rtmp_session_t *s, ngx_str_t *app,
 {
     ngx_rtmp_connect_t           v;
     ngx_http_request_t          *r;
-    ngx_rtmp_notify_srv_conf_t  *nscf;
 
     r = s->data;
 
@@ -2128,11 +2120,6 @@ ngx_http_flv_live_connect_init(ngx_rtmp_session_t *s, ngx_str_t *app,
         return NGX_ERROR;
     }
 
-    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
-    if (nscf && nscf->url[NGX_RTMP_NOTIFY_CONNECT]) {
-        s->wait_notify_connect = 1;
-    }
-
     s->stream.len = stream->len;
     s->stream.data = ngx_pstrdup(s->connection->pool, stream);
 

ngx_rtmp_notify_module.c

@@ -1,6 +1,7 @@
 
 /*
  * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Winshining
  */
 
 
@@ -12,7 +13,6 @@
 #include "ngx_rtmp_netcall_module.h"
 #include "ngx_rtmp_record_module.h"
 #include "ngx_rtmp_relay_module.h"
-#include "ngx_rtmp_notify_module.h"
 
 
 static ngx_rtmp_connect_pt                      next_connect;
@@ -48,6 +48,42 @@ ngx_str_t   ngx_rtmp_notify_urlencoded =
 #define NGX_RTMP_NOTIFY_PLAYING                 0x02
 
 
+enum {
+    NGX_RTMP_NOTIFY_CONNECT,
+    NGX_RTMP_NOTIFY_DISCONNECT,
+    NGX_RTMP_NOTIFY_SRV_MAX
+};
+
+
+enum {
+    NGX_RTMP_NOTIFY_PLAY,
+    NGX_RTMP_NOTIFY_PUBLISH,
+    NGX_RTMP_NOTIFY_PLAY_DONE,
+    NGX_RTMP_NOTIFY_PUBLISH_DONE,
+    NGX_RTMP_NOTIFY_DONE,
+    NGX_RTMP_NOTIFY_RECORD_DONE,
+    NGX_RTMP_NOTIFY_UPDATE,
+    NGX_RTMP_NOTIFY_APP_MAX
+};
+
+
+typedef struct {
+    ngx_url_t                                  *url[NGX_RTMP_NOTIFY_APP_MAX];
+    ngx_flag_t                                  active;
+    ngx_uint_t                                  method;
+    ngx_msec_t                                  update_timeout;
+    ngx_flag_t                                  update_strict;
+    ngx_flag_t                                  relay_redirect;
+    ngx_flag_t                                  no_resolve;
+} ngx_rtmp_notify_app_conf_t;
+
+
+typedef struct {
+    ngx_url_t                                  *url[NGX_RTMP_NOTIFY_SRV_MAX];
+    ngx_uint_t                                  method;
+} ngx_rtmp_notify_srv_conf_t;
+
+
 typedef struct {
     ngx_uint_t                                  flags;
     u_char                                      name[NGX_RTMP_MAX_NAME];