rawaudio: use mplayer audio format for format option

The rawaudio demuxer had a rather hard to use way to set the audio
format with the --rawaudio=format=value option. The user had to pass a
numeric value, which then was set as wFormatTag member in the
WAVEFORMATEX header.

Make it use the mplayer audio format (the same as --af=format=value).
Add a new internal pseudo audio codec tag, which is hopefully unused,
which makes ad_pcm use the value in wFormatTag as internal mplayer
audio format.

Playing non-PCM formats is disabled. (At least AC3 can be played
directly.)

1 files changed, 6 insertions, 1 deletions

diff --git a/libaf/format.c b/libaf/format.c
index ffdf435e71..88d66522a0 100644
--- a/libaf/format.c
+++ b/libaf/format.c
@@ -112,12 +112,17 @@ const char *af_fmt2str_short(int format)
     return "??";
 }
 
+static bool af_fmt_valid(int format)
+{
+    return (format & AF_FORMAT_MASK) == format;
+}
+
 int af_str2fmt_short(bstr str)
 {
     if (bstr_startswith0(str, "0x")) {
         bstr rest;
         int fmt = bstrtoll(str, &rest, 16);
-        if (rest.len == 0)
+        if (rest.len == 0 && af_fmt_valid(fmt))
             return fmt;
     }