build & test fixes

kaltura · Apr 25, 2024 · 7f5381f · 7f5381f
1 parent 1ecc609
commit 7f5381f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/nginx-rtmp-kmp-module/src/ngx_rtmp_kmp_track.c b/nginx-rtmp-kmp-module/src/ngx_rtmp_kmp_track.c
@@ -293,10 +293,7 @@ ngx_rtmp_kmp_track_init_frame(ngx_kmp_out_track_t *track,
 
         }
 
-        if(codec_id == NGX_RTMP_VIDEO_H264
-            || ((codec_id == NGX_RTMP_CODEC_FOURCC_HVC1
-            || codec_id == NGX_RTMP_CODEC_FOURCC_HEV1)
-                && packet_type == PacketTypeCodedFrames)) {
+        if(codec_id == NGX_RTMP_VIDEO_H264 || ((codec_id == NGX_RTMP_CODEC_FOURCC_HVC1 || codec_id == NGX_RTMP_CODEC_FOURCC_HEV1)&& packet_type == PacketTypeCodedFrames)) {
             rc = ngx_rtmp_kmp_copy(&track->log, &comp_time, src,
                 sizeof(comp_time), in);
             if (rc != NGX_OK) {

diff --git a/nginx-rtmp-module/src/ngx_rtmp_codec_module.c b/nginx-rtmp-module/src/ngx_rtmp_codec_module.c
@@ -554,11 +554,9 @@ ngx_rtmp_codec_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_chain_t *in)
     }
 
     /* no conf */
-    if (h->type == NGX_RTMP_MSG_VIDEO && !ngx_rtmp_is_codec_header( h->type == NGX_RTMP_MSG_AUDIO
-        ? ctx->audio_codec_id : ctx->video_codec_id, in)) {
-        if (ctx->video_captions_tries > 0
-            && h->type == NGX_RTMP_MSG_VIDEO
-            && (ctx->video_codec_id == NGX_RTMP_VIDEO_H264
+    if (h->type == NGX_RTMP_MSG_VIDEO && !ngx_rtmp_is_codec_header(ctx->video_codec_id, in))
+    {
+        if (ctx->video_captions_tries > 0 && (ctx->video_codec_id == NGX_RTMP_VIDEO_H264
             || ctx->video_codec_id == NGX_RTMP_CODEC_FOURCC_HVC1
             || ctx->video_codec_id == NGX_RTMP_CODEC_FOURCC_HEV1
             ))