oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

filter/ffmpeg: call av_frame_unref() before av_frame_get_buffer()

Browse Source 
av_frame_get_buffer() leaks memory if buffers were already allocated.

Fixes one of the memory leaks of https://github.com/MusicPlayerDaemon/MPD/issues/514
This commit is contained in:
Max Kellermann 2019-03-24 22:24:54 +01:00
parent 054a7557fa
commit ec2badbedd
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/filter/plugins/FfmpegFilter.cxx
View File

@ -37,12 +37,12 @@ FfmpegFilter::FfmpegFilter(const AudioFormat &in_audio_format,
graph(std::move(_graph)),
buffer_src(std::move(_buffer_src)),
buffer_sink(std::move(_buffer_sink)),
in_format(Ffmpeg::ToFfmpegSampleFormat(in_audio_format.format)),
in_sample_rate(in_audio_format.sample_rate),
in_channels(in_audio_format.channels),
in_audio_frame_size(in_audio_format.GetFrameSize()),
out_audio_frame_size(_out_audio_format.GetFrameSize())
{
in_frame->format = Ffmpeg::ToFfmpegSampleFormat(in_audio_format.format);
in_frame->sample_rate = in_audio_format.sample_rate;
in_frame->channels = in_audio_format.channels;
}
ConstBuffer<void>
@ -50,6 +50,10 @@ FfmpegFilter::FilterPCM(ConstBuffer<void> src)
{
/* submit source data into the FFmpeg audio buffer source */
in_frame.Unref();
in_frame->format = in_format;
in_frame->sample_rate = in_sample_rate;
in_frame->channels = in_channels;
in_frame->nb_samples = src.size / in_audio_frame_size;
in_frame.GetBuffer();

2
src/filter/plugins/FfmpegFilter.hxx
View File

@ -32,6 +32,8 @@ class FfmpegFilter final : public Filter {
Ffmpeg::FilterContext buffer_src, buffer_sink;
Ffmpeg::Frame in_frame, out_frame;
const int in_format, in_sample_rate, in_channels;
const size_t in_audio_frame_size;
const size_t out_audio_frame_size;