this repo has no description
Switch to libresample
+15
-15
+1
-1
cmake/use_ld64.cmake
+1
-1
cmake/use_ld64.cmake
···
146
146
-Wl,-dylib_file,/usr/lib/darling/libelfloader.dylib:${CMAKE_BINARY_DIR}/src/libelfloader/libelfloader.dylib \
147
147
-Wl,-dylib_file,/usr/lib/native/libavcodec.dylib:${CMAKE_BINARY_DIR}/src/native/libavcodec.dylib \
148
148
-Wl,-dylib_file,/usr/lib/native/libavformat.dylib:${CMAKE_BINARY_DIR}/src/native/libavformat.dylib \
149
-
-Wl,-dylib_file,/usr/lib/native/libavresample.dylib:${CMAKE_BINARY_DIR}/src/native/libavresample.dylib \
149
+
-Wl,-dylib_file,/usr/lib/native/libswresample.dylib:${CMAKE_BINARY_DIR}/src/native/libswresample.dylib \
150
150
-Wl,-dylib_file,/usr/lib/native/libavutil.dylib:${CMAKE_BINARY_DIR}/src/native/libavutil.dylib \
151
151
-Wl,-dylib_file,/usr/lib/native/libcairo.dylib:${CMAKE_BINARY_DIR}/src/native/libcairo.dylib \
152
152
-Wl,-dylib_file,/usr/lib/native/libdbus.dylib:${CMAKE_BINARY_DIR}/src/native/libdbus.dylib \
+1
-1
debian/control
+1
-1
debian/control
···
3
3
Section: misc
4
4
Priority: optional
5
5
Standards-Version: 4.4.0
6
-
Build-Depends: cmake, clang | clang-9, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-amd64|linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libglu1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, python, libxrandr-dev, libxcursor-dev, libgif-dev, libavcodec-dev, libavformat-dev, libavresample-dev, libavutil-dev, libpulse-dev, libavformat-dev, libavcodec-dev, libavresample-dev, libdbus-1-dev, libxkbfile-dev
6
+
Build-Depends: cmake, clang | clang-9, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-amd64|linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libglu1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, python, libxrandr-dev, libxcursor-dev, libgif-dev, libavcodec-dev, libavformat-dev, libswresample-dev, libavutil-dev, libpulse-dev, libavformat-dev, libavcodec-dev, libdbus-1-dev, libxkbfile-dev
7
7
8
8
Package: darling
9
9
Architecture: amd64
+9
-9
src/CoreAudio/AudioToolbox/AudioConverterImpl.cpp
+9
-9
src/CoreAudio/AudioToolbox/AudioConverterImpl.cpp
···
197
197
if (m_audioFrame)
198
198
av_free(m_audioFrame);
199
199
if (m_resampler)
200
-
avresample_free(&m_resampler);
200
+
swr_free(&m_resampler);
201
201
}
202
202
203
203
template <typename T> OSStatus setPropertyT(UInt32 inPropertyDataSize, T* localProperty, const void* propertySource)
···
316
316
if (m_resampler != nullptr)
317
317
throw std::logic_error("Resampler already created");
318
318
319
-
m_resampler = avresample_alloc_context();
319
+
m_resampler = swr_alloc();
320
320
m_targetFormat = CACodecSampleFormat(&m_destinationFormat);
321
321
322
322
av_opt_set_int(m_resampler, "in_channel_layout", CAChannelCountToLayout(m_sourceFormat.mChannelsPerFrame), 0);
···
340
340
m_encoderOutput.open("/tmp/encoder.out.raw", std::ios_base::binary | std::ios_base::out);
341
341
#endif
342
342
343
-
err = avresample_open(m_resampler);
343
+
err = swr_init(m_resampler);
344
344
if (err < 0)
345
-
throwFFMPEGError(err, "avresample_open()");
345
+
throwFFMPEGError(err, "swr_init()");
346
346
}
347
347
348
348
OSStatus AudioConverter::fillComplex(AudioConverterComplexInputDataProc dataProc, void* opaque,
···
468
468
#endif
469
469
470
470
// Resample PCM
471
-
err = avresample_convert(m_resampler, nullptr, 0, 0, srcaudio->data, 0, srcaudio->nb_samples);
471
+
err = swr_convert(m_resampler, nullptr, 0, (const uint8_t**)&srcaudio->data[0], srcaudio->nb_samples);
472
472
if (err < 0)
473
-
throwFFMPEGError(err, "avresample_convert()");
473
+
throwFFMPEGError(err, "swr_convert()");
474
474
}
475
475
}
476
476
while (!gotFrame);
···
497
497
const size_t bytesPerFrame = m_destinationFormat.mChannelsPerFrame * bytesPerSample;
498
498
const size_t requiredBytes = bytesPerFrame * ENCODER_FRAME_SAMPLES;
499
499
500
-
while (m_audioFramePrebuf.size() < requiredBytes && (avail = avresample_available(m_resampler)) > 0)
500
+
while (m_audioFramePrebuf.size() < requiredBytes && (avail = swr_get_out_samples(m_resampler, 0)) > 0)
501
501
{
502
502
av_samples_alloc(&output, &out_linesize, m_destinationFormat.mChannelsPerFrame,
503
503
avail, m_encoder->sample_fmt, 0);
504
504
505
-
if (avresample_read(m_resampler, &output, avail) != avail)
505
+
if ((avail = swr_convert(m_resampler, &output, avail, nullptr, 0)) < 0)
506
506
{
507
507
av_freep(&output);
508
-
throwFFMPEGError(err, "avresample_read()");
508
+
throwFFMPEGError(err, "swr_convert()");
509
509
}
510
510
511
511
#ifdef DEBUG_AUDIOCONVERTER
+2
-2
src/CoreAudio/AudioToolbox/AudioConverterImpl.h
+2
-2
src/CoreAudio/AudioToolbox/AudioConverterImpl.h
···
6
6
#include <fstream>
7
7
8
8
extern "C" {
9
-
#include <libavresample/avresample.h>
9
+
#include <libswresample/swresample.h>
10
10
#include <libavcodec/avcodec.h>
11
11
}
12
12
···
53
53
AVFrame* m_audioFrame = nullptr;
54
54
ConsumableBuffer m_audioFramePrebuf;
55
55
56
-
AVAudioResampleContext* m_resampler = nullptr;
56
+
SwrContext* m_resampler = nullptr;
57
57
UInt32 m_outBitRate = 128000;
58
58
bool m_encoderInitialized = false;
59
59
AVCodec* m_codecIn = nullptr;
+1
-1
src/CoreAudio/AudioToolbox/CMakeLists.txt
+1
-1
src/CoreAudio/AudioToolbox/CMakeLists.txt