Skip to content

M
mpd
Commit bce608cd authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/ffmpeg: ffmpeg_decode() may throw

Don't catch and log exceptions. Let the caller handle the error.
parent 38a0844c
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 18 deletions
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ bce608cd
...@@ -216,16 +216,8 @@ FfmpegSendFrame(DecoderClient &client, InputStream &is, ...@@ -216,16 +216,8 @@ FfmpegSendFrame(DecoderClient &client, InputStream &is,
size_t &skip_bytes, size_t &skip_bytes,
FfmpegBuffer &buffer) FfmpegBuffer &buffer)
{ {
ConstBuffer<void> output_buffer; ConstBuffer<void> output_buffer =
copy_interleave_frame(codec_context, frame, 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;
}
if (skip_bytes > 0) { if (skip_bytes > 0) {
if (skip_bytes >= output_buffer.size) { if (skip_bytes >= output_buffer.size) {
...@@ -636,14 +628,8 @@ ffmpeg_decode(DecoderClient &client, InputStream &input) ...@@ -636,14 +628,8 @@ ffmpeg_decode(DecoderClient &client, InputStream &input)
return; return;
} }
AVFormatContext *format_context; AVFormatContext *format_context =
try { FfmpegOpenInput(stream.io, input.GetURI(), nullptr);
format_context =FfmpegOpenInput(stream.io, input.GetURI(),
nullptr);
} catch (...) {
LogError(std::current_exception());
return;
}
AtScopeExit(&format_context) { AtScopeExit(&format_context) {
avformat_close_input(&format_context); avformat_close_input(&format_context);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment