From 201d1b28ae84ab802e3da6a438823e8c9e18fe48 Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Tue, 17 Apr 2012 15:16:59 +0400 Subject: [PATCH] user stream start is now sent only as reply to buffer length message --- ngx_rtmp_cmd_module.c | 11 ----------- ngx_rtmp_receive.c | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ngx_rtmp_cmd_module.c b/ngx_rtmp_cmd_module.c index 6f8d93a..4181742 100644 --- a/ngx_rtmp_cmd_module.c +++ b/ngx_rtmp_cmd_module.c @@ -239,7 +239,6 @@ ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v) return ngx_rtmp_send_ack_size(s, cscf->ack_window) != NGX_OK || ngx_rtmp_send_bandwidth(s, cscf->ack_window, NGX_RTMP_LIMIT_DYNAMIC) != NGX_OK - || ngx_rtmp_send_user_stream_begin(s, 0) != NGX_OK || ngx_rtmp_send_chunk_size(s, cscf->chunk_size) != NGX_OK || ngx_rtmp_send_amf(s, &h, out_elts, sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK @@ -445,11 +444,6 @@ ngx_rtmp_cmd_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v) "publish: name='%s' type=%s", v->name, v->type); - /* start stream */ - if (ngx_rtmp_send_user_stream_begin(s, 1) != NGX_OK) { - return NGX_ERROR; - } - /* send onStatus reply */ memset(&h, 0, sizeof(h)); h.type = NGX_RTMP_MSG_AMF_CMD; @@ -723,11 +717,6 @@ ngx_rtmp_cmd_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v) v->name, (uint32_t)v->start, (uint32_t)v->duration, v->reset); - /* start stream */ - if (ngx_rtmp_send_user_stream_begin(s, 1) != NGX_OK) { - return NGX_ERROR; - } - /* send onStatus reply */ memset(&h, 0, sizeof(h)); h.type = NGX_RTMP_MSG_AMF_CMD; diff --git a/ngx_rtmp_receive.c b/ngx_rtmp_receive.c index 714e864..d622700 100644 --- a/ngx_rtmp_receive.c +++ b/ngx_rtmp_receive.c @@ -130,6 +130,8 @@ ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s, /* use =val as stream id && arg as buflen in msec*/ ngx_log_debug2(NGX_LOG_DEBUG_RTMP, c->log, 0, "msid=%uD buflen: %uD (msec)", val, arg); + + ngx_rtmp_send_user_stream_begin(s, val); } break;