mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-05-17 00:51:09 +02:00
added meta directive for turning off sending metadata
This commit is contained in:
parent
f2eadabf0e
commit
9788b1a530
|
@ -32,6 +32,13 @@ static ngx_command_t ngx_rtmp_live_commands[] = {
|
|||
offsetof(ngx_rtmp_live_app_conf_t, live),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("meta"),
|
||||
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, meta),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("stream_buckets"),
|
||||
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
|
||||
ngx_conf_set_str_slot,
|
||||
|
@ -89,6 +96,7 @@ ngx_rtmp_live_create_app_conf(ngx_conf_t *cf)
|
|||
}
|
||||
|
||||
lacf->live = NGX_CONF_UNSET;
|
||||
lacf->meta = NGX_CONF_UNSET;
|
||||
lacf->nbuckets = NGX_CONF_UNSET;
|
||||
lacf->buflen = NGX_CONF_UNSET;
|
||||
|
||||
|
@ -103,6 +111,7 @@ ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
ngx_rtmp_live_app_conf_t *conf = child;
|
||||
|
||||
ngx_conf_merge_value(conf->live, prev->live, 0);
|
||||
ngx_conf_merge_value(conf->meta, prev->meta, 1);
|
||||
ngx_conf_merge_value(conf->nbuckets, prev->nbuckets, 1024);
|
||||
ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 0);
|
||||
|
||||
|
@ -372,7 +381,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
|||
header_version = codec_ctx->avc_version;
|
||||
}
|
||||
}
|
||||
if (codec_ctx->meta) {
|
||||
if (lacf->meta && codec_ctx->meta) {
|
||||
meta = codec_ctx->meta;
|
||||
meta_version = codec_ctx->meta_version;
|
||||
}
|
||||
|
|
|
@ -58,6 +58,7 @@ typedef struct {
|
|||
ngx_int_t nbuckets;
|
||||
ngx_rtmp_live_stream_t **streams;
|
||||
ngx_flag_t live;
|
||||
ngx_flag_t meta;
|
||||
ngx_msec_t buflen;
|
||||
ngx_pool_t *pool;
|
||||
ngx_rtmp_live_stream_t *free_streams;
|
||||
|
|
Loading…
Reference in a new issue