From 32ab32f1680f051bbd3911afd60e00a9e18f7bd3 Mon Sep 17 00:00:00 2001
From: Roman Arutyunyan <arut@qip.ru>
Date: Mon, 25 Jun 2012 21:40:23 +0400
Subject: [PATCH] added stream begin/eof to play/closeStream

---
 ngx_rtmp_cmd_module.c | 56 ++++---------------------------------------
 ngx_rtmp_receive.c    |  2 +-
 2 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/ngx_rtmp_cmd_module.c b/ngx_rtmp_cmd_module.c
index 62b71c1..d9e7dcd 100644
--- a/ngx_rtmp_cmd_module.c
+++ b/ngx_rtmp_cmd_module.c
@@ -369,57 +369,7 @@ ngx_rtmp_cmd_close_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 static ngx_int_t
 ngx_rtmp_cmd_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
 {
-    ngx_rtmp_header_t               h;
-
-    static double                   trans;
-
-    static ngx_rtmp_amf_elt_t      out_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("code"),
-          "NetStream.Play.Stop", 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          "status", 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("description"),
-          "Stopping.", 0 },
-    };
-
-    static ngx_rtmp_amf_elt_t      out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "onStatus", 0 },
-
-        { NGX_RTMP_AMF_NUMBER, 
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_NULL, 
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT, 
-          ngx_null_string,
-          out_inf, sizeof(out_inf) },
-    };
-
-    /* send onStatus reply */
-    memset(&h, 0, sizeof(h));
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-    h.csid = NGX_RTMP_CMD_CSID_AMF;
-    h.msid = NGX_RTMP_CMD_MSID;
-
-    if (ngx_rtmp_send_amf(s, &h, out_elts,
-                sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
+    return ngx_rtmp_send_user_stream_eof(s, NGX_RTMP_CMD_MSID);
 }
 
 
@@ -863,6 +813,10 @@ ngx_rtmp_cmd_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
     h.csid = NGX_RTMP_CMD_CSID_AMF;
     h.msid = NGX_RTMP_CMD_MSID;
 
+    if (ngx_rtmp_send_user_stream_begin(s, NGX_RTMP_CMD_MSID) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
     if (ngx_rtmp_send_amf(s, &h, out_elts,
                 sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK)
     {
diff --git a/ngx_rtmp_receive.c b/ngx_rtmp_receive.c
index a3f1c36..49cd803 100644
--- a/ngx_rtmp_receive.c
+++ b/ngx_rtmp_receive.c
@@ -135,7 +135,7 @@ ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s,
                 ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
                         "msid=%uD buflen: %uD (msec)", val, arg);
 
-                ngx_rtmp_send_user_stream_begin(s, val);
+                /*ngx_rtmp_send_user_stream_begin(s, val);*/
             }
             break;