audio: better rejection of invalid formats

This includes the case when lavc decodes audio with more than 8
channels, which our audio chain currently does not support.

the changes in ad_lavc.c are just simplifications. The code tried to
avoid overriding global parameters if it found something invalid, but
that is not needed anymore.

2 files changed, 21 insertions, 20 deletions

diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 0f442cef52..45e06c8b3d 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -134,15 +134,15 @@ static int setup_format(struct dec_audio *da)
     AVCodecContext *lavc_context = priv->avctx;
     struct sh_audio *sh_audio = da->header->audio;
 
-    int sample_format = af_from_avformat(lavc_context->sample_fmt);
-    if (!sample_format)
-        return -1;
+    // Note: invalid parameters are rejected by dec_audio.c
+
+    mp_audio_set_format(&da->decoded, af_from_avformat(lavc_context->sample_fmt));
 
-    int samplerate = lavc_context->sample_rate;
-    if (!samplerate && sh_audio->wf) {
+    da->decoded.rate = lavc_context->sample_rate;
+    if (!da->decoded.rate && sh_audio->wf) {
         // If not set, try container samplerate.
         // (Maybe this can't happen, and it's an artifact from the past.)
-        samplerate = sh_audio->wf->nSamplesPerSec;
+        da->decoded.rate = sh_audio->wf->nSamplesPerSec;
         mp_tmsg(MSGT_DECAUDIO, MSGL_WARN, "ad_lavc: using container rate.\n");
     }
 
@@ -155,10 +155,8 @@ static int setup_format(struct dec_audio *da)
         if (lavc_chmap.num == sh_audio->channels.num)
             lavc_chmap = sh_audio->channels;
     }
-
     mp_audio_set_channels(&da->decoded, &lavc_chmap);
-    mp_audio_set_format(&da->decoded, sample_format);
-    da->decoded.rate = samplerate;
+
     return 0;
 }
 
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index aede793791..6f46b79a93 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -64,10 +64,17 @@ static const struct ad_functions * const ad_drivers[] = {
 #define DECODE_BUFFER_SAMPLES (8192 + DECODE_MAX_UNIT)
 
 // Drop audio buffer and reinit it (after format change)
-static void reinit_audio_buffer(struct dec_audio *da)
+// Returns whether the format was valid at all.
+static bool reinit_audio_buffer(struct dec_audio *da)
 {
+    if (!mp_audio_config_valid(&da->decoded)) {
+        mp_msg(MSGT_DECAUDIO, MSGL_ERR, "Audio decoder did not specify audio "
+               "format, or requested an unsupported configuration!\n");
+        return false;
+    }
     mp_audio_buffer_reinit(da->decode_buffer, &da->decoded);
     mp_audio_buffer_preallocate_min(da->decode_buffer, DECODE_BUFFER_SAMPLES);
+    return true;
 }
 
 static void uninit_decoder(struct dec_audio *d_audio)
@@ -90,18 +97,12 @@ static int init_audio_codec(struct dec_audio *d_audio, const char *decoder)
         return 0;
     }
 
-    if (!d_audio->decoded.channels.num || !d_audio->decoded.rate ||
-        !d_audio->decoded.format)
-    {
-        mp_tmsg(MSGT_DECAUDIO, MSGL_ERR, "Audio decoder did not specify "
-                "audio format!\n");
+    d_audio->decode_buffer = mp_audio_buffer_create(NULL);
+    if (!reinit_audio_buffer(d_audio)) {
         uninit_decoder(d_audio);
         return 0;
     }
 
-    d_audio->decode_buffer = mp_audio_buffer_create(NULL);
-    reinit_audio_buffer(d_audio);
-
     return 1;
 }
 
@@ -285,8 +286,10 @@ static int filter_n_bytes(struct dec_audio *da, struct mp_audio_buffer *outbuf,
 
     // Assume the filter chain is drained from old data at this point.
     // (If not, the remaining old data is discarded.)
-    if (error == -2)
-        reinit_audio_buffer(da);
+    if (error == -2) {
+        if (!reinit_audio_buffer(da))
+            error = -1; // switch to invalid format
+    }
 
     return error;
 }