using namespace movit;
using namespace Eigen;
+// Avoid deprecation warnings, but we don't want to drop FFmpeg 5.1 support just yet.
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 30, 100)
+#define pkt_duration duration
+#endif
+
namespace {
steady_clock::time_point compute_frame_start(int64_t frame_pts, int64_t pts_origin, const AVRational &video_timebase, const steady_clock::time_point &origin, double rate)
}
audio_format->num_channels = 2;
- int64_t channel_layout = audio_avframe->channel_layout;
- if (channel_layout == 0) {
- channel_layout = av_get_default_channel_layout(audio_avframe->channels);
+ AVChannelLayout channel_layout = audio_avframe->ch_layout;
+ if (!av_channel_layout_check(&channel_layout) ||
+ channel_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
+ av_channel_layout_default(&channel_layout, audio_avframe->ch_layout.nb_channels);
}
if (resampler == nullptr ||
audio_avframe->format != last_src_format ||
dst_format != last_dst_format ||
- channel_layout != last_channel_layout ||
+ av_channel_layout_compare(&channel_layout, &last_channel_layout) != 0||
audio_avframe->sample_rate != last_sample_rate) {
+ // TODO: When we get C++20, use AV_CHANNEL_LAYOUT_STEREO_DOWNMIX.
+ AVChannelLayout stereo_downmix;
+ stereo_downmix.order = AV_CHANNEL_ORDER_NATIVE;
+ stereo_downmix.nb_channels = 2;
+ stereo_downmix.u.mask = AV_CH_LAYOUT_STEREO_DOWNMIX;
+
swr_free(&resampler);
- resampler = swr_alloc_set_opts(nullptr,
- /*out_ch_layout=*/AV_CH_LAYOUT_STEREO_DOWNMIX,
- /*out_sample_fmt=*/dst_format,
- /*out_sample_rate=*/OUTPUT_FREQUENCY,
- /*in_ch_layout=*/channel_layout,
- /*in_sample_fmt=*/AVSampleFormat(audio_avframe->format),
- /*in_sample_rate=*/audio_avframe->sample_rate,
- /*log_offset=*/0,
- /*log_ctx=*/nullptr);
-
- if (resampler == nullptr) {
+ resampler = nullptr;
+ int err = swr_alloc_set_opts2(&resampler,
+ /*out_ch_layout=*/&stereo_downmix,
+ /*out_sample_fmt=*/dst_format,
+ /*out_sample_rate=*/OUTPUT_FREQUENCY,
+ /*in_ch_layout=*/&channel_layout,
+ /*in_sample_fmt=*/AVSampleFormat(audio_avframe->format),
+ /*in_sample_rate=*/audio_avframe->sample_rate,
+ /*log_offset=*/0,
+ /*log_ctx=*/nullptr);
+
+ if (err != 0 || resampler == nullptr) {
fprintf(stderr, "Allocating resampler failed.\n");
abort();
}