fixed default values of conf params

This commit is contained in:
Roman Arutyunyan 2013-06-11 21:15:53 +04:00
parent 8553cf204b
commit e4070fb777
7 changed files with 29 additions and 29 deletions

View file

@ -1813,17 +1813,17 @@ ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf)
} }
conf->hls = NGX_CONF_UNSET; conf->hls = NGX_CONF_UNSET;
conf->fraglen = NGX_CONF_UNSET; conf->fraglen = NGX_CONF_UNSET_MSEC;
conf->max_fraglen = NGX_CONF_UNSET; conf->max_fraglen = NGX_CONF_UNSET_MSEC;
conf->muxdelay = NGX_CONF_UNSET; conf->muxdelay = NGX_CONF_UNSET_MSEC;
conf->sync = NGX_CONF_UNSET; conf->sync = NGX_CONF_UNSET_MSEC;
conf->playlen = NGX_CONF_UNSET; conf->playlen = NGX_CONF_UNSET_MSEC;
conf->continuous = NGX_CONF_UNSET; conf->continuous = NGX_CONF_UNSET;
conf->nested = NGX_CONF_UNSET; conf->nested = NGX_CONF_UNSET;
conf->naming = NGX_CONF_UNSET_UINT; conf->naming = NGX_CONF_UNSET_UINT;
conf->slicing = NGX_CONF_UNSET_UINT; conf->slicing = NGX_CONF_UNSET_UINT;
conf->max_audio_delay = NGX_CONF_UNSET; conf->max_audio_delay = NGX_CONF_UNSET_MSEC;
conf->audio_buffer_size = NGX_CONF_UNSET; conf->audio_buffer_size = NGX_CONF_UNSET_SIZE;
conf->cleanup = NGX_CONF_UNSET; conf->cleanup = NGX_CONF_UNSET;
return conf; return conf;

View file

@ -271,7 +271,7 @@ ngx_rtmp_auto_push_create_conf(ngx_cycle_t *cycle)
} }
apcf->auto_push = NGX_CONF_UNSET; apcf->auto_push = NGX_CONF_UNSET;
apcf->push_reconnect = NGX_CONF_UNSET; apcf->push_reconnect = NGX_CONF_UNSET_MSEC;
return apcf; return apcf;
} }

View file

@ -233,10 +233,10 @@ ngx_rtmp_core_create_srv_conf(ngx_conf_t *cf)
conf->so_keepalive = NGX_CONF_UNSET; conf->so_keepalive = NGX_CONF_UNSET;
conf->max_streams = NGX_CONF_UNSET; conf->max_streams = NGX_CONF_UNSET;
conf->chunk_size = NGX_CONF_UNSET; conf->chunk_size = NGX_CONF_UNSET;
conf->ack_window = NGX_CONF_UNSET; conf->ack_window = NGX_CONF_UNSET_UINT;
conf->max_message = NGX_CONF_UNSET; conf->max_message = NGX_CONF_UNSET_SIZE;
conf->out_queue = NGX_CONF_UNSET; conf->out_queue = NGX_CONF_UNSET_SIZE;
conf->out_cork = NGX_CONF_UNSET; conf->out_cork = NGX_CONF_UNSET_SIZE;
conf->play_time_fix = NGX_CONF_UNSET; conf->play_time_fix = NGX_CONF_UNSET;
conf->publish_time_fix = NGX_CONF_UNSET; conf->publish_time_fix = NGX_CONF_UNSET;
conf->busy = NGX_CONF_UNSET; conf->busy = NGX_CONF_UNSET;

View file

@ -152,9 +152,9 @@ ngx_rtmp_live_create_app_conf(ngx_conf_t *cf)
lacf->live = NGX_CONF_UNSET; lacf->live = NGX_CONF_UNSET;
lacf->meta = NGX_CONF_UNSET; lacf->meta = NGX_CONF_UNSET;
lacf->nbuckets = NGX_CONF_UNSET; lacf->nbuckets = NGX_CONF_UNSET;
lacf->buflen = NGX_CONF_UNSET; lacf->buflen = NGX_CONF_UNSET_MSEC;
lacf->sync = NGX_CONF_UNSET; lacf->sync = NGX_CONF_UNSET_MSEC;
lacf->idle_timeout = NGX_CONF_UNSET; lacf->idle_timeout = NGX_CONF_UNSET_MSEC;
lacf->interleave = NGX_CONF_UNSET; lacf->interleave = NGX_CONF_UNSET;
lacf->wait_key = NGX_CONF_UNSET; lacf->wait_key = NGX_CONF_UNSET;
lacf->wait_video = NGX_CONF_UNSET; lacf->wait_video = NGX_CONF_UNSET;

View file

@ -236,8 +236,8 @@ ngx_rtmp_notify_create_app_conf(ngx_conf_t *cf)
nacf->url[n] = NGX_CONF_UNSET_PTR; nacf->url[n] = NGX_CONF_UNSET_PTR;
} }
nacf->method = NGX_CONF_UNSET; nacf->method = NGX_CONF_UNSET_UINT;
nacf->update_timeout = NGX_CONF_UNSET; nacf->update_timeout = NGX_CONF_UNSET_MSEC;
nacf->update_strict = NGX_CONF_UNSET; nacf->update_strict = NGX_CONF_UNSET;
nacf->relay_redirect = NGX_CONF_UNSET; nacf->relay_redirect = NGX_CONF_UNSET;
@ -289,7 +289,7 @@ ngx_rtmp_notify_create_srv_conf(ngx_conf_t *cf)
nscf->url[n] = NGX_CONF_UNSET_PTR; nscf->url[n] = NGX_CONF_UNSET_PTR;
} }
nscf->method = NGX_CONF_UNSET; nscf->method = NGX_CONF_UNSET_UINT;
return nscf; return nscf;
} }

View file

@ -188,14 +188,14 @@ ngx_rtmp_record_create_app_conf(ngx_conf_t *cf)
return NULL; return NULL;
} }
racf->max_size = NGX_CONF_UNSET; racf->max_size = NGX_CONF_UNSET_SIZE;
racf->max_frames = NGX_CONF_UNSET; racf->max_frames = NGX_CONF_UNSET_SIZE;
racf->interval = NGX_CONF_UNSET; racf->interval = NGX_CONF_UNSET_MSEC;
racf->unique = NGX_CONF_UNSET; racf->unique = NGX_CONF_UNSET;
racf->append = NGX_CONF_UNSET; racf->append = NGX_CONF_UNSET;
racf->lock_file = NGX_CONF_UNSET; racf->lock_file = NGX_CONF_UNSET;
racf->notify = NGX_CONF_UNSET; racf->notify = NGX_CONF_UNSET;
racf->url = NGX_CONF_UNSET_PTR; racf->url = NGX_CONF_UNSET_PTR;
if (ngx_array_init(&racf->rec, cf->pool, 1, sizeof(void *)) != NGX_OK) { if (ngx_array_init(&racf->rec, cf->pool, 1, sizeof(void *)) != NGX_OK) {
return NULL; return NULL;

View file

@ -186,10 +186,10 @@ ngx_rtmp_relay_create_app_conf(ngx_conf_t *cf)
racf->nbuckets = 1024; racf->nbuckets = 1024;
racf->log = &cf->cycle->new_log; racf->log = &cf->cycle->new_log;
racf->buflen = NGX_CONF_UNSET; racf->buflen = NGX_CONF_UNSET_MSEC;
racf->session_relay = NGX_CONF_UNSET; racf->session_relay = NGX_CONF_UNSET;
racf->push_reconnect = NGX_CONF_UNSET; racf->push_reconnect = NGX_CONF_UNSET_MSEC;
racf->pull_reconnect = NGX_CONF_UNSET; racf->pull_reconnect = NGX_CONF_UNSET_MSEC;
return racf; return racf;
} }