owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bad error handling when transcoding. fixes #75

Browse Source
This commit is contained in:
emeric
2020-08-14 11:51:03 +02:00
parent 2ba1bb3c79
commit cb0fe96e4a
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/av/impl/AvTranscoder.cpp
+7 -12
View File
@@ -199,16 +199,6 @@ Transcoder::process(std::vector<unsigned char>& output, std::size_t maxSize)
if (!_child || _isComplete) if (!_child || _isComplete)
return; return;
if (_child->out().fail())
{
LOG(DEBUG) << "Stdout FAILED 2";
}
if (_child->out().eof())
{
LOG(DEBUG) << "Stdout ENDED 2";
}
output.resize(maxSize); output.resize(maxSize);
//Read on the output stream //Read on the output stream
@@ -218,14 +208,19 @@ Transcoder::process(std::vector<unsigned char>& output, std::size_t maxSize)
if (_child->out().fail()) if (_child->out().fail())
{ {
LOG(DEBUG) << "Stdout FAILED"; LOG(DEBUG) << "Stdout FAILED";
_isComplete = true;
} }
if (_child->out().eof()) if (_child->out().eof())
{ {
LOG(DEBUG) << "Stdout EOF!"; LOG(DEBUG) << "Stdout EOF!";
_child->clear();
_isComplete = true; _isComplete = true;
}
if (_isComplete)
{
LOG(DEBUG) << "Transcode complete!";
_child->clear();
_child.reset(); _child.reset();
} }