diff options
author | wm4 <wm4@nowhere> | 2013-04-05 19:47:51 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:24:54 +0200 |
commit | f7a427676c0fe3c12509e3d9a243301f93626b0a (patch) | |
tree | 8dc8a2371a3e561ebb03f0bd17c2d59135c9f872 /audio/filter/af_bs2b.c | |
parent | 0042735d7aefb2f05a79ba2eae741a63f22ea0c9 (diff) | |
download | mpv-f7a427676c0fe3c12509e3d9a243301f93626b0a.tar.bz2 mpv-f7a427676c0fe3c12509e3d9a243301f93626b0a.tar.xz |
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.
Diffstat (limited to 'audio/filter/af_bs2b.c')
-rw-r--r-- | audio/filter/af_bs2b.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c index aebcc3b201..f8003a70a3 100644 --- a/audio/filter/af_bs2b.c +++ b/audio/filter/af_bs2b.c @@ -105,9 +105,8 @@ static int control(struct af_instance *af, int cmd, void *arg) format = ((struct mp_audio*)arg)->format; af->data->rate = ((struct mp_audio*)arg)->rate; - af->data->nch = 2; // bs2b is useful only for 2ch audio - af->data->bps = ((struct mp_audio*)arg)->bps; - af->data->format = format; + mp_audio_set_num_channels(af->data, 2); // bs2b is useful only for 2ch audio + mp_audio_set_format(af->data, format); /* check for formats supported by libbs2b and assign corresponding handlers */ @@ -162,8 +161,7 @@ static int control(struct af_instance *af, int cmd, void *arg) break; default: af->play = play_f; - af->data->format = AF_FORMAT_FLOAT_NE; - af->data->bps = 4; + mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE); break; } |