From e4037149c9a6fbbd6b3747cdbd0909c0ca3b6382 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 1 Oct 2023 10:42:55 +0200 Subject: [PATCH] Fix channel layout deprecations in AudioEncoder. --- nageru/audio_encoder.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/nageru/audio_encoder.cpp b/nageru/audio_encoder.cpp index 4d42b40..126e0e2 100644 --- a/nageru/audio_encoder.cpp +++ b/nageru/audio_encoder.cpp @@ -51,16 +51,17 @@ AudioEncoder::AudioEncoder(const string &codec_name, int bit_rate, const AVOutpu abort(); } - resampler = swr_alloc_set_opts(nullptr, - /*out_ch_layout=*/AV_CH_LAYOUT_STEREO, - /*out_sample_fmt=*/ctx->sample_fmt, - /*out_sample_rate=*/OUTPUT_FREQUENCY, - /*in_ch_layout=*/AV_CH_LAYOUT_STEREO, - /*in_sample_fmt=*/AV_SAMPLE_FMT_FLT, - /*in_sample_rate=*/OUTPUT_FREQUENCY, - /*log_offset=*/0, - /*log_ctx=*/nullptr); - if (resampler == nullptr) { + resampler = nullptr; + int ok = swr_alloc_set_opts2(&resampler, + /*out_ch_layout=*/&ctx->ch_layout, + /*out_sample_fmt=*/ctx->sample_fmt, + /*out_sample_rate=*/OUTPUT_FREQUENCY, + /*in_ch_layout=*/&ctx->ch_layout, + /*in_sample_fmt=*/AV_SAMPLE_FMT_FLT, + /*in_sample_rate=*/OUTPUT_FREQUENCY, + /*log_offset=*/0, + /*log_ctx=*/nullptr); + if (ok != 0) { fprintf(stderr, "Allocating resampler failed.\n"); abort(); } -- 2.39.2