opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

added manual recording flag

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-09-05 14:33:21 +04:00
parent 02b9e2d4f7
commit b4e7e68ce8
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ngx_rtmp_record_module.c
View File

@ -38,6 +38,7 @@ static ngx_conf_bitmask_t ngx_rtmp_record_mask[] = {
{ ngx_string("audio"), NGX_RTMP_RECORD_AUDIO }, { ngx_string("audio"), NGX_RTMP_RECORD_AUDIO },
{ ngx_string("video"), NGX_RTMP_RECORD_VIDEO }, { ngx_string("video"), NGX_RTMP_RECORD_VIDEO },
{ ngx_string("keyframes"), NGX_RTMP_RECORD_KEYFRAMES }, { ngx_string("keyframes"), NGX_RTMP_RECORD_KEYFRAMES },
{ ngx_string("manual"), NGX_RTMP_RECORD_MANUAL },
{ ngx_null_string, 0 } { ngx_null_string, 0 }
}; };
@ -268,8 +269,6 @@ ngx_rtmp_record_open(ngx_rtmp_session_t *s, ngx_rtmp_record_node_ctx_t *rctx)
rc = rctx->conf; rc = rctx->conf;
if (rctx->file.fd != NGX_INVALID_FILE) { if (rctx->file.fd != NGX_INVALID_FILE) {
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"record: %V already opened", &rc->id);
return NGX_OK; return NGX_OK;
} }
@ -384,7 +383,7 @@ ngx_rtmp_record_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
rctx = ctx->nodes.elts; rctx = ctx->nodes.elts;
for (n = 0; n < ctx->nodes.nelts; ++n, ++rctx) { for (n = 0; n < ctx->nodes.nelts; ++n, ++rctx) {
if (rctx->conf->flags & NGX_RTMP_RECORD_OFF) { if (rctx->conf->flags & (NGX_RTMP_RECORD_OFF|NGX_RTMP_RECORD_MANUAL)) {
continue; continue;
} }
@ -705,7 +704,8 @@ ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_node_ctx_t *rctx,
keyframe = (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME); keyframe = (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME);
if (keyframe) { if (keyframe && (rc->flags & NGX_RTMP_RECORD_MANUAL) == 0) {
if (rc->interval != (ngx_msec_t) NGX_CONF_UNSET) { if (rc->interval != (ngx_msec_t) NGX_CONF_UNSET) {
next = rctx->last; next = rctx->last;
@ -721,7 +721,7 @@ ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_node_ctx_t *rctx,
ngx_rtmp_record_open(s, rctx); ngx_rtmp_record_open(s, rctx);
} }
} else if (rctx->file.fd == NGX_INVALID_FILE) { } else {
ngx_rtmp_record_open(s, rctx); ngx_rtmp_record_open(s, rctx);
} }
} }
@ -860,14 +860,12 @@ ngx_rtmp_record_postconfiguration(ngx_conf_t *cf)
cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module); 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_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
*h = ngx_rtmp_record_av; *h = ngx_rtmp_record_av;
h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]); h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
*h = ngx_rtmp_record_av; *h = ngx_rtmp_record_av;
/* chain handlers */
next_publish = ngx_rtmp_publish; next_publish = ngx_rtmp_publish;
ngx_rtmp_publish = ngx_rtmp_record_publish; ngx_rtmp_publish = ngx_rtmp_record_publish;

1
ngx_rtmp_record_module.h
View File

@ -14,6 +14,7 @@
#define NGX_RTMP_RECORD_AUDIO 0x02 #define NGX_RTMP_RECORD_AUDIO 0x02
#define NGX_RTMP_RECORD_VIDEO 0x04 #define NGX_RTMP_RECORD_VIDEO 0x04
#define NGX_RTMP_RECORD_KEYFRAMES 0x08 #define NGX_RTMP_RECORD_KEYFRAMES 0x08
#define NGX_RTMP_RECORD_MANUAL 0x10
typedef struct { typedef struct {