griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Audaspace: porting changes from upstream.

Browse Source 
Fixes for ffmpeg 8 and bugfix of a memory leak.
This commit is contained in:
Jörg Müller
2025-08-26 20:46:56 +02:00
parent 7f4096be41
commit ebfad2c071
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp vendored
View File

@@ -255,13 +255,7 @@ void FFMPEGReader::init(int stream)
m_specs.rate = (SampleRate) m_codecCtx->sample_rate;
}
FFMPEGReader::FFMPEGReader(const std::string &filename, int stream) :
m_pkgbuf(),
m_formatCtx(nullptr),
m_codecCtx(nullptr),
m_frame(nullptr),
m_aviocontext(nullptr),
m_membuf(nullptr)
FFMPEGReader::FFMPEGReader(const std::string& filename, int stream) : m_pkgbuf(), m_formatCtx(nullptr), m_codecCtx(nullptr), m_frame(nullptr), m_aviocontext(nullptr)
{
// open file
if(avformat_open_input(&m_formatCtx, filename.c_str(), nullptr, nullptr)!=0)
@@ -285,13 +279,15 @@ FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream) :
m_membuffer(buffer),
m_membufferpos(0)
{
m_membuf = reinterpret_cast<data_t*>(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE));
constexpr int BUFFER_SIZE{4096};
m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this, read_packet, nullptr, seek_packet);
auto membuf = reinterpret_cast<data_t*>(av_malloc(BUFFER_SIZE));
m_aviocontext = avio_alloc_context(membuf, BUFFER_SIZE, 0, this, read_packet, nullptr, seek_packet);
if(!m_aviocontext)
{
av_free(m_aviocontext);
av_free(membuf);
AUD_THROW(FileException, "Buffer reading context couldn't be created with ffmpeg.");
}
@@ -299,6 +295,8 @@ FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream) :
m_formatCtx->pb = m_aviocontext;
if(avformat_open_input(&m_formatCtx, "", nullptr, nullptr)!=0)
{
if(m_aviocontext->buffer)
av_free(m_aviocontext->buffer);
av_free(m_aviocontext);
AUD_THROW(FileException, "Buffer couldn't be read with ffmpeg.");
}
@@ -310,6 +308,8 @@ FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream) :
catch(Exception&)
{
avformat_close_input(&m_formatCtx);
if(m_aviocontext->buffer)
av_free(m_aviocontext->buffer);
av_free(m_aviocontext);
throw;
}
@@ -325,6 +325,13 @@ FFMPEGReader::~FFMPEGReader()
if(m_codecCtx)
avcodec_free_context(&m_codecCtx);
#endif
if(m_aviocontext)
{
if(m_aviocontext->buffer)
av_free(m_aviocontext->buffer);
av_free(m_aviocontext);
}
avformat_close_input(&m_formatCtx);
}

5
extern/audaspace/plugins/ffmpeg/FFMPEGReader.h vendored
View File

@@ -106,11 +106,6 @@ private:
*/
std::shared_ptr<Buffer> m_membuffer;
/**
* The buffer to read with.
*/
data_t* m_membuf;
/**
* Reading position of the buffer.
*/