Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AVFormatWriter: Safeness after avformat_write_header fails

Browse Source 
* The ffmpeg documentation explicit forbid to write the trailer
when the header write failed.
* Fixes #12678.
This commit is contained in:
Dario Casalinuovo 2016-04-06 00:35:44 +02:00
parent f45b1ff242
commit cbada661c3
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
View File

@ -381,6 +381,7 @@ AVFormatWriter::AVFormatWriter()
:
fContext(avformat_alloc_context()),
fHeaderWritten(false),
fHeaderError(-1),
fIOContext(NULL),
fStreamLock("stream lock")
{
@ -488,9 +489,9 @@ AVFormatWriter::CommitHeader()
}
#endif
int result = avformat_write_header(fContext, NULL);
if (result < 0)
TRACE(" avformat_write_header(): %d\n", result);
fHeaderError = avformat_write_header(fContext, NULL);
if (fHeaderError < 0)
TRACE(" avformat_write_header(): %d\n", fHeaderError);
// We need to close the codecs we opened, even in case of failure.
fHeaderWritten = true;
@ -505,7 +506,7 @@ AVFormatWriter::CommitHeader()
}
#endif // TRACE_AVFORMAT_WRITER
return result == 0 ? B_OK : B_ERROR;
return fHeaderError == 0 ? B_OK : B_ERROR;
}
@ -529,10 +530,14 @@ AVFormatWriter::Close()
if (!fHeaderWritten)
return B_NOT_ALLOWED;
int result = av_write_trailer(fContext);
if (result < 0)
TRACE(" av_write_trailer(): %d\n", result);
int result = -1;
// From ffmpeg documentation: [av_write_trailer] may only be called
// after a successful call to avformat_write_header.
if (fHeaderError > 0) {
result = av_write_trailer(fContext);
if (result < 0)
TRACE(" av_write_trailer(): %d\n", result);
}
return result == 0 ? B_OK : B_ERROR;
}

1
src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
View File

@ -53,6 +53,7 @@ private:
AVFormatContext* fContext;
bool fHeaderWritten;
int fHeaderError;
AVIOContext* fIOContext;