ad_lavc: use fmt-conversion to map sample formats

Makefile

@@ -122,6 +122,7 @@ ifeq ($(HAVE_AVUTIL_REFCOUNTING),no)
 endif
 
 SOURCES = talloc.c \
+          audio/fmt-conversion.c \
           audio/format.c \
           audio/mixer.c \
           audio/reorder_ch.c \

audio/decode/ad_lavc.c

@@ -35,6 +35,7 @@
 
 #include "ad_internal.h"
 #include "audio/reorder_ch.h"
+#include "audio/fmt-conversion.h"
 
 #include "compat/mpbswap.h"
 #include "compat/libav.h"
@@ -144,17 +145,8 @@ static int preinit(sh_audio_t *sh)
 static int setup_format(sh_audio_t *sh_audio,
                         const AVCodecContext *lavc_context)
 {
-    int sample_format = sh_audio->sample_format;
+    int sample_format        =
-    switch (av_get_packed_sample_fmt(lavc_context->sample_fmt)) {
+        af_from_avformat(av_get_packed_sample_fmt(lavc_context->sample_fmt));
-    case AV_SAMPLE_FMT_U8:  sample_format = AF_FORMAT_U8;       break;
-    case AV_SAMPLE_FMT_S16: sample_format = AF_FORMAT_S16_NE;   break;
-    case AV_SAMPLE_FMT_S32: sample_format = AF_FORMAT_S32_NE;   break;
-    case AV_SAMPLE_FMT_FLT: sample_format = AF_FORMAT_FLOAT_NE; break;
-    default:
-        mp_msg(MSGT_DECAUDIO, MSGL_FATAL, "Unsupported sample format\n");
-        sample_format = AF_FORMAT_UNKNOWN;
-    }
-
     bool broken_srate        = false;
     int samplerate           = lavc_context->sample_rate;
     int container_samplerate = sh_audio->container_out_samplerate;
@@ -279,13 +271,9 @@ static int init(sh_audio_t *sh_audio, const char *decoder)
     if (sh_audio->wf && sh_audio->wf->nAvgBytesPerSec)
         sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
 
-    switch (av_get_packed_sample_fmt(lavc_context->sample_fmt)) {
+    int af_sample_fmt =
-    case AV_SAMPLE_FMT_U8:
+        af_from_avformat(av_get_packed_sample_fmt(lavc_context->sample_fmt));
-    case AV_SAMPLE_FMT_S16:
+    if (af_sample_fmt == AF_FORMAT_UNKNOWN) {
-    case AV_SAMPLE_FMT_S32:
-    case AV_SAMPLE_FMT_FLT:
-        break;
-    default:
         uninit(sh_audio);
         return 0;
     }

audio/fmt-conversion.c

@@ -0,0 +1,64 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */ 
+
+#include "core/mp_msg.h"
+#include <libavutil/avutil.h>
+#include <libavutil/samplefmt.h>
+#include "format.h"
+#include "fmt-conversion.h"
+
+static const struct {
+    enum AVSampleFormat sample_fmt;
+    int fmt;
+} audio_conversion_map[] = {
+    {AV_SAMPLE_FMT_U8,    AF_FORMAT_U8},
+    {AV_SAMPLE_FMT_S16,   AF_FORMAT_S16_NE},
+    {AV_SAMPLE_FMT_S32,   AF_FORMAT_S32_NE},
+    {AV_SAMPLE_FMT_FLT,   AF_FORMAT_FLOAT_NE},
+
+    {AV_SAMPLE_FMT_NONE,  0},
+};
+
+enum AVSampleFormat af_to_avformat(int fmt)
+{
+    int i;
+    enum AVSampleFormat sample_fmt;
+    for (i = 0; audio_conversion_map[i].fmt; i++)
+        if (audio_conversion_map[i].fmt == fmt)
+            break;
+    sample_fmt = audio_conversion_map[i].sample_fmt;
+    if (sample_fmt == AF_FORMAT_UNKNOWN)
+        mp_msg(MSGT_GLOBAL, MSGL_V, "Unsupported sample format: %s\n",
+                af_fmt2str_short(fmt));
+    return sample_fmt;
+}
+
+int af_from_avformat(enum AVSampleFormat sample_fmt)
+{
+    int i;
+    for (i = 0; audio_conversion_map[i].fmt; i++)
+        if (audio_conversion_map[i].sample_fmt == sample_fmt)
+            break;
+    int fmt = audio_conversion_map[i].fmt;
+    if (!fmt) {
+        const char *fmtname = av_get_sample_fmt_name(sample_fmt);
+        mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVSampleFormat %s (%d)\n",
+               fmtname ? fmtname : "INVALID", sample_fmt);
+    }
+    return fmt;
+}

audio/fmt-conversion.h

@@ -0,0 +1,25 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_SAMPLE_FMT_CONVERSION_H
+#define MPLAYER_SAMPLE_FMT_CONVERSION_H
+
+enum AVSampleFormat af_to_avformat(int fmt);
+int af_from_avformat(enum AVSampleFormat sample_fmt);
+
+#endif /* MPLAYER_SAMPLE_FMT_CONVERSION_H */