fix: decklink producer crashing with ffmpeg 7 #1582

CasparCG · Jan 12, 2025 · f2a8558 · f2a8558
1 parent d11e0f5
commit f2a8558
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/modules/decklink/producer/decklink_producer.cpp b/src/modules/decklink/producer/decklink_producer.cpp
@@ -240,19 +240,24 @@ struct Filter
 #pragma warning(disable : 4245)
 #endif
 
-            AVSampleFormat sample_fmts[]     = {AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE};
-            int            sample_rates[]    = {format_desc.audio_sample_rate, 0};
+            AVSampleFormat sample_fmts[]  = {AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE};
+            int            sample_rates[] = {format_desc.audio_sample_rate, 0};
             FF(av_opt_set_int_list(sink, "sample_fmts", sample_fmts, -1, AV_OPT_SEARCH_CHILDREN));
             FF(av_opt_set_int_list(sink, "sample_rates", sample_rates, 0, AV_OPT_SEARCH_CHILDREN));
 
 #if FFMPEG_NEW_CHANNEL_LAYOUT
+            // TODO - we might want to force the filter to produce 16 channels
+            // But this segfaults (changing the property name causes it to fail with an error)
+            // As 16 channel packets are fed into the filter, with the filter set to the same, that is what we get out
+            /*
             AVChannelLayout channel_layout = AV_CHANNEL_LAYOUT_STEREO;
             av_channel_layout_default(&channel_layout, format_desc.audio_channels);
 
             FF(av_opt_set_chlayout(sink, "ch_layouts", &channel_layout, AV_OPT_SEARCH_CHILDREN));
             av_channel_layout_uninit(&channel_layout);
+             */
 #else
-            int64_t        channel_layouts[] = {av_get_default_channel_layout(format_desc.audio_channels), 0};
+            int64_t channel_layouts[] = {av_get_default_channel_layout(format_desc.audio_channels), 0};
             FF(av_opt_set_int_list(sink, "channel_layouts", channel_layouts, 0, AV_OPT_SEARCH_CHILDREN));
 #endif
 
@@ -695,8 +700,8 @@ class decklink_producer : public IDeckLinkInputCallback
             }
 
             if (audio) {
-                auto src      = std::shared_ptr<AVFrame>(av_frame_alloc(), [](AVFrame* ptr) { av_frame_free(&ptr); });
-                src->format   = AV_SAMPLE_FMT_S32;
+                auto src    = std::shared_ptr<AVFrame>(av_frame_alloc(), [](AVFrame* ptr) { av_frame_free(&ptr); });
+                src->format = AV_SAMPLE_FMT_S32;
 #if FFMPEG_NEW_CHANNEL_LAYOUT
                 av_channel_layout_default(&src->ch_layout, format_desc_.audio_channels);
 #else