From 67b36c66d399b52e3a6d3a2ededeefabd31312c4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 12 Apr 2018 18:48:41 +0200 Subject: audio: do not try to resample spdif data Normally we don't even try this, but in corner cases it can happen. For example when inserting lavcac3enc at runtime, and display-sync-resample was active. --- filters/f_autoconvert.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/filters/f_autoconvert.c b/filters/f_autoconvert.c index 78b716623e..6d53a5dce3 100644 --- a/filters/f_autoconvert.c +++ b/filters/f_autoconvert.c @@ -286,6 +286,11 @@ static void handle_audio_frame(struct mp_filter *f) struct mp_chmap chmap = {0}; mp_aframe_get_chmap(aframe, &chmap); + if (p->resampling_forced && !af_fmt_is_pcm(afmt)) { + MP_WARN(p, "ignoring request to resample non-PCM audio for speed change\n"); + p->resampling_forced = false; + } + bool format_change = afmt != p->in_afmt || srate != p->in_srate || !mp_chmap_equals(&chmap, &p->in_chmap) || -- cgit v1.2.3