zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-06-29 08:18:58 +02:00
Code Issues Projects Releases Wiki Activity

added blocks to sender shortcuts to escape msvc complains about late variable declarations

Browse source
This commit is contained in:
Roman Arutyunyan 2013-06-11 22:19:05 +04:00
parent 248335216a
commit cb2a18a3ec
1 changed files with 62 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ngx_rtmp_send.c
View file

@ -74,12 +74,14 @@ 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, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"chunk_size=%uD", chunk_size); "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);
} }
}
ngx_int_t ngx_int_t
@ -96,12 +98,14 @@ ngx_rtmp_create_abort(ngx_rtmp_session_t *s, uint32_t csid)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: abort csid=%uD", csid); "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);
} }
}
ngx_int_t ngx_int_t
@ -118,12 +122,14 @@ ngx_rtmp_create_ack(ngx_rtmp_session_t *s, uint32_t seq)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: ack seq=%uD", seq); "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);
} }
}
ngx_int_t ngx_int_t
@ -140,12 +146,14 @@ 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, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: ack_size=%uD", ack_size); "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);
} }
}
ngx_int_t ngx_int_t
@ -164,6 +172,7 @@ ngx_rtmp_create_bandwidth(ngx_rtmp_session_t *s, uint32_t ack_size,
"create: bandwidth ack_size=%uD limit=%d", "create: bandwidth ack_size=%uD limit=%d",
ack_size, (int)limit_type); 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_OUT4(ack_size);
@ -171,6 +180,7 @@ ngx_rtmp_create_bandwidth(ngx_rtmp_session_t *s, uint32_t ack_size,
NGX_RTMP_USER_END(s); NGX_RTMP_USER_END(s);
} }
}
ngx_int_t ngx_int_t
@ -190,12 +200,14 @@ ngx_rtmp_create_stream_begin(ngx_rtmp_session_t *s, uint32_t msid)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: stream_begin msid=%uD", msid); "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);
} }
}
ngx_int_t ngx_int_t
@ -212,12 +224,14 @@ ngx_rtmp_create_stream_eof(ngx_rtmp_session_t *s, uint32_t msid)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: stream_end msid=%uD", msid); "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);
} }
}
ngx_int_t ngx_int_t
@ -234,12 +248,14 @@ ngx_rtmp_create_stream_dry(ngx_rtmp_session_t *s, uint32_t msid)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: stream_dry msid=%uD", msid); "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);
} }
}
ngx_int_t ngx_int_t
@ -258,6 +274,7 @@ ngx_rtmp_create_set_buflen(ngx_rtmp_session_t *s, uint32_t msid,
"create: set_buflen msid=%uD buflen=%uD", "create: set_buflen msid=%uD buflen=%uD",
msid, buflen_msec); 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(msid);
@ -265,6 +282,7 @@ ngx_rtmp_create_set_buflen(ngx_rtmp_session_t *s, uint32_t msid,
NGX_RTMP_USER_END(s); NGX_RTMP_USER_END(s);
} }
}
ngx_int_t ngx_int_t
@ -282,12 +300,14 @@ ngx_rtmp_create_recorded(ngx_rtmp_session_t *s, uint32_t msid)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: recorded msid=%uD", msid); "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);
} }
}
ngx_int_t ngx_int_t
@ -304,12 +324,14 @@ ngx_rtmp_create_ping_request(ngx_rtmp_session_t *s, uint32_t timestamp)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: ping_request timestamp=%uD", timestamp); "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);
} }
}
ngx_int_t ngx_int_t
@ -326,12 +348,14 @@ ngx_rtmp_create_ping_response(ngx_rtmp_session_t *s, uint32_t timestamp)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"create: ping_response timestamp=%uD", timestamp); "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);
} }
}
ngx_int_t ngx_int_t