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

lib/ffmpeg/DetectFilterFormat: return AudioFormat::Undefined() on EAGAIN

This commit is contained in:
Max Kellermann 2021-08-24 11:05:06 +02:00
parent 7b4225aa1f
commit ebfbb74f9e
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/filter/plugins/FfmpegFilterPlugin.cxx
View File

@ -54,6 +54,9 @@ PreparedFfmpegFilter::Open(AudioFormat &in_audio_format)
Ffmpeg::DetectFilterOutputFormat(in_audio_format, buffer_src,
buffer_sink);
if (!out_audio_format.IsDefined())
throw std::runtime_error("Unable to determine FFmpeg filter output format");
return std::make_unique<FfmpegFilter>(in_audio_format,
out_audio_format,
std::move(graph),

8
src/lib/ffmpeg/DetectFilterFormat.cxx
View File

@ -62,8 +62,14 @@ DetectFilterOutputFormat(const AudioFormat &in_audio_format,
frame.Unref();
err = av_buffersink_get_frame(&buffer_sink, frame.get());
if (err < 0)
if (err < 0) {
if (err == AVERROR(EAGAIN))
/* one sample was not enough input data for
the given filter graph */
return AudioFormat::Undefined();
throw MakeFfmpegError(err, "av_buffersink_get_frame() failed");
}
const SampleFormat sample_format = FromFfmpegSampleFormat(AVSampleFormat(frame->format));
if (sample_format == SampleFormat::UNDEFINED)

3
src/lib/ffmpeg/DetectFilterFormat.hxx
View File

@ -35,6 +35,9 @@ namespace Ffmpeg {
* between.
*
* This function can throw if the FFmpeg filter fails.
*
* @return the output format or AudioFormat::Undefined() if it was not
* possible to determine the format
*/
AudioFormat
DetectFilterOutputFormat(const AudioFormat &in_audio_format,