audio: add some setters for mp_audio, and require filters to use them

mp_audio has some redundant fields. Setters like mp_audio_set_format()
initialize these properly.

Also move the mp_audio struct to a the file audio.c.

We can remove a mysterious line of code from af.c:

    in.format |= af_bits2fmt(in.bps * 8);

I'm not sure if this was ever actually needed, or if it was some kind of
"make it work" quick-fix that works against the way things were supposed
to work. All filters etc. now set the format correctly, so if there ever
was a need for this code, it's definitely gone.

1 files changed, 1 insertions, 20 deletions

diff --git a/audio/filter/af.h b/audio/filter/af.h
index 96e5c66607..4ccc70792f 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -27,6 +27,7 @@
 #include "core/options.h"
 #include "audio/format.h"
 #include "audio/chmap.h"
+#include "audio/audio.h"
 #include "control.h"
 #include "core/mp_msg.h"
 
@@ -35,17 +36,6 @@ struct af_instance;
 // Number of channels
 #define AF_NCH MP_NUM_CHANNELS
 
-// Audio data chunk
-struct mp_audio {
-    void *audio; // data buffer
-    int len;    // buffer length
-    int rate;   // sample rate
-    int nch;    // number of channels
-    int format; // format
-    int bps;    // bytes per sample
-};
-
-
 // Flags used for defining the behavior of an audio filter
 #define AF_FLAGS_REENTRANT      0x00000000
 #define AF_FLAGS_NOT_REENTRANT  0x00000001
@@ -295,15 +285,6 @@ float af_softclip(float a);
 /** Print a list of all available audio filters */
 void af_help(void);
 
-/**
- * \brief fill the missing parameters in the struct mp_audio structure
- * \param data structure to fill
- * \ingroup af_filter
- *
- * Currently only sets bps based on format
- */
-void af_fix_parameters(struct mp_audio *data);
-
 /** Memory reallocation macro: if a local buffer is used (i.e. if the
    filter doesn't operate on the incoming buffer this macro must be
    called to ensure the buffer is big enough.