aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-18 23:39:56 +0100
committerMax Kellermann <max@duempel.org>2014-12-18 23:39:56 +0100
commit190cdfc3263f5cfa6dfca98b0e4f2e8b5886c2b9 (patch)
tree90ffcdc2b3c9f21d9af9163cfc76609e5ab143ad
parent13b954c76538f6204cc9b6b2c798113bd4722078 (diff)
downloadmpd-190cdfc3263f5cfa6dfca98b0e4f2e8b5886c2b9.tar.gz
mpd-190cdfc3263f5cfa6dfca98b0e4f2e8b5886c2b9.tar.xz
mpd-190cdfc3263f5cfa6dfca98b0e4f2e8b5886c2b9.zip
decoder/ffmpeg: copy_interleave_frame() returns Error
-rw-r--r--src/decoder/plugins/FfmpegDecoderPlugin.cxx36
1 files changed, 22 insertions, 14 deletions
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 35daa5bc3..7d2532371 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -23,6 +23,7 @@
#include "config.h"
#include "FfmpegDecoderPlugin.hxx"
#include "lib/ffmpeg/Domain.hxx"
+#include "lib/ffmpeg/Error.hxx"
#include "lib/ffmpeg/LogError.hxx"
#include "lib/ffmpeg/Buffer.hxx"
#include "../DecoderAPI.hxx"
@@ -272,27 +273,35 @@ copy_interleave_frame2(uint8_t *dest, uint8_t **src,
/**
* Copy PCM data from a AVFrame to an interleaved buffer.
*/
-static int
+static size_t
copy_interleave_frame(const AVCodecContext &codec_context,
const AVFrame &frame,
uint8_t **output_buffer,
- FfmpegBuffer &global_buffer)
+ FfmpegBuffer &global_buffer,
+ Error &error)
{
+ assert(frame.nb_samples > 0);
+
int plane_size;
const int data_size =
av_samples_get_buffer_size(&plane_size,
codec_context.channels,
frame.nb_samples,
codec_context.sample_fmt, 1);
- if (data_size <= 0)
- return data_size;
+ assert(data_size != 0);
+ if (data_size < 0) {
+ SetFfmpegError(error, data_size);
+ return 0;
+ }
if (av_sample_fmt_is_planar(codec_context.sample_fmt) &&
codec_context.channels > 1) {
*output_buffer = global_buffer.GetT<uint8_t>(data_size);
- if (*output_buffer == nullptr)
+ if (*output_buffer == nullptr) {
/* Not enough memory - shouldn't happen */
- return AVERROR(ENOMEM);
+ error.SetErrno(ENOMEM);
+ return 0;
+ }
copy_interleave_frame2(*output_buffer, frame.extended_data,
frame.nb_samples,
@@ -321,6 +330,8 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
stream.time_base));
}
+ Error error;
+
DecoderCommand cmd = DecoderCommand::NONE;
while (packet.size > 0 && cmd == DecoderCommand::NONE) {
int got_frame = 0;
@@ -336,24 +347,21 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
packet.data += len;
packet.size -= len;
- if (!got_frame)
+ if (!got_frame || frame.nb_samples <= 0)
continue;
uint8_t *output_buffer = nullptr;
- int audio_size =
+ size_t audio_size =
copy_interleave_frame(codec_context, frame,
&output_buffer,
- buffer);
- if (audio_size < 0) {
+ buffer, error);
+ if (audio_size == 0) {
/* this must be a serious error,
e.g. OOM */
- LogFfmpegError(audio_size);
+ LogError(error);
return DecoderCommand::STOP;
}
- if (audio_size <= 0)
- continue;
-
cmd = decoder_data(decoder, is,
output_buffer, audio_size,
codec_context.bit_rate / 1000);