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

added record suffix

Browse source
This commit is contained in:
Roman Arutyunyan 2012-04-11 18:30:29 +04:00
parent b61d811f96
commit c9eb30083e
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ngx_rtmp_record_module.c
View file

@ -31,6 +31,7 @@ typedef struct {
size_t max_size; size_t max_size;
size_t max_frames; size_t max_frames;
ngx_msec_t interval; ngx_msec_t interval;
ngx_str_t suffix;
ngx_url_t *url; ngx_url_t *url;
} ngx_rtmp_record_app_conf_t; } ngx_rtmp_record_app_conf_t;
@ -77,6 +78,13 @@ static ngx_command_t ngx_rtmp_record_commands[] = {
offsetof(ngx_rtmp_record_app_conf_t, path), offsetof(ngx_rtmp_record_app_conf_t, path),
NULL }, NULL },
{ ngx_string("record_suffix"),
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot,
NGX_RTMP_APP_CONF_OFFSET,
offsetof(ngx_rtmp_record_app_conf_t, suffix),
NULL },
{ ngx_string("record_max_size"), { ngx_string("record_max_size"),
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_size_slot, ngx_conf_set_size_slot,
@ -164,6 +172,7 @@ ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_bitmask_value(conf->flags, prev->flags, ngx_conf_merge_bitmask_value(conf->flags, prev->flags,
(NGX_CONF_BITMASK_SET|NGX_RTMP_RECORD_OFF)); (NGX_CONF_BITMASK_SET|NGX_RTMP_RECORD_OFF));
ngx_conf_merge_str_value(conf->path, prev->path, ""); ngx_conf_merge_str_value(conf->path, prev->path, "");
ngx_conf_merge_str_value(conf->suffix, prev->suffix, ".flv");
ngx_conf_merge_size_value(conf->max_size, prev->max_size, 0); ngx_conf_merge_size_value(conf->max_size, prev->max_size, 0);
ngx_conf_merge_size_value(conf->max_frames, prev->max_frames, 0); ngx_conf_merge_size_value(conf->max_frames, prev->max_frames, 0);
ngx_conf_merge_msec_value(conf->interval, prev->interval, 0); ngx_conf_merge_msec_value(conf->interval, prev->interval, 0);
@ -268,15 +277,10 @@ ngx_rtmp_record_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
p = ngx_cpymem(p, racf->path.data, p = ngx_cpymem(p, racf->path.data,
ngx_min(racf->path.len, (size_t)(l - p - 1))); ngx_min(racf->path.len, (size_t)(l - p - 1)));
*p++ = '/'; *p++ = '/';
if (l - p <= 4) {
return NGX_ERROR;
}
p = (u_char *)ngx_escape_uri(p, v->name, ngx_min(ngx_strlen(v->name), p = (u_char *)ngx_escape_uri(p, v->name, ngx_min(ngx_strlen(v->name),
(size_t)(l - p - 4)), NGX_ESCAPE_URI_COMPONENT); (size_t)(l - p)), NGX_ESCAPE_URI_COMPONENT);
*p++ = '.'; p = ngx_cpymem(p, racf->suffix.data,
*p++ = 'f'; ngx_min(racf->suffix.len, (size_t)(l - p)));
*p++ = 'l';
*p++ = 'v';
*p = 0; *p = 0;
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,

2
test/nginx.conf
View file

@ -37,6 +37,8 @@ rtmp {
#record_max_frames 4; #record_max_frames 4;
record_interval 30s; record_interval 30s;
record_suffix .this.is.flv;
on_publish http://localhost:8080/publish; on_publish http://localhost:8080/publish;
on_play http://localhost:8080/play; on_play http://localhost:8080/play;
on_record_done http://localhost:8080/record_done; on_record_done http://localhost:8080/record_done;