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

swapped a/v csid; fixed stream access packet when play_restart=off

Browse source
This commit is contained in:
Roman Arutyunyan 2013-02-10 16:55:38 +04:00
parent 5715784e7c
commit 2aabf02fe4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ngx_rtmp_live_module.c
View file

@ -377,10 +377,9 @@ ngx_rtmp_live_start(ngx_rtmp_session_t *s)
if (lacf->play_restart) {
status[nstatus++] = ngx_rtmp_create_status(s, "NetStream.Play.Start",
"status", "Start live");
status[nstatus++] = ngx_rtmp_create_sample_access(s);
}
status[nstatus++] = ngx_rtmp_create_sample_access(s);
if (lacf->publish_notify) {
status[nstatus++] = ngx_rtmp_create_status(s,
"NetStream.Play.PublishNotify",
@ -541,8 +540,8 @@ ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
s->out_buffer = 1;
}
ctx->cs[0].csid = NGX_RTMP_CSID_AUDIO;
ctx->cs[1].csid = NGX_RTMP_CSID_VIDEO;
ctx->cs[0].csid = NGX_RTMP_CSID_VIDEO;
ctx->cs[1].csid = NGX_RTMP_CSID_AUDIO;
if (!ctx->publishing && ctx->stream->active) {
ngx_rtmp_live_start(s);
@ -1043,6 +1042,7 @@ ngx_rtmp_live_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
if (!ctx->silent && !lacf->play_restart) {
ngx_rtmp_send_status(s, "NetStream.Play.Start",
"status", "Start live");
ngx_rtmp_send_sample_access(s);
}
next: