Skip to content

Fix filter memory leak #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valnoel merged 2 commits into from
Feb 1, 2021
Merged

Fix filter memory leak #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be100b8
Fix: don't unref and free audio filters data twice
valnoel Feb 1, 2021
d4a39a9
Bump version to 0.15.4
valnoel Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/AvTranscoder/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define AVTRANSCODER_VERSION_MAJOR 0
#define AVTRANSCODER_VERSION_MINOR 15
#define AVTRANSCODER_VERSION_MICRO 3
#define AVTRANSCODER_VERSION_MICRO 4

#include <AvTranscoder/system.hpp>

Expand Down
12 changes: 6 additions & 6 deletions src/AvTranscoder/transcoder/StreamTranscoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,12 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode()
_transformedData->allocateData();
}
}
else if(_filterGraph->hasFilters())
{
LOG_DEBUG("Free filtered data") // filled from filter graph sink
av_frame_unref(&_filteredData->getAVFrame());
_filteredData->freeData();
}

// Check decoding status
bool continueProcess = true;
Expand Down Expand Up @@ -805,12 +811,6 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode()
LOG_DEBUG("Encode")
_outputEncoder->encodeFrame(*_transformedData, data);

if(_filterGraph->hasFilters())
{
LOG_DEBUG("Free filtered data") // filled from filter graph sink
av_frame_unref(&_filteredData->getAVFrame());
_filteredData->freeData();
}
}
else
{
Expand Down