[fix] merge pull request #257 from MultimediaLearn/bugfix-gopcache-aa…

…cheader.
winshining · Jan 7, 2024 · 090fadc · 090fadc
2 parents b62de75 + 1e52080
commit 090fadc
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/ngx_rtmp_gop_cache_module.c b/ngx_rtmp_gop_cache_module.c
@@ -292,22 +292,6 @@ ngx_rtmp_gop_cache_alloc_cache(ngx_rtmp_session_t *s)
         }
     }
 
-    // save video seq header.
-    if (codec_ctx->avc_header && ctx->video_seq_header == NULL) {
-        ctx->video_seq_header = codec_ctx->avc_header;
-    }
-
-    // save audio seq header.
-    if (codec_ctx->aac_header && ctx->audio_seq_header == NULL) {
-        ctx->audio_seq_header = codec_ctx->aac_header;
-    }
-
-    // save metadata.
-    if (codec_ctx->meta && ctx->meta == NULL) {
-        ctx->meta_version = codec_ctx->meta_version;
-        ctx->meta = codec_ctx->meta;
-    }
-
     if (ctx->cache_head == NULL) {
         ctx->cache_tail = ctx->cache_head = cache;
     } else {
@@ -476,6 +460,28 @@ ngx_rtmp_gop_cache_frame(ngx_rtmp_session_t *s, ngx_uint_t prio,
         }
     }
 
+    // save video seq header.
+    if (ctx->video_seq_header == NULL && codec_ctx->avc_header) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "video header comming");
+        ctx->video_seq_header = codec_ctx->avc_header;
+    }
+
+    // save audio seq header.
+    if (ctx->audio_seq_header == NULL && codec_ctx->aac_header) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "audio header comming");
+        ctx->audio_seq_header = codec_ctx->aac_header;
+    }
+
+    // save metadata.
+    if (ctx->meta == NULL && codec_ctx->meta) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "meta comming");
+        ctx->meta_version = codec_ctx->meta_version;
+        ctx->meta = codec_ctx->meta;
+    }
+
     gf = ngx_rtmp_gop_cache_alloc_frame(s);
     if (gf == NULL) {
         return;