zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-09 22:11:08 +02:00
Code Issues Projects Releases Wiki Activity

user stream start is now sent only as reply to buffer length message

Browse source
This commit is contained in:
Roman Arutyunyan 2012-04-17 15:16:59 +04:00
parent a041a9d75c
commit 201d1b28ae
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ngx_rtmp_cmd_module.c
View file

@ -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;

2
ngx_rtmp_receive.c
View file

@ -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;