opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

implemented idle stream checker

Browse Source
This commit is contained in:
Roman Arutyunyan
2013-04-06 17:51:42 +04:00
parent 9431058e3e
commit 050a4e7586
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ngx_rtmp_live_module.c
View File

@ -98,6 +98,13 @@ static ngx_command_t ngx_rtmp_live_commands[] = {
offsetof(ngx_rtmp_live_app_conf_t, play_restart), offsetof(ngx_rtmp_live_app_conf_t, play_restart),
NULL }, NULL },
{ ngx_string("idle_streams"),
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
ngx_conf_set_flag_slot,
NGX_RTMP_APP_CONF_OFFSET,
offsetof(ngx_rtmp_live_app_conf_t, idle_streams),
NULL },
{ ngx_string("drop_idle_publisher"), { ngx_string("drop_idle_publisher"),
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1, NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
ngx_rtmp_live_set_msec_slot, ngx_rtmp_live_set_msec_slot,
@ -158,6 +165,7 @@ ngx_rtmp_live_create_app_conf(ngx_conf_t *cf)
lacf->wait_video = NGX_CONF_UNSET; lacf->wait_video = NGX_CONF_UNSET;
lacf->publish_notify = NGX_CONF_UNSET; lacf->publish_notify = NGX_CONF_UNSET;
lacf->play_restart = NGX_CONF_UNSET; lacf->play_restart = NGX_CONF_UNSET;
lacf->idle_streams = NGX_CONF_UNSET;
return lacf; return lacf;
} }
@ -180,6 +188,7 @@ ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->wait_video, prev->wait_video, 0); ngx_conf_merge_value(conf->wait_video, prev->wait_video, 0);
ngx_conf_merge_value(conf->publish_notify, prev->publish_notify, 0); ngx_conf_merge_value(conf->publish_notify, prev->publish_notify, 0);
ngx_conf_merge_value(conf->play_restart, prev->play_restart, 0); ngx_conf_merge_value(conf->play_restart, prev->play_restart, 0);
ngx_conf_merge_value(conf->idle_streams, prev->idle_streams, 1);
conf->pool = ngx_create_pool(4096, &cf->cycle->new_log); conf->pool = ngx_create_pool(4096, &cf->cycle->new_log);
if (conf->pool == NULL) { if (conf->pool == NULL) {
@ -511,7 +520,7 @@ ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"live: join '%s'", name); "live: join '%s'", name);
stream = ngx_rtmp_live_get_stream(s, name, 1); stream = ngx_rtmp_live_get_stream(s, name, publisher || lacf->idle_streams);
if (stream == NULL) { if (stream == NULL) {
return; return;
} }
@ -520,10 +529,6 @@ ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
if ((*stream)->publishing) { if ((*stream)->publishing) {
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"live: already publishing"); "live: already publishing");
ngx_rtmp_send_status(s, "NetStream.Publish.BadName", "error",
"Already publishing");
return; return;
} }
@ -552,7 +557,7 @@ ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
static ngx_int_t static ngx_int_t
ngx_rtmp_live_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v) ngx_rtmp_live_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
{ {
ngx_rtmp_live_ctx_t *ctx, **cctx; ngx_rtmp_live_ctx_t *ctx, *lctx, **cctx;
ngx_rtmp_live_stream_t **stream; ngx_rtmp_live_stream_t **stream;
ngx_rtmp_live_app_conf_t *lacf; ngx_rtmp_live_app_conf_t *lacf;
@ -586,6 +591,17 @@ ngx_rtmp_live_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
} }
} }
if (!lacf->idle_streams && ctx->publishing) {
for (lctx = ctx->stream->ctx; lctx; lctx = lctx->next) {
if (lctx == ctx) {
continue;
}
ngx_rtmp_finalize_session(lctx->session);
}
}
if (ctx->publishing || ctx->stream->active) { if (ctx->publishing || ctx->stream->active) {
ngx_rtmp_live_stop(s); ngx_rtmp_live_stop(s);
} }
@ -1018,7 +1034,9 @@ ngx_rtmp_live_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
ngx_rtmp_live_join(s, v->name, 1); ngx_rtmp_live_join(s, v->name, 1);
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module); ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
if (ctx == NULL || !ctx->publishing) { if (ctx == NULL || ctx->stream == NULL || !ctx->publishing) {
ngx_rtmp_send_status(s, "NetStream.Publish.BadName", "error",
"Cannot publish stream");
goto next; goto next;
} }
@ -1056,7 +1074,9 @@ ngx_rtmp_live_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
ngx_rtmp_live_join(s, v->name, 0); ngx_rtmp_live_join(s, v->name, 0);
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module); ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
if (ctx == NULL) { if (ctx == NULL || ctx->stream == NULL) {
ngx_rtmp_send_status(s, "NetStream.Play.StreamNotFound", "error",
"Live stream not found");
goto next; goto next;
} }

1
ngx_rtmp_live_module.h
View File

@ -65,6 +65,7 @@ typedef struct {
ngx_flag_t wait_video; ngx_flag_t wait_video;
ngx_flag_t publish_notify; ngx_flag_t publish_notify;
ngx_flag_t play_restart; ngx_flag_t play_restart;
ngx_flag_t idle_streams;
ngx_msec_t buflen; ngx_msec_t buflen;
ngx_pool_t *pool; ngx_pool_t *pool;
ngx_rtmp_live_stream_t *free_streams; ngx_rtmp_live_stream_t *free_streams;