Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chromaprint for openSUSE:Factory checked in at 2023-04-29 17:27:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromaprint (Old) and /work/SRC/openSUSE:Factory/.chromaprint.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromaprint" Sat Apr 29 17:27:52 2023 rev:21 rq:1083512 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2022-12-07 17:35:19.936659789 +0100 +++ /work/SRC/openSUSE:Factory/.chromaprint.new.1533/chromaprint.changes 2023-04-29 17:27:58.294499714 +0200 @@ -1,0 +2,6 @@ +Thu Apr 27 17:14:20 UTC 2023 - Dominique Leuenberger <dims...@opensuse.org> + +- Add 82781d02.patch: FFmpeg 5.x: Some files return error codes + when scanning. + +------------------------------------------------------------------- New: ---- 82781d02.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromaprint.spec ++++++ --- /var/tmp/diff_new_pack.iTG6al/_old 2023-04-29 17:27:58.818501908 +0200 +++ /var/tmp/diff_new_pack.iTG6al/_new 2023-04-29 17:27:58.822501925 +0200 @@ -1,7 +1,7 @@ # # spec file for package chromaprint # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2012 Pascal Bleser <pascal.ble...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -28,7 +28,7 @@ Source1: baselibs.conf # PATCH-FIX-UPSTREAM https://github.com/acoustid/chromaprint/commit/8ccad69.patch -- Upgrade code to FFmpeg 5.x APIs Patch0: 8ccad69.patch - +Patch1: https://github.com/acoustid/chromaprint/commit/82781d02.patch BuildRequires: cmake BuildRequires: fftw3-devel BuildRequires: gcc-c++ ++++++ 82781d02.patch ++++++ >From 82781d02cd3063d071a501218297a90bde9a314f Mon Sep 17 00:00:00 2001 From: Marshal Walker <catma...@gmail.com> Date: Thu, 8 Dec 2022 11:53:58 -0500 Subject: [PATCH] ffmpeg5 fix for issue #122 tested on Arch Linux, needs testing on win/mac/etc (should be fine tho) --- src/audio/ffmpeg_audio_processor_swresample.h | 4 ++-- src/audio/ffmpeg_audio_reader.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/audio/ffmpeg_audio_processor_swresample.h b/src/audio/ffmpeg_audio_processor_swresample.h index b1d4bea..e8fcb3f 100644 --- a/src/audio/ffmpeg_audio_processor_swresample.h +++ b/src/audio/ffmpeg_audio_processor_swresample.h @@ -29,7 +29,7 @@ class FFmpegAudioProcessor { } void SetInputChannelLayout(AVChannelLayout *channel_layout) { - av_opt_set_int(m_swr_ctx, "in_channel_layout", channel_layout->u.mask, 0); + av_opt_set_chlayout(m_swr_ctx, "in_chlayout", channel_layout, 0); } void SetInputSampleFormat(AVSampleFormat sample_format) { @@ -41,7 +41,7 @@ class FFmpegAudioProcessor { } void SetOutputChannelLayout(AVChannelLayout *channel_layout) { - av_opt_set_int(m_swr_ctx, "out_channel_layout", channel_layout->u.mask, 0); + av_opt_set_chlayout(m_swr_ctx, "out_chlayout", channel_layout, 0); } void SetOutputSampleFormat(AVSampleFormat sample_format) { diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h index 1c6b346..35b2934 100644 --- a/src/audio/ffmpeg_audio_reader.h +++ b/src/audio/ffmpeg_audio_reader.h @@ -301,9 +301,10 @@ inline bool FFmpegAudioReader::Read(const int16_t **data, size_t *size) { } else { m_has_more_frames = false; } + } else { + SetError("Error decoding the audio source", ret); + return false; } - SetError("Error decoding the audio source", ret); - return false; } if (m_frame->nb_samples > 0) {