Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix filter graph memory usage#305

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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 deletionsrc/AvTranscoder/common.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

#define AVTRANSCODER_VERSION_MAJOR 0
#define AVTRANSCODER_VERSION_MINOR 14
#define AVTRANSCODER_VERSION_MICRO0
#define AVTRANSCODER_VERSION_MICRO1

#include <AvTranscoder/system.hpp>

Expand Down
17 changes: 12 additions & 5 deletionssrc/AvTranscoder/transcoder/StreamTranscoder.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,10 @@ StreamTranscoder::~StreamTranscoder()
{
delete(*it);
}
delete _filteredData;

if(_filteredData != NULL && _filteredData->isDataAllocated())
delete _filteredData;

delete _transformedData;

for(std::vector<IDecoder*>::iterator it = _inputDecoders.begin(); it != _inputDecoders.end(); ++it)
Expand DownExpand Up@@ -620,13 +623,17 @@ bool StreamTranscoder::processTranscode()
const int nbInputSamplesPerChannel = _decodedData.at(_firstInputStreamIndex)->getAVFrame().nb_samples;

// Reallocate output frame
if(nbInputSamplesPerChannel > _filteredData->getAVFrame().nb_samples)
if(_filterGraph->hasFilters())
{
LOG_WARN("The buffer of filtered data corresponds to a frame of " << _filteredData->getAVFrame().nb_samples << " samples. The decoded buffer contains " << nbInputSamplesPerChannel << " samples. Reallocate it.")
_filteredData->freeData();
_filteredData->getAVFrame().nb_samples = nbInputSamplesPerChannel;
_filteredData->allocateData();
if(nbInputSamplesPerChannel > _filteredData->getAVFrame().nb_samples)
{
LOG_WARN("The buffer of filtered data corresponds to a frame of " << _filteredData->getAVFrame().nb_samples << " samples. The decoded buffer contains " << nbInputSamplesPerChannel << " samples. Reallocate it.")
_filteredData->getAVFrame().nb_samples = nbInputSamplesPerChannel;
_filteredData->allocateData();
}
}

if(nbInputSamplesPerChannel > _transformedData->getAVFrame().nb_samples)
{
LOG_WARN("The buffer of transformed data corresponds to a frame of " << _transformedData->getAVFrame().nb_samples << " samples. The decoded buffer contains " << nbInputSamplesPerChannel << " samples. Reallocate it.")
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp