pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/chromaprint
Module Name: pkgsrc
Committed By: wiz
Date: Thu Jun 8 07:05:18 UTC 2023
Modified Files:
pkgsrc/audio/chromaprint: Makefile distinfo
Added Files:
pkgsrc/audio/chromaprint/patches: patch-CMakeLists.txt
patch-src_audio_ffmpeg__audio__processor.h
patch-src_audio_ffmpeg__audio__processor__avresample.h
patch-src_audio_ffmpeg__audio__processor__swresample.h
patch-src_audio_ffmpeg__audio__reader.h patch-tests_CMakeLists.txt
Log Message:
chromaprint: support ffmpeg5 using upstream patch.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/audio/chromaprint/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/chromaprint/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/audio/chromaprint/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor.h \
pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__avresample.h \
pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__swresample.h \
pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__reader.h \
pkgsrc/audio/chromaprint/patches/patch-tests_CMakeLists.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/chromaprint/Makefile
diff -u pkgsrc/audio/chromaprint/Makefile:1.35 pkgsrc/audio/chromaprint/Makefile:1.36
--- pkgsrc/audio/chromaprint/Makefile:1.35 Sun Jan 29 21:15:23 2023
+++ pkgsrc/audio/chromaprint/Makefile Thu Jun 8 07:05:17 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2023/01/29 21:15:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2023/06/08 07:05:17 wiz Exp $
DISTNAME= chromaprint-1.5.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=acoustid/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -25,8 +25,8 @@ SOEXT= so
.endif
.for lib in AVCODEC AVFORMAT AVUTIL SWRESAMPLE
-CMAKE_ARGS+= -DFFMPEG_LIB${lib}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg4}/include/ffmpeg4
-CMAKE_ARGS+= -DFFMPEG_LIB${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg4}/lib/ffmpeg4/lib${lib:tl}.${SOEXT}
+CMAKE_ARGS+= -DFFMPEG_LIB${lib}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg5}/include/ffmpeg5
+CMAKE_ARGS+= -DFFMPEG_LIB${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg5}/lib/ffmpeg5/lib${lib:tl}.${SOEXT}
.endfor
PKGCONFIG_OVERRIDE= libchromaprint.pc.cmake
@@ -34,7 +34,5 @@ PKGCONFIG_OVERRIDE= libchromaprint.pc.cm
.include "../../devel/cmake/build.mk"
.include "../../math/fftw/buildlink3.mk"
# On Darwin, chromaprint uses Accelerate.framework, but fpcalc still needs FFmpeg
-# does not support ffmpeg4 yet:
-# https://github.com/acoustid/chromaprint/issues/117
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/ffmpeg5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/chromaprint/distinfo
diff -u pkgsrc/audio/chromaprint/distinfo:1.20 pkgsrc/audio/chromaprint/distinfo:1.21
--- pkgsrc/audio/chromaprint/distinfo:1.20 Wed Jan 5 21:41:28 2022
+++ pkgsrc/audio/chromaprint/distinfo Thu Jun 8 07:05:17 2023
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.20 2022/01/05 21:41:28 wiz Exp $
+$NetBSD: distinfo,v 1.21 2023/06/08 07:05:17 wiz Exp $
BLAKE2s (chromaprint-1.5.1.tar.gz) = 01980cfdadf11d35ed19fb2cd6e320aba31fd34d390e5839bbe0f275abe1571c
SHA512 (chromaprint-1.5.1.tar.gz) = ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
Size (chromaprint-1.5.1.tar.gz) = 1581159 bytes
+SHA1 (patch-CMakeLists.txt) = 342172504f9cfbeaf222b3442ed965d37163c153
+SHA1 (patch-src_audio_ffmpeg__audio__processor.h) = 4a1177cee10533d5592dd0e30fce159aa9c66478
+SHA1 (patch-src_audio_ffmpeg__audio__processor__avresample.h) = 69a902829418b9e9389f47600c0937fd5022d1ea
+SHA1 (patch-src_audio_ffmpeg__audio__processor__swresample.h) = db419ef311cc72e9f0ff7f8667778e2d000da69d
+SHA1 (patch-src_audio_ffmpeg__audio__reader.h) = ecb0d9b22816f81d29f52518aeffb617bad43eea
+SHA1 (patch-tests_CMakeLists.txt) = bfee40d2bfd080ada8544387f61b7b58ae86d101
Added files:
Index: pkgsrc/audio/chromaprint/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/audio/chromaprint/patches/patch-CMakeLists.txt:1.3
--- /dev/null Thu Jun 8 07:05:18 2023
+++ pkgsrc/audio/chromaprint/patches/patch-CMakeLists.txt Thu Jun 8 07:05:18 2023
@@ -0,0 +1,49 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/06/08 07:05:18 wiz Exp $
+
+Support ffmpeg5
+https://github.com/acoustid/chromaprint/pull/120/files
+
+--- CMakeLists.txt.orig 2021-12-23 05:57:54.000000000 +0000
++++ CMakeLists.txt
+@@ -82,9 +82,6 @@ find_package(FFmpeg)
+ if(FFMPEG_LIBRARIES)
+ cmake_push_check_state(RESET)
+ set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lm)
+- check_function_exists(av_packet_unref HAVE_AV_PACKET_UNREF)
+- check_function_exists(av_frame_alloc HAVE_AV_FRAME_ALLOC)
+- check_function_exists(av_frame_free HAVE_AV_FRAME_FREE)
+ cmake_pop_check_state()
+ endif()
+
+@@ -161,14 +158,11 @@ message(STATUS "Using ${FFT_LIB} for FFT
+ if(NOT AUDIO_PROCESSOR_LIB)
+ if(FFMPEG_LIBSWRESAMPLE_FOUND)
+ set(AUDIO_PROCESSOR_LIB "swresample")
+- elseif(FFMPEG_LIBAVRESAMPLE_FOUND)
+- set(AUDIO_PROCESSOR_LIB "avresample")
+ endif()
+ endif()
+
+ if(AUDIO_PROCESSOR_LIB STREQUAL "swresample")
+ if(FFMPEG_LIBSWRESAMPLE_FOUND)
+- set(USE_AVRESAMPLE OFF)
+ set(USE_SWRESAMPLE ON)
+ set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBSWRESAMPLE_LIBRARIES})
+ set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS})
+@@ -176,16 +170,6 @@ if(AUDIO_PROCESSOR_LIB STREQUAL "swresam
+ message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found")
+ endif()
+ message(STATUS "Using ${AUDIO_PROCESSOR_LIB} for audio conversion")
+-elseif(AUDIO_PROCESSOR_LIB STREQUAL "avresample")
+- if(FFMPEG_LIBAVRESAMPLE_FOUND)
+- set(USE_AVRESAMPLE ON)
+- set(USE_SWRESAMPLE OFF)
+- set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBAVRESAMPLE_LIBRARIES})
+- set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS})
+- else()
+- message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found")
+- endif()
+- message(STATUS "Using ${AUDIO_PROCESSOR_LIB} for audio conversion")
+ else()
+ message(STATUS "Building without audio conversion support, please install FFmpeg with libswresample")
+ endif()
Index: pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor.h
diff -u /dev/null pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor.h:1.1
--- /dev/null Thu Jun 8 07:05:18 2023
+++ pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor.h Thu Jun 8 07:05:18 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_audio_ffmpeg__audio__processor.h,v 1.1 2023/06/08 07:05:18 wiz Exp $
+
+Support ffmpeg5
+https://github.com/acoustid/chromaprint/pull/120/files
+
+--- src/audio/ffmpeg_audio_processor.h.orig 2021-12-23 05:57:54.000000000 +0000
++++ src/audio/ffmpeg_audio_processor.h
+@@ -10,8 +10,6 @@
+
+ #if defined(USE_SWRESAMPLE)
+ #include "audio/ffmpeg_audio_processor_swresample.h"
+-#elif defined(USE_AVRESAMPLE)
+-#include "audio/ffmpeg_audio_processor_avresample.h"
+ #else
+ #error "no audio processing library"
+ #endif
Index: pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__avresample.h
diff -u /dev/null pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__avresample.h:1.1
--- /dev/null Thu Jun 8 07:05:18 2023
+++ pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__avresample.h Thu Jun 8 07:05:18 2023
@@ -0,0 +1,80 @@
+$NetBSD: patch-src_audio_ffmpeg__audio__processor__avresample.h,v 1.1 2023/06/08 07:05:18 wiz Exp $
+
+Support ffmpeg5
+https://github.com/acoustid/chromaprint/pull/120/files
+
+--- src/audio/ffmpeg_audio_processor_avresample.h.orig 2021-12-23 05:57:54.000000000 +0000
++++ src/audio/ffmpeg_audio_processor_avresample.h
+@@ -1,72 +0,0 @@
+-// Copyright (C) 2016 Lukas Lalinsky
+-// Distributed under the MIT license, see the LICENSE file for details.
+-
+-#ifndef CHROMAPRINT_AUDIO_FFMPEG_AUDIO_PROCESSOR_AVRESAMPLE_H_
+-#define CHROMAPRINT_AUDIO_FFMPEG_AUDIO_PROCESSOR_AVRESAMPLE_H_
+-
+-extern "C" {
+-#include <libavresample/avresample.h>
+-}
+-
+-namespace chromaprint {
+-
+-class FFmpegAudioProcessor {
+-public:
+- FFmpegAudioProcessor() {
+- m_resample_ctx = avresample_alloc_context();
+- }
+-
+- ~FFmpegAudioProcessor() {
+- avresample_free(&m_resample_ctx);
+- }
+-
+- void SetCompatibleMode() {
+- av_opt_set_int(m_resample_ctx, "filter_size", 16, 0);
+- av_opt_set_int(m_resample_ctx, "phase_shift", 8, 0);
+- av_opt_set_int(m_resample_ctx, "linear_interp", 1, 0);
+- av_opt_set_double(m_resample_ctx, "cutoff", 0.8, 0);
+- }
+-
+- void SetInputChannelLayout(int64_t channel_layout) {
+- av_opt_set_int(m_resample_ctx, "in_channel_layout", channel_layout, 0);
+- }
+-
+- void SetInputSampleFormat(AVSampleFormat sample_format) {
+- av_opt_set_int(m_resample_ctx, "in_sample_fmt", sample_format, 0);
+- }
+-
+- void SetInputSampleRate(int sample_rate) {
+- av_opt_set_int(m_resample_ctx, "in_sample_rate", sample_rate, 0);
+- }
+-
+- void SetOutputChannelLayout(int64_t channel_layout) {
+- av_opt_set_int(m_resample_ctx, "out_channel_layout", channel_layout, 0);
+- }
+-
+- void SetOutputSampleFormat(AVSampleFormat sample_format) {
+- av_opt_set_int(m_resample_ctx, "out_sample_fmt", sample_format, 0);
+- }
+-
+- void SetOutputSampleRate(int sample_rate) {
+- av_opt_set_int(m_resample_ctx, "out_sample_fmt", sample_rate, 0);
+- }
+-
+- int Init() {
+- return avresample_open(m_resample_ctx);
+- }
+-
+- int Convert(uint8_t **out, int out_count, const uint8_t **in, int in_count) {
+- return avresample_convert(m_resample_ctx, out, 0, out_count, (uint8_t **) in, 0, in_count);
+- }
+-
+- int Flush(uint8_t **out, int out_count) {
+- return avresample_read(m_resample_ctx, out, out_count);
+- }
+-
+-private:
+- AVAudioResampleContext *m_resample_ctx = nullptr;
+-};
+-
+-}; // namespace chromaprint
+-
+-#endif
Index: pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__swresample.h
diff -u /dev/null pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__swresample.h:1.1
--- /dev/null Thu Jun 8 07:05:18 2023
+++ pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__processor__swresample.h Thu Jun 8 07:05:18 2023
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_audio_ffmpeg__audio__processor__swresample.h,v 1.1 2023/06/08 07:05:18 wiz Exp $
+
+Support ffmpeg5
+https://github.com/acoustid/chromaprint/pull/120/files
+
+--- src/audio/ffmpeg_audio_processor_swresample.h.orig 2021-12-23 05:57:54.000000000 +0000
++++ src/audio/ffmpeg_audio_processor_swresample.h
+@@ -28,30 +28,28 @@ public:
+ av_opt_set_double(m_swr_ctx, "cutoff", 0.8, 0);
+ }
+
+- void SetInputChannelLayout(int64_t channel_layout) {
+- av_opt_set_int(m_swr_ctx, "icl", channel_layout, 0);
+- av_opt_set_int(m_swr_ctx, "ich", av_get_channel_layout_nb_channels(channel_layout), 0);
++ void SetInputChannelLayout(AVChannelLayout *channel_layout) {
++ av_opt_set_int(m_swr_ctx, "in_channel_layout", channel_layout->u.mask, 0);
+ }
+
+ void SetInputSampleFormat(AVSampleFormat sample_format) {
+- av_opt_set_int(m_swr_ctx, "isf", sample_format, 0);
++ av_opt_set_sample_fmt(m_swr_ctx, "in_sample_fmt", sample_format, 0);
+ }
+
+ void SetInputSampleRate(int sample_rate) {
+- av_opt_set_int(m_swr_ctx, "isr", sample_rate, 0);
++ av_opt_set_int(m_swr_ctx, "in_sample_rate", sample_rate, 0);
+ }
+
+- void SetOutputChannelLayout(int64_t channel_layout) {
+- av_opt_set_int(m_swr_ctx, "ocl", channel_layout, 0);
+- av_opt_set_int(m_swr_ctx, "och", av_get_channel_layout_nb_channels(channel_layout), 0);
++ void SetOutputChannelLayout(AVChannelLayout *channel_layout) {
++ av_opt_set_int(m_swr_ctx, "out_channel_layout", channel_layout->u.mask, 0);
+ }
+
+ void SetOutputSampleFormat(AVSampleFormat sample_format) {
+- av_opt_set_int(m_swr_ctx, "osf", sample_format, 0);
++ av_opt_set_sample_fmt(m_swr_ctx, "out_sample_fmt", sample_format, 0);
+ }
+
+ void SetOutputSampleRate(int sample_rate) {
+- av_opt_set_int(m_swr_ctx, "osr", sample_rate, 0);
++ av_opt_set_int(m_swr_ctx, "out_sample_rate", sample_rate, 0);
+ }
+
+ int Init() {
Index: pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__reader.h
diff -u /dev/null pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__reader.h:1.1
--- /dev/null Thu Jun 8 07:05:18 2023
+++ pkgsrc/audio/chromaprint/patches/patch-src_audio_ffmpeg__audio__reader.h Thu Jun 8 07:05:18 2023
@@ -0,0 +1,328 @@
+$NetBSD: patch-src_audio_ffmpeg__audio__reader.h,v 1.1 2023/06/08 07:05:18 wiz Exp $
+
+Support ffmpeg5
+https://github.com/acoustid/chromaprint/pull/120/files
+
+--- src/audio/ffmpeg_audio_reader.h.orig 2021-12-23 05:57:54.000000000 +0000
++++ src/audio/ffmpeg_audio_reader.h
+@@ -62,7 +62,7 @@ public:
+ bool Read(const int16_t **data, size_t *size);
+
+ bool IsOpen() const { return m_opened; }
+- bool IsFinished() const { return m_finished && !m_got_frame; }
++ bool IsFinished() const { return !m_has_more_packets && !m_has_more_frames; }
+
+ std::string GetError() const { return m_error; }
+ int GetErrorCode() const { return m_error_code; }
+@@ -74,20 +74,19 @@ private:
+ uint8_t *m_convert_buffer[1] = { nullptr };
+ int m_convert_buffer_nb_samples = 0;
+
+- AVInputFormat *m_input_fmt = nullptr;
++ const AVInputFormat *m_input_fmt = nullptr;
+ AVDictionary *m_input_opts = nullptr;
+
+ AVFormatContext *m_format_ctx = nullptr;
+ AVCodecContext *m_codec_ctx = nullptr;
+- AVFrame *m_frame = nullptr;
+ int m_stream_index = -1;
+ std::string m_error;
+ int m_error_code = 0;
+- bool m_finished = false;
+ bool m_opened = false;
+- int m_got_frame = 0;
+- AVPacket m_packet;
+- AVPacket m_packet0;
++ bool m_has_more_packets = true;
++ bool m_has_more_frames = true;
++ AVPacket *m_packet = nullptr;
++ AVFrame *m_frame = nullptr;
+
+ int m_output_sample_rate = 0;
+ int m_output_channels = 0;
+@@ -98,19 +97,12 @@ private:
+
+ inline FFmpegAudioReader::FFmpegAudioReader() {
+ av_log_set_level(AV_LOG_QUIET);
+-
+- av_init_packet(&m_packet);
+- m_packet.data = nullptr;
+- m_packet.size = 0;
+-
+- m_packet0 = m_packet;
+ }
+
+ inline FFmpegAudioReader::~FFmpegAudioReader() {
+ Close();
+ av_dict_free(&m_input_opts);
+ av_freep(&m_convert_buffer[0]);
+- av_packet_unref(&m_packet0);
+ }
+
+ inline bool FFmpegAudioReader::SetInputFormat(const char *name) {
+@@ -135,11 +127,10 @@ inline bool FFmpegAudioReader::Open(cons
+
+ Close();
+
+- av_init_packet(&m_packet);
+- m_packet.data = nullptr;
+- m_packet.size = 0;
+-
+- m_packet0 = m_packet;
++ m_packet = av_packet_alloc();
++ if (!m_packet) {
++ return false;
++ }
+
+ ret = avformat_open_input(&m_format_ctx, file_name.c_str(), m_input_fmt, &m_input_opts);
+ if (ret < 0) {
+@@ -153,26 +144,31 @@ inline bool FFmpegAudioReader::Open(cons
+ return false;
+ }
+
+- AVCodec *codec;
++ const AVCodec *codec;
+ ret = av_find_best_stream(m_format_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &codec, 0);
+ if (ret < 0) {
+ SetError("Could not find any audio stream in the file", ret);
+ return false;
+ }
+ m_stream_index = ret;
++ auto stream = m_format_ctx->streams[m_stream_index];
+
+- m_codec_ctx = m_format_ctx->streams[m_stream_index]->codec;
++ m_codec_ctx = avcodec_alloc_context3(codec);
+ m_codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16;
+
++ ret = avcodec_parameters_to_context(m_codec_ctx, stream->codecpar);
++ if (ret < 0) {
++ SetError("Could not copy the stream parameters", ret);
++ return false;
++ }
++
+ ret = avcodec_open2(m_codec_ctx, codec, nullptr);
+ if (ret < 0) {
+ SetError("Could not open the codec", ret);
+ return false;
+ }
+
+- if (!m_codec_ctx->channel_layout) {
+- m_codec_ctx->channel_layout = av_get_default_channel_layout(m_codec_ctx->channels);
+- }
++ av_dump_format(m_format_ctx, 0, "foo", 0);
+
+ m_frame = av_frame_alloc();
+ if (!m_frame) {
+@@ -183,19 +179,23 @@ inline bool FFmpegAudioReader::Open(cons
+ m_output_sample_rate = m_codec_ctx->sample_rate;
+ }
+
+- if (!m_output_channels) {
+- m_output_channels = m_codec_ctx->channels;
++ AVChannelLayout output_channel_layout;
++ if (m_output_channels) {
++ av_channel_layout_default(&output_channel_layout, m_output_channels);
++ } else {
++ m_output_channels = m_codec_ctx->ch_layout.nb_channels;
++ av_channel_layout_default(&output_channel_layout, m_output_channels);
+ }
+
+- if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16 || m_codec_ctx->channels != m_output_channels || m_codec_ctx->sample_rate != m_output_sample_rate) {
++ if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16 || m_codec_ctx->ch_layout.nb_channels != m_output_channels || m_codec_ctx->sample_rate != m_output_sample_rate) {
+ m_converter.reset(new FFmpegAudioProcessor());
+ m_converter->SetCompatibleMode();
+ m_converter->SetInputSampleFormat(m_codec_ctx->sample_fmt);
+ m_converter->SetInputSampleRate(m_codec_ctx->sample_rate);
+- m_converter->SetInputChannelLayout(m_codec_ctx->channel_layout);
++ m_converter->SetInputChannelLayout(&(m_codec_ctx->ch_layout));
+ m_converter->SetOutputSampleFormat(AV_SAMPLE_FMT_S16);
+ m_converter->SetOutputSampleRate(m_output_sample_rate);
+- m_converter->SetOutputChannelLayout(av_get_default_channel_layout(m_output_channels));
++ m_converter->SetOutputChannelLayout(&output_channel_layout);
+ auto ret = m_converter->Init();
+ if (ret != 0) {
+ SetError("Could not create an audio converter instance", ret);
+@@ -203,10 +203,11 @@ inline bool FFmpegAudioReader::Open(cons
+ }
+ }
+
++ av_channel_layout_uninit(&output_channel_layout);
++
+ m_opened = true;
+- m_finished = false;
+- m_got_frame = 0;
+- m_nb_packets = 0;
++ m_has_more_packets = true;
++ m_has_more_frames = true;
+ m_decode_error = 0;
+
+ return true;
+@@ -214,6 +215,7 @@ inline bool FFmpegAudioReader::Open(cons
+
+ inline void FFmpegAudioReader::Close() {
+ av_frame_free(&m_frame);
++ av_packet_free(&m_packet);
+
+ m_stream_index = -1;
+
+@@ -252,91 +254,98 @@ inline bool FFmpegAudioReader::Read(cons
+ return false;
+ }
+
++ *data = nullptr;
++ *size = 0;
++
+ int ret;
++ bool needs_packet = false;
+ while (true) {
+- while (m_packet.size <= 0) {
+- av_packet_unref(&m_packet0);
+- av_init_packet(&m_packet);
+- m_packet.data = nullptr;
+- m_packet.size = 0;
+- ret = av_read_frame(m_format_ctx, &m_packet);
++ while (needs_packet && m_packet->size == 0) {
++ ret = av_read_frame(m_format_ctx, m_packet);
+ if (ret < 0) {
+ if (ret == AVERROR_EOF) {
+- m_finished = true;
++ needs_packet = false;
++ m_has_more_packets = false;
+ break;
+- } else {
++ }
++ SetError("Error reading from the audio source", ret);
++ return false;
++ }
++ if (m_packet->stream_index == m_stream_index) {
++ needs_packet = false;
++ } else {
++ av_packet_unref(m_packet);
++ }
++ }
++
++ if (m_packet->size != 0) {
++ ret = avcodec_send_packet(m_codec_ctx, m_packet);
++ if (ret < 0) {
++ if (ret != AVERROR(EAGAIN)) {
+ SetError("Error reading from the audio source", ret);
+ return false;
+ }
+- }
+- m_packet0 = m_packet;
+- if (m_packet.stream_index != m_stream_index) {
+- m_packet.data = nullptr;
+- m_packet.size = 0;
+ } else {
+- m_nb_packets++;
++ av_packet_unref(m_packet);
+ }
+ }
+
+- ret = avcodec_decode_audio4(m_codec_ctx, m_frame, &m_got_frame, &m_packet);
++ ret = avcodec_receive_frame(m_codec_ctx, m_frame);
+ if (ret < 0) {
+- if (m_decode_error) {
+- SetError("Error decoding audio frame", m_decode_error);
+- return false;
++ if (ret == AVERROR_EOF) {
++ m_has_more_frames = false;
++ } else if (ret == AVERROR(EAGAIN)) {
++ if (m_has_more_packets) {
++ needs_packet = true;
++ continue;
++ } else {
++ m_has_more_frames = false;
++ }
+ }
+- m_decode_error = ret;
+- m_packet.data = nullptr;
+- m_packet.size = 0;
+- continue;
++ SetError("Error decoding the audio source", ret);
++ return false;
+ }
+
+- break;
+- }
+-
+- m_decode_error = 0;
+-
+- const int decoded = std::min(ret, m_packet.size);
+- m_packet.data += decoded;
+- m_packet.size -= decoded;
+-
+- if (m_got_frame) {
+- if (m_converter) {
+- if (m_frame->nb_samples > m_convert_buffer_nb_samples) {
+- int linsize;
+- av_freep(&m_convert_buffer[0]);
+- m_convert_buffer_nb_samples = std::max(1024 * 8, m_frame->nb_samples);
+- ret = av_samples_alloc(m_convert_buffer, &linsize, m_codec_ctx->channels, m_convert_buffer_nb_samples, AV_SAMPLE_FMT_S16, 1);
+- if (ret < 0) {
+- SetError("Couldn't allocate audio converter buffer", ret);
++ if (m_frame->nb_samples > 0) {
++ if (m_converter) {
++ if (m_frame->nb_samples > m_convert_buffer_nb_samples) {
++ int linsize;
++ av_freep(&m_convert_buffer[0]);
++ m_convert_buffer_nb_samples = std::max(1024 * 8, m_frame->nb_samples);
++ ret = av_samples_alloc(m_convert_buffer, &linsize, m_codec_ctx->ch_layout.nb_channels, m_convert_buffer_nb_samples, AV_SAMPLE_FMT_S16, 1);
++ if (ret < 0) {
++ SetError("Couldn't allocate audio converter buffer", ret);
++ return false;
++ }
++ }
++ auto nb_samples = m_converter->Convert(m_convert_buffer, m_convert_buffer_nb_samples, (const uint8_t **) m_frame->data, m_frame->nb_samples);
++ if (nb_samples < 0) {
++ SetError("Couldn't convert audio", ret);
+ return false;
+ }
+- }
+- auto nb_samples = m_converter->Convert(m_convert_buffer, m_convert_buffer_nb_samples, (const uint8_t **) m_frame->data, m_frame->nb_samples);
+- if (nb_samples < 0) {
+- SetError("Couldn't convert audio", ret);
+- return false;
+- }
+- *data = (const int16_t *) m_convert_buffer[0];
+- *size = nb_samples;
+- } else {
+- *data = (const int16_t *) m_frame->data[0];
+- *size = m_frame->nb_samples;
+- }
+- } else {
+- if (m_finished && m_converter) {
+- auto nb_samples = m_converter->Flush(m_convert_buffer, m_convert_buffer_nb_samples);
+- if (nb_samples < 0) {
+- SetError("Couldn't convert audio", ret);
+- return false;
+- } else if (nb_samples > 0) {
+- m_got_frame = 1;
+ *data = (const int16_t *) m_convert_buffer[0];
+ *size = nb_samples;
++ } else {
++ *data = (const int16_t *) m_frame->data[0];
++ *size = m_frame->nb_samples;
++ }
++ } else {
++ if (m_converter) {
++ if (IsFinished()) {
++ auto nb_samples = m_converter->Flush(m_convert_buffer, m_convert_buffer_nb_samples);
++ if (nb_samples < 0) {
++ SetError("Couldn't convert audio", ret);
++ return false;
++ } else if (nb_samples > 0) {
++ *data = (const int16_t *) m_convert_buffer[0];
++ *size = nb_samples;
++ }
++ }
+ }
+ }
+- }
+
+- return true;
++ return true;
++ }
+ }
+
+ inline void FFmpegAudioReader::SetError(const char *message, int errnum) {
Index: pkgsrc/audio/chromaprint/patches/patch-tests_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/chromaprint/patches/patch-tests_CMakeLists.txt:1.1
--- /dev/null Thu Jun 8 07:05:18 2023
+++ pkgsrc/audio/chromaprint/patches/patch-tests_CMakeLists.txt Thu Jun 8 07:05:18 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-tests_CMakeLists.txt,v 1.1 2023/06/08 07:05:18 wiz Exp $
+
+Support ffmpeg5
+https://github.com/acoustid/chromaprint/pull/120/files
+
+--- tests/CMakeLists.txt.orig 2021-12-23 05:57:54.000000000 +0000
++++ tests/CMakeLists.txt
+@@ -38,6 +38,12 @@ set(SRCS
+
+ if(BUILD_TOOLS)
+ set(SRCS ${SRCS} ../src/audio/ffmpeg_audio_reader_test.cpp)
++ include_directories(
++ ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}
++ ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}
++ ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}
++ ${AUDIO_PROCESSOR_INCLUDE_DIRS}
++ )
+ link_libraries(fpcalc_libs)
+ endif()
+
Home |
Main Index |
Thread Index |
Old Index