mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-04-28 10:43:45 +02:00
type error fix: accroding to the code details, ngx_rtmp_live_app_conf_t->buflen should be ngx_rtmp_live_app_conf_t->buffer. It's a flag rather than a msec config
This commit is contained in:
parent
965523f397
commit
14b56c4a5b
|
@ -47,9 +47,9 @@ static ngx_command_t ngx_rtmp_live_commands[] = {
|
||||||
|
|
||||||
{ ngx_string("buffer"),
|
{ ngx_string("buffer"),
|
||||||
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_conf_set_msec_slot,
|
ngx_conf_set_flag_slot,
|
||||||
NGX_RTMP_APP_CONF_OFFSET,
|
NGX_RTMP_APP_CONF_OFFSET,
|
||||||
offsetof(ngx_rtmp_live_app_conf_t, buflen),
|
offsetof(ngx_rtmp_live_app_conf_t, buffer),
|
||||||
NULL },
|
NULL },
|
||||||
|
|
||||||
{ ngx_string("sync"),
|
{ ngx_string("sync"),
|
||||||
|
@ -152,7 +152,7 @@ ngx_rtmp_live_create_app_conf(ngx_conf_t *cf)
|
||||||
|
|
||||||
lacf->live = NGX_CONF_UNSET;
|
lacf->live = NGX_CONF_UNSET;
|
||||||
lacf->nbuckets = NGX_CONF_UNSET;
|
lacf->nbuckets = NGX_CONF_UNSET;
|
||||||
lacf->buflen = NGX_CONF_UNSET_MSEC;
|
lacf->buffer = NGX_CONF_UNSET_MSEC;
|
||||||
lacf->sync = NGX_CONF_UNSET_MSEC;
|
lacf->sync = NGX_CONF_UNSET_MSEC;
|
||||||
lacf->idle_timeout = NGX_CONF_UNSET_MSEC;
|
lacf->idle_timeout = NGX_CONF_UNSET_MSEC;
|
||||||
lacf->interleave = NGX_CONF_UNSET;
|
lacf->interleave = NGX_CONF_UNSET;
|
||||||
|
@ -174,7 +174,7 @@ ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||||
|
|
||||||
ngx_conf_merge_value(conf->live, prev->live, 0);
|
ngx_conf_merge_value(conf->live, prev->live, 0);
|
||||||
ngx_conf_merge_value(conf->nbuckets, prev->nbuckets, 1024);
|
ngx_conf_merge_value(conf->nbuckets, prev->nbuckets, 1024);
|
||||||
ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 0);
|
ngx_conf_merge_value(conf->buffer, prev->buffer, 0);
|
||||||
ngx_conf_merge_msec_value(conf->sync, prev->sync, 300);
|
ngx_conf_merge_msec_value(conf->sync, prev->sync, 300);
|
||||||
ngx_conf_merge_msec_value(conf->idle_timeout, prev->idle_timeout, 0);
|
ngx_conf_merge_msec_value(conf->idle_timeout, prev->idle_timeout, 0);
|
||||||
ngx_conf_merge_value(conf->interleave, prev->interleave, 0);
|
ngx_conf_merge_value(conf->interleave, prev->interleave, 0);
|
||||||
|
@ -553,7 +553,7 @@ ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
|
||||||
|
|
||||||
(*stream)->ctx = ctx;
|
(*stream)->ctx = ctx;
|
||||||
|
|
||||||
if (lacf->buflen) {
|
if (lacf->buffer) {
|
||||||
s->out_buffer = 1;
|
s->out_buffer = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ typedef struct {
|
||||||
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_flag_t idle_streams;
|
||||||
ngx_msec_t buflen;
|
ngx_flag_t buffer;
|
||||||
ngx_pool_t *pool;
|
ngx_pool_t *pool;
|
||||||
ngx_rtmp_live_stream_t *free_streams;
|
ngx_rtmp_live_stream_t *free_streams;
|
||||||
} ngx_rtmp_live_app_conf_t;
|
} ngx_rtmp_live_app_conf_t;
|
||||||
|
|
Loading…
Reference in a new issue