implemented static pulls

srcker · Jan 14, 2013 · 3bd6085 · 3bd6085
1 parent ba23d99
commit 3bd6085
Show file tree

Hide file tree

Showing 4 changed files with 272 additions and 77 deletions.
diff --git a/ngx_rtmp.h b/ngx_rtmp.h
@@ -214,6 +214,7 @@ typedef struct {
     /* auto-pushed? */
     unsigned                auto_pushed:1;
     unsigned                relay:1;
+    unsigned                static_relay:1;
 
     /* input stream 0 (reserved by RTMP spec)
      * is used as free chain link */

diff --git a/ngx_rtmp_auto_push_module.c b/ngx_rtmp_auto_push_module.c
@@ -401,7 +401,7 @@ ngx_rtmp_auto_push_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
     ngx_rtmp_auto_push_conf_t      *apcf;
     ngx_rtmp_auto_push_ctx_t       *ctx;
 
-    if (s->auto_pushed || s->relay) {
+    if (s->auto_pushed || (s->relay && !s->static_relay)) {
         goto next;
     }