From 8658d99529384a487113bb9b80aaffd7714f16a7 Mon Sep 17 00:00:00 2001
From: Roman Arutyunyan <arut@qip.ru>
Date: Sun, 16 Dec 2012 01:07:01 +0400
Subject: [PATCH] fixed h264 header considered by recorder as a key with
 intermediate frames following

---
 ngx_rtmp.h               |  7 +++++++
 ngx_rtmp_codec_module.c  |  2 +-
 ngx_rtmp_live_module.c   |  4 ++--
 ngx_rtmp_record_module.c | 13 +++++++------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ngx_rtmp.h b/ngx_rtmp.h
index aa22db3..432974c 100644
--- a/ngx_rtmp.h
+++ b/ngx_rtmp.h
@@ -555,6 +555,13 @@ ngx_rtmp_get_video_frame_type(ngx_chain_t *in)
 }
 
 
+static inline ngx_int_t
+ngx_rtmp_is_codec_header(ngx_chain_t *in)
+{
+    return in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0;
+}
+
+
 extern ngx_rtmp_bandwidth_t                 ngx_rtmp_bw_out;
 extern ngx_rtmp_bandwidth_t                 ngx_rtmp_bw_in;
 
diff --git a/ngx_rtmp_codec_module.c b/ngx_rtmp_codec_module.c
index 3f2be90..debf7c4 100644
--- a/ngx_rtmp_codec_module.c
+++ b/ngx_rtmp_codec_module.c
@@ -192,7 +192,7 @@ ngx_rtmp_codec_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
     }
 
     /* no conf */
-    if (in->buf->pos[1]) {
+    if (!ngx_rtmp_is_codec_header(in)) {
         return NGX_OK;
     }
 
diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c
index cb008c3..3ca6495 100644
--- a/ngx_rtmp_live_module.c
+++ b/ngx_rtmp_live_module.c
@@ -786,7 +786,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
             }
 
             if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC &&
-                in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0)
+                ngx_rtmp_is_codec_header(in))
             {
                 prio = 0;
                 mandatory = 1;
@@ -800,7 +800,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
             }
 
             if (codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264 &&
-                in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0)
+                ngx_rtmp_is_codec_header(in))
             {
                 prio = 0;
                 mandatory = 1;
diff --git a/ngx_rtmp_record_module.c b/ngx_rtmp_record_module.c
index 63fa11f..818120f 100644
--- a/ngx_rtmp_record_module.c
+++ b/ngx_rtmp_record_module.c
@@ -422,16 +422,14 @@ ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
                    "record: %V opening", &rracf->id);
 
     ngx_memzero(rctx, sizeof(*rctx));
-
+    rctx->conf = rracf;
+    rctx->last = *ngx_cached_time;
     rctx->timestamp = ngx_cached_time->sec;
 
     ngx_rtmp_record_make_path(s, rctx, &path);
 
     ngx_memzero(&rctx->file, sizeof(rctx->file));
-
-    rctx->last = *ngx_cached_time;
     rctx->file.offset = 0;
-    rctx->failed = 0;
     rctx->file.log = s->connection->log;
     rctx->file.fd = ngx_open_file(path.data, NGX_FILE_WRONLY, NGX_FILE_TRUNCATE,
                                   NGX_FILE_DEFAULT_ACCESS);
@@ -970,7 +968,7 @@ ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
 
             if (ngx_rtmp_record_write_frame(s, rctx, &ch,
                                             codec_ctx->aac_header, 0)
-                    != NGX_OK) 
+                != NGX_OK) 
             {
                 return NGX_OK;
             }
@@ -1009,7 +1007,10 @@ ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
             return NGX_OK;
         }
 
-        if (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME) {
+        if (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME &&
+            (codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264 ||
+             !ngx_rtmp_is_codec_header(in)))
+        {
             rctx->video_key_sent = 1;
         }