From cb2a18a3ec5d0577cf6abc635b0c90dcf0eeeccc Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Tue, 11 Jun 2013 22:19:05 +0400 Subject: [PATCH] added blocks to sender shortcuts to escape msvc complains about late variable declarations --- ngx_rtmp_send.c | 100 ++++++++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 38 deletions(-) diff --git a/ngx_rtmp_send.c b/ngx_rtmp_send.c index 772a2a4..a4005c3 100644 --- a/ngx_rtmp_send.c +++ b/ngx_rtmp_send.c @@ -74,11 +74,13 @@ ngx_rtmp_create_chunk_size(ngx_rtmp_session_t *s, uint32_t chunk_size) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "chunk_size=%uD", chunk_size); - NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE); + { + NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE); - NGX_RTMP_USER_OUT4(chunk_size); + NGX_RTMP_USER_OUT4(chunk_size); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -96,11 +98,13 @@ ngx_rtmp_create_abort(ngx_rtmp_session_t *s, uint32_t csid) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: abort csid=%uD", csid); - NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE); + { + NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE); - NGX_RTMP_USER_OUT4(csid); + NGX_RTMP_USER_OUT4(csid); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -118,11 +122,13 @@ ngx_rtmp_create_ack(ngx_rtmp_session_t *s, uint32_t seq) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: ack seq=%uD", seq); - NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK); + { + NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK); - NGX_RTMP_USER_OUT4(seq); + NGX_RTMP_USER_OUT4(seq); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -140,11 +146,13 @@ ngx_rtmp_create_ack_size(ngx_rtmp_session_t *s, uint32_t ack_size) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: ack_size=%uD", ack_size); - NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK_SIZE); + { + NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK_SIZE); - NGX_RTMP_USER_OUT4(ack_size); + NGX_RTMP_USER_OUT4(ack_size); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -164,12 +172,14 @@ ngx_rtmp_create_bandwidth(ngx_rtmp_session_t *s, uint32_t ack_size, "create: bandwidth ack_size=%uD limit=%d", ack_size, (int)limit_type); - NGX_RTMP_USER_START(s, NGX_RTMP_MSG_BANDWIDTH); + { + NGX_RTMP_USER_START(s, NGX_RTMP_MSG_BANDWIDTH); - NGX_RTMP_USER_OUT4(ack_size); - NGX_RTMP_USER_OUT1(limit_type); + NGX_RTMP_USER_OUT4(ack_size); + NGX_RTMP_USER_OUT1(limit_type); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -190,11 +200,13 @@ ngx_rtmp_create_stream_begin(ngx_rtmp_session_t *s, uint32_t msid) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: stream_begin msid=%uD", msid); - NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_BEGIN); + { + NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_BEGIN); - NGX_RTMP_USER_OUT4(msid); + NGX_RTMP_USER_OUT4(msid); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -212,11 +224,13 @@ ngx_rtmp_create_stream_eof(ngx_rtmp_session_t *s, uint32_t msid) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: stream_end msid=%uD", msid); - NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_EOF); + { + NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_EOF); - NGX_RTMP_USER_OUT4(msid); + NGX_RTMP_USER_OUT4(msid); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -234,11 +248,13 @@ ngx_rtmp_create_stream_dry(ngx_rtmp_session_t *s, uint32_t msid) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: stream_dry msid=%uD", msid); - NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_DRY); + { + NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_DRY); - NGX_RTMP_USER_OUT4(msid); + NGX_RTMP_USER_OUT4(msid); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -258,12 +274,14 @@ ngx_rtmp_create_set_buflen(ngx_rtmp_session_t *s, uint32_t msid, "create: set_buflen msid=%uD buflen=%uD", msid, buflen_msec); - NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_SET_BUFLEN); + { + NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_SET_BUFLEN); - NGX_RTMP_USER_OUT4(msid); - NGX_RTMP_USER_OUT4(buflen_msec); + NGX_RTMP_USER_OUT4(msid); + NGX_RTMP_USER_OUT4(buflen_msec); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -282,11 +300,13 @@ ngx_rtmp_create_recorded(ngx_rtmp_session_t *s, uint32_t msid) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: recorded msid=%uD", msid); - NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_RECORDED); + { + NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_RECORDED); - NGX_RTMP_USER_OUT4(msid); + NGX_RTMP_USER_OUT4(msid); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -304,11 +324,13 @@ ngx_rtmp_create_ping_request(ngx_rtmp_session_t *s, uint32_t timestamp) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: ping_request timestamp=%uD", timestamp); - NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_REQUEST); + { + NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_REQUEST); - NGX_RTMP_USER_OUT4(timestamp); + NGX_RTMP_USER_OUT4(timestamp); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } } @@ -326,11 +348,13 @@ ngx_rtmp_create_ping_response(ngx_rtmp_session_t *s, uint32_t timestamp) ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "create: ping_response timestamp=%uD", timestamp); - NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_RESPONSE); + { + NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_RESPONSE); - NGX_RTMP_USER_OUT4(timestamp); + NGX_RTMP_USER_OUT4(timestamp); - NGX_RTMP_USER_END(s); + NGX_RTMP_USER_END(s); + } }