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

decoder/ffmpeg: ffmpeg_decode() may throw

Browse Source 
Don't catch and log exceptions.  Let the caller handle the error.
This commit is contained in:
Max Kellermann 2019-03-13 00:20:13 +01:00
parent 38a0844cdf
commit bce608cdbc
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -216,16 +216,8 @@ FfmpegSendFrame(DecoderClient &client, InputStream &is,
size_t &skip_bytes,
FfmpegBuffer &buffer)
{
ConstBuffer<void> output_buffer;
try {
output_buffer = copy_interleave_frame(codec_context, frame,
buffer);
} catch (...) {
/* this must be a serious error, e.g. OOM */
LogError(std::current_exception());
return DecoderCommand::STOP;
}
ConstBuffer<void> output_buffer =
copy_interleave_frame(codec_context, frame, buffer);
if (skip_bytes > 0) {
if (skip_bytes >= output_buffer.size) {
@ -636,14 +628,8 @@ ffmpeg_decode(DecoderClient &client, InputStream &input)
return;
}
AVFormatContext *format_context;
try {
format_context =FfmpegOpenInput(stream.io, input.GetURI(),
nullptr);
} catch (...) {
LogError(std::current_exception());
return;
}
AVFormatContext *format_context =
FfmpegOpenInput(stream.io, input.GetURI(), nullptr);
AtScopeExit(&format_context) {
avformat_close_input(&format_context);