Merge pull request #22 from sergey-dryabzhinsky/fix-record-interval-f…

…or-all-modes Fix record interal
sergey-dryabzhinsky · Jul 5, 2015 · 21683a4 · 21683a4
2 parents e9f58da + 25146e4
commit 21683a4
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/ngx_rtmp_record_module.c b/ngx_rtmp_record_module.c
@@ -1064,28 +1064,6 @@ ngx_rtmp_record_node_avd(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
  ? keyframe
  : (rracf->flags & NGX_RTMP_RECORD_VIDEO) == 0;
 
- if (brkframe && (rracf->flags & NGX_RTMP_RECORD_MANUAL) == 0) {
-
- if (rracf->interval != (ngx_msec_t) NGX_CONF_UNSET) {
-
- next = rctx->last;
- next.msec += rracf->interval;
- next.sec += (next.msec / 1000);
- next.msec %= 1000;
-
- if (ngx_cached_time->sec > next.sec ||
- (ngx_cached_time->sec == next.sec &&
- ngx_cached_time->msec > next.msec))
- {
- ngx_rtmp_record_node_close(s, rctx);
- ngx_rtmp_record_node_open(s, rctx);
- }
-
- } else if (!rctx->failed) {
- ngx_rtmp_record_node_open(s, rctx);
- }
- }
-
  if ((rracf->flags & NGX_RTMP_RECORD_MANUAL) &&
  !brkframe && rctx->nframes == 0)
  {
@@ -1115,6 +1093,26 @@ ngx_rtmp_record_node_avd(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
  return NGX_OK;
  }
 
+ // record interval should work if set, manual mode or not
+ if (rracf->interval != (ngx_msec_t) NGX_CONF_UNSET) {
+
+ next = rctx->last;
+ next.msec += rracf->interval;
+ next.sec += (next.msec / 1000);
+ next.msec %= 1000;
+
+ if (ngx_cached_time->sec > next.sec ||
+ (ngx_cached_time->sec == next.sec &&
+ ngx_cached_time->msec > next.msec))
+ {
+ ngx_rtmp_record_node_close(s, rctx);
+ ngx_rtmp_record_node_open(s, rctx);
+ }
+
+ } else if (!rctx->failed) {
+ ngx_rtmp_record_node_open(s, rctx);
+ }
+
  if (!rctx->initialized) {
 
  rctx->initialized = 1;