[dev] recover the gop cache feature.

Author: winshining

ngx_http_flv_live_module.c

@@ -10,7 +10,6 @@
 #include "ngx_rtmp_relay_module.h"
 #include "ngx_rtmp_notify_module.h"
 #include "ngx_rtmp_bandwidth.h"
-#include "ngx_rtmp_gop_cache_module.h"
 
 
 static ngx_rtmp_play_pt         next_play;
@@ -28,6 +27,8 @@ static void ngx_http_flv_live_cleanup(void *data);
 static ngx_int_t ngx_http_flv_live_init_process(ngx_cycle_t *cycle);
 
 static void ngx_http_flv_live_send_tail(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_http_flv_live_send_message(ngx_rtmp_session_t *s,
+        ngx_chain_t *out, ngx_uint_t priority);
 static ngx_chain_t *ngx_http_flv_live_meta_message(ngx_rtmp_session_t *,
         ngx_chain_t *in);
 static ngx_chain_t *ngx_http_flv_live_append_message(ngx_rtmp_session_t *s,
@@ -951,10 +952,6 @@ ngx_http_flv_live_send_message(ngx_rtmp_session_t *s,
                 "flv live: HTTP drop message bufs='%ui', priority='%ui'",
                 nmsg, priority);
 
-        if (s->gop_cache.out[s->out_last].set) {
-            ngx_rtmp_gop_cache_exec_handler(s, s->out_last, out);
-        }
-
         return NGX_AGAIN;
     }
 
@@ -1544,14 +1541,8 @@ ngx_http_flv_live_write_handler(ngx_event_t *wev)
         if (s->out_bpos == s->out_chain->buf->last) {
             s->out_chain = s->out_chain->next;
             if (s->out_chain == NULL) {
-                if (s->gop_cache.out[s->out_pos].set) {
-                    ngx_rtmp_gop_cache_exec_handler(s, s->out_pos,
-                                                    s->out[s->out_pos]);
-                } else {
-                    cscf = ngx_rtmp_get_module_srv_conf(s,
-                                                        ngx_rtmp_core_module);
-                    ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos]);
-                }
+                cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+                ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos]);
                 s->out[s->out_pos] = NULL;
                 ++s->out_pos;
                 s->out_pos %= s->out_queue;
@@ -1876,15 +1867,6 @@ ngx_http_flv_live_init_session(ngx_http_request_t *r,
         return NULL;
     }
 
-    s->gop_cache.out = ngx_pcalloc(s->out_pool,
-                        sizeof(ngx_rtmp_gop_cache_free_t)
-                        * ((ngx_rtmp_core_srv_conf_t *)
-                           addr_conf->default_server->ctx->srv_conf
-                           [ngx_rtmp_core_module.ctx_index])->out_queue);
-    if (s->gop_cache.out == NULL) {
-        return NULL;
-    }
-
     s->in_streams_pool = ngx_create_pool(4096, c->log);
     if (s->in_streams_pool == NULL) {
         return NULL;
@@ -1907,7 +1889,6 @@ ngx_http_flv_live_init_session(ngx_http_request_t *r,
     s->epoch = ngx_current_msec;
     s->timeout = cscf->timeout;
     s->buflen = cscf->buflen;
-    s->gop_cache.count = 0;
     ngx_rtmp_set_chunk_size(s, NGX_RTMP_DEFAULT_CHUNK_SIZE);
 
     if (ngx_rtmp_fire_event(s, NGX_RTMP_CONNECT, NULL, NULL) != NGX_OK) {
@@ -2201,9 +2182,7 @@ ngx_http_flv_live_close_session_handler(ngx_rtmp_session_t *s)
     }
 
     while (s->out_pos != s->out_last) {
-        if (!s->gop_cache.out[s->out_pos].set) {
-            ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos]);
-        }
+        ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos]);
 
         s->out_pos++;
         s->out_pos %= s->out_queue;

ngx_http_flv_live_module.h

@@ -74,8 +74,6 @@ ngx_chain_t *ngx_http_flv_live_append_shared_bufs(
         ngx_rtmp_header_t *h,
         ngx_chain_t *in,
         ngx_flag_t chunked);
-ngx_int_t ngx_http_flv_live_send_message(ngx_rtmp_session_t *s,
-        ngx_chain_t *out, ngx_uint_t priority);
 
 
 #endif

ngx_rtmp.c

@@ -1321,12 +1321,6 @@ ngx_rtmp_set_virtual_server(ngx_rtmp_session_t *s, ngx_str_t *host)
                         cscf->ctx->srv_conf[ngx_rtmp_core_module
                             .ctx_index])->out_queue);
 
-        s->gop_cache.out = ngx_pcalloc(s->out_pool,
-                    sizeof(ngx_rtmp_gop_cache_free_t)
-                    * ((ngx_rtmp_core_srv_conf_t *)
-                        cscf->ctx->srv_conf[ngx_rtmp_core_module
-                            .ctx_index])->out_queue);
-
         s->out_queue = cscf->out_queue;
     }
 

ngx_rtmp.h

@@ -265,20 +265,6 @@ typedef struct {
 #endif
 
 
-typedef void (*free_message_pt)(ngx_rtmp_session_t *s, ngx_chain_t *in);
-
-typedef struct {
-    free_message_pt  free;
-    ngx_flag_t       set;
-} ngx_rtmp_gop_cache_free_t;
-
-
-typedef struct {
-    ngx_rtmp_gop_cache_free_t  *out;
-    ngx_uint_t                  count;
-} ngx_rtmp_gop_cache_handler_t;
-
-
 struct ngx_rtmp_session_s {
     uint32_t                       signature;  /* "RTMP" */ /* <-- FIXME wtf */
 
@@ -396,8 +382,6 @@ struct ngx_rtmp_session_s {
     unsigned                       wait_notify_connect:1;
     unsigned                       wait_notify_play:1;
 
-    ngx_rtmp_gop_cache_handler_t   gop_cache;
-
     /* input stream 0 (reserved by RTMP spec)
      * is used as free chain link */