diff --git a/TODO b/TODO index 50aa4dc..b064c77 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,15 @@ - add HTTP callbacks for all calls +- implement new broadcast module with typed callbacks +& make live/record modules register AMF0 callbacks in it + +publish +play +close +set_data_frame + +(implement createStream, releaseStream, deleteStream, FC* etc) - support client chunk size change @@ -12,3 +21,5 @@ - fix broken data_frame(?) - fix '..greeing line..' in log + +- changed NGX_OK/NGX_DONE to NGX_DECLINED/NGX_OK diff --git a/config b/config index 8b0cc70..30afadd 100644 --- a/config +++ b/config @@ -5,6 +5,7 @@ CORE_MODULES="$CORE_MODULES ngx_rtmp_core_module \ ngx_rtmp_access_module \ ngx_rtmp_live_module \ + ngx_rtmp_record_module \ " NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ @@ -18,4 +19,5 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ $ngx_addon_dir/ngx_rtmp_core_module.c \ $ngx_addon_dir/ngx_rtmp_access_module.c \ $ngx_addon_dir/ngx_rtmp_live_module.c \ + $ngx_addon_dir/ngx_rtmp_record_module.c \ " diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c index 298d0f0..b53fd1f 100644 --- a/ngx_rtmp_live_module.c +++ b/ngx_rtmp_live_module.c @@ -473,7 +473,7 @@ ngx_rtmp_live_publish(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, return NGX_ERROR; } - return NGX_DONE; + return NGX_OK; } @@ -685,7 +685,7 @@ ngx_rtmp_live_set_data_frame(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_rtmp_prepare_message(s, &sh, NULL, ctx->data_frame); - return NGX_DONE; + return NGX_OK; } diff --git a/ngx_rtmp_record_module.c b/ngx_rtmp_record_module.c new file mode 100644 index 0000000..4e4a5e9 --- /dev/null +++ b/ngx_rtmp_record_module.c @@ -0,0 +1,383 @@ +/* + * Copyright (c) 2012 Roman Arutyunyan + */ + + +#include +#include +#include "ngx_rtmp.h" + + +static ngx_int_t ngx_rtmp_record_postconfiguration(ngx_conf_t *cf); +static void * ngx_rtmp_record_create_app_conf(ngx_conf_t *cf); +static char * ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf, + void *parent, void *child); + + +static ngx_int_t ngx_rtmp_record_start(ngx_rtmp_session_t *s, + ngx_rtmp_header_t *h, ngx_chain_t *in); +static ngx_int_t ngx_rtmp_record_end(ngx_rtmp_session_t *s, + ngx_rtmp_header_t *h, ngx_chain_t *in); + + +static ngx_rtmp_amf0_handler_t ngx_rtmp_record_map[] = { + { ngx_string("publish"), ngx_rtmp_record_start }, + { ngx_string("releaseStream"), ngx_rtmp_record_end }, + { ngx_string("deleteStream"), ngx_rtmp_record_end }, + { ngx_string("FCPublish"), ngx_rtmp_amf0_default }, +}; + + +typedef struct { + ngx_str_t root; + size_t max_size; +} ngx_rtmp_record_app_conf_t; + + +static ngx_command_t ngx_rtmp_record_commands[] = { + + { ngx_string("record"), + 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, root), + NULL }, + + { ngx_string("record_size"), + NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_RTMP_APP_CONF_OFFSET, + offsetof(ngx_rtmp_record_app_conf_t, max_size), + NULL }, + + ngx_null_command +}; + + +static ngx_rtmp_module_t ngx_rtmp_record_module_ctx = { + NULL, /* preconfiguration */ + ngx_rtmp_record_postconfiguration, /* postconfiguration */ + NULL, /* create main configuration */ + NULL, /* init main configuration */ + NULL, /* create server configuration */ + NULL, /* merge server configuration */ + ngx_rtmp_record_create_app_conf, /* create app configuration */ + ngx_rtmp_record_merge_app_conf /* merge app configuration */ +}; + + +ngx_module_t ngx_rtmp_record_module = { + NGX_MODULE_V1, + &ngx_rtmp_record_module_ctx, /* module context */ + ngx_rtmp_record_commands, /* module directives */ + NGX_RTMP_MODULE, /* module type */ +NULL, /* init master */ + NULL, /* init module */ + NULL, /* init process */ + NULL, /* init thread */ + NULL, /* exit thread */ + NULL, /* exit process */ + NULL, /* exit master */ + NGX_MODULE_V1_PADDING +}; + + +typedef struct { + ngx_file_t file; + ngx_str_t path; + ngx_int_t counter; + ngx_time_t last; + uint32_t epoch; +} ngx_rtmp_record_ctx_t; + + +static void * +ngx_rtmp_record_create_app_conf(ngx_conf_t *cf) +{ + ngx_rtmp_record_app_conf_t *racf; + + racf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_record_app_conf_t)); + if (racf == NULL) { + return NULL; + } + + racf->max_size = NGX_CONF_UNSET; + + return racf; +} + + +static char * +ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf, void *parent, void *child) +{ + ngx_rtmp_record_app_conf_t *prev = parent; + ngx_rtmp_record_app_conf_t *conf = child; + + ngx_conf_merge_str_value(conf->root, prev->root, ""); + ngx_conf_merge_size_value(conf->max_size, prev->max_size, + (size_t)NGX_CONF_UNSET); + + return NGX_CONF_OK; +} + + +static ngx_int_t +ngx_rtmp_record_write_header(ngx_file_t *file) +{ + static u_char flv_header[] = { + 0x46, /* 'F' */ + 0x4c, /* 'L' */ + 0x56, /* 'V' */ + 0x01, /* version = 1 */ + 0x05, /* 00000 1 0 1 = has audio & video */ + 0x00, + 0x00, + 0x00, + 0x09, /* header size */ + 0x00, + 0x00, + 0x00, + 0x00 /* PreviousTagSize0 */ + }; + + return ngx_write_file(file, flv_header, sizeof(flv_header), 0) == NGX_ERROR + ? NGX_ERROR + : NGX_OK; +} + + +static ngx_int_t +ngx_rtmp_record_start(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, + ngx_chain_t *in) +{ + ngx_rtmp_record_app_conf_t *racf; + ngx_rtmp_record_ctx_t *ctx; + ngx_time_t *tod; + ngx_err_t err; + + racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module); + + if (racf == NULL || racf->root.len == 0) { + return NGX_OK; + } + + ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module); + + if (ctx == NULL) { + ctx = ngx_pcalloc(s->connection->pool, + sizeof(ngx_rtmp_record_ctx_t)); + if (ctx == NULL) { + return NGX_ERROR; + } + ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_record_module); + } + + if (ctx->path.len) { + ngx_log_error(NGX_LOG_INFO, s->connection->log, NGX_ERROR, + "record: already recording"); + return NGX_ERROR; + } + + /* create file name */ + tod = ngx_timeofday(); + ctx->path.data = ngx_pcalloc(s->connection->pool, NGX_MAX_PATH + 1); + if (ctx->path.data == NULL) { + return NGX_ERROR; + } + + if (tod->sec == ctx->last.sec + && tod->msec == ctx->last.msec) + { + ++ctx->counter; + } else { + ctx->counter = 0; + } + + ctx->last = *tod; + + /* TODO: use stream name here */ + ctx->path.len = ngx_snprintf(ctx->path.data, NGX_MAX_PATH, + "%V/rec-%T.%M.%d.flv", &racf->root, tod->sec, tod->msec, + ctx->counter) - ctx->path.data; + ctx->path.data[ctx->path.len] = 0; + + ngx_memzero(&ctx->file, sizeof(ctx->file)); + ctx->file.log = s->connection->log; + ctx->file.fd = ngx_open_file(ctx->path.data, NGX_FILE_WRONLY, + NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS); + if (ctx->file.fd == NGX_INVALID_FILE) { + err = ngx_errno; + if (err != NGX_ENOENT) { + ngx_log_error(NGX_LOG_CRIT, s->connection->log, err, + "record: failed to open file" " \"%V\" failed", + ctx->path); + } + return NGX_ERROR; + } + + ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, + "record: opened '%V'", &ctx->path); + + return ngx_rtmp_record_write_header(&ctx->file); +} + + +static ngx_int_t +ngx_rtmp_record_end(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, + ngx_chain_t *in) +{ + ngx_rtmp_record_ctx_t *ctx; + ngx_err_t err; + + ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module); + + if (ctx == NULL || ctx->path.len == 0) { + return NGX_OK; + } + + ngx_str_null(&ctx->path); + + if (ngx_close_file(ctx->file.fd) == NGX_FILE_ERROR) { + err = ngx_errno; + ngx_log_error(NGX_LOG_CRIT, s->connection->log, err, + "record: error closing file"); + } + + ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, + "record: closed"); + + return NGX_OK; +} + + +static ngx_int_t +ngx_rtmp_record_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, + ngx_chain_t *in) +{ + ngx_connection_t *c; + ngx_rtmp_record_ctx_t *ctx; + ngx_rtmp_record_app_conf_t *racf; + u_char hdr[11], *p, *ph; + uint32_t timestamp, tag_size; + + c = s->connection; + ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module); + racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module); + + if (racf == NULL || ctx == NULL || ctx->path.len == 0) { + return NGX_OK; + } + + ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0, + "record: av: mlen=%uD", h->mlen); + + if (ctx->file.offset == 0) { + ctx->epoch = h->timestamp; + } + + timestamp = h->timestamp - ctx->epoch; + + /* write tag header */ + ph = hdr; + + *ph++ = (u_char)h->type; + + p = (u_char*)&h->mlen; + *ph++ = p[2]; + *ph++ = p[1]; + *ph++ = p[0]; + + p = (u_char*)×tamp; + *ph++ = p[2]; + *ph++ = p[1]; + *ph++ = p[0]; + *ph++ = p[3]; + + *ph++ = 0; + *ph++ = 0; + *ph++ = 0; + + tag_size = (ph - hdr) + h->mlen; + + if (ngx_write_file(&ctx->file, hdr, ph - hdr, + ctx->file.offset) == NGX_ERROR) + { + return NGX_ERROR; + } + + /* write tag body; + * ngx_write_chain allocates a lot. + * we're left with plain writing */ + for(; in; in = in->next) { + if (in->buf->pos == in->buf->last) { + continue; + } + if (ngx_write_file(&ctx->file, in->buf->pos, in->buf->last + - in->buf->pos, ctx->file.offset) == NGX_ERROR) + { + return NGX_ERROR; + } + } + + /* write tag size */ + ph = hdr; + p = (u_char*)&tag_size; + *ph++ = p[3]; + *ph++ = p[2]; + *ph++ = p[1]; + *ph++ = p[0]; + + if (ngx_write_file(&ctx->file, hdr, ph - hdr, + ctx->file.offset) == NGX_ERROR) + { + return NGX_ERROR; + } + + /* watch max size */ + if (racf->max_size != (size_t)NGX_CONF_UNSET + && ctx->file.offset >= (ngx_int_t)racf->max_size) + { + ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, + "record: closed on size limit"); + ngx_rtmp_record_end(s, h, in); + } + + return NGX_OK; +} + + +static ngx_int_t +ngx_rtmp_record_postconfiguration(ngx_conf_t *cf) +{ + ngx_rtmp_core_main_conf_t *cmcf; + ngx_rtmp_handler_pt *h; + ngx_rtmp_amf0_handler_t *ch, *bh; + size_t n, ncalls; + + cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module); + + /* register event handlers */ + h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]); + *h = ngx_rtmp_record_av; + + h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]); + *h = ngx_rtmp_record_av; + + h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]); + *h = ngx_rtmp_record_end; + + /* register AMF0 callbacks */ + ncalls = sizeof(ngx_rtmp_record_map) + / sizeof(ngx_rtmp_record_map[0]); + ch = ngx_array_push_n(&cmcf->amf0, ncalls); + if (h == NULL) { + return NGX_ERROR; + } + + bh = ngx_rtmp_record_map; + for(n = 0; n < ncalls; ++n, ++ch, ++bh) { + *ch = *bh; + } + + return NGX_OK; +} diff --git a/test/nginx.conf b/test/nginx.conf index d92265f..7c52200 100644 --- a/test/nginx.conf +++ b/test/nginx.conf @@ -18,18 +18,22 @@ rtmp { server { - listen 1935; + listen 1935; chunk_size 128; max_buf 1000000; - #timestamp_fix on; + #timestamp_fix off; application helo { live on; + record /tmp/av; + + record_size 3000000; + #wait_key_frame on; # publish only from localhost