fix build error after rebase

CasparCG · Dec 6, 2024 · 46bf2f3 · 46bf2f3
1 parent 4356399
commit 46bf2f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/modules/ffmpeg/util/audio_resampler.cpp b/src/modules/ffmpeg/util/audio_resampler.cpp
@@ -8,20 +8,22 @@ extern "C" {
 
 namespace caspar::ffmpeg {
 
-AudioResampler::AudioResampler(int64_t sample_rate, AVSampleFormat in_sample_fmt)
-    : ctx(std::shared_ptr<SwrContext>(swr_alloc_set_opts(nullptr,
-                                                         AV_CH_LAYOUT_7POINT1,
-                                                         AV_SAMPLE_FMT_S32,
-                                                         sample_rate,
-                                                         AV_CH_LAYOUT_7POINT1,
-                                                         in_sample_fmt,
-                                                         sample_rate,
-                                                         0,
-                                                         nullptr),
-                                      [](SwrContext* ptr) { swr_free(&ptr); }))
+AudioResampler::AudioResampler(int sample_rate, AVSampleFormat in_sample_fmt)
 {
-    if (!ctx)
-        FF_RET(AVERROR(ENOMEM), "swr_alloc_set_opts");
+    AVChannelLayout channel_layout = AV_CHANNEL_LAYOUT_7POINT1;
+
+    SwrContext* raw_ctx = nullptr;
+    FF(swr_alloc_set_opts2(&raw_ctx,
+                           &channel_layout,
+                           AV_SAMPLE_FMT_S32,
+                           sample_rate,
+                           &channel_layout,
+                           in_sample_fmt,
+                           sample_rate,
+                           0,
+                           nullptr));
+
+    ctx = std::shared_ptr<SwrContext>(raw_ctx, [](SwrContext* ptr) { swr_free(&ptr); });
 
     FF_RET(swr_init(ctx.get()), "swr_init");
 }
@@ -35,4 +37,4 @@ caspar::array<int32_t> AudioResampler::convert(int frames, const void** src)
     return result;
 }
 
-}; // namespace caspar::ffmpeg
+}; // namespace caspar::ffmpeg
diff --git a/src/modules/ffmpeg/util/audio_resampler.h b/src/modules/ffmpeg/util/audio_resampler.h
@@ -16,7 +16,7 @@ class AudioResampler
     std::shared_ptr<SwrContext> ctx;
 
   public:
-    AudioResampler(int64_t sample_rate, AVSampleFormat in_sample_fmt);
+    AudioResampler(int sample_rate, AVSampleFormat in_sample_fmt);
 
     AudioResampler(const AudioResampler&)            = delete;
     AudioResampler& operator=(const AudioResampler&) = delete;