From 6147bcce359358855ad02d8d5cbd6575d39b0449 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 26 Jun 2015 23:06:37 +0200 Subject: audio: fix format function consistency issues Replace all the check macros with function calls. Give them all the same case and naming schema. Drop af_fmt2bits(). Only af_fmt2bps() survives as af_fmt_to_bytes(). Introduce af_fmt_is_pcm(), and use it in situations that used !AF_FORMAT_IS_SPECIAL. Nobody really knew what a "special" format was. It simply meant "not PCM". --- audio/filter/af.c | 4 ++-- audio/filter/af_lavcac3enc.c | 2 +- audio/filter/af_lavrresample.c | 2 +- audio/filter/af_volume.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'audio/filter') diff --git a/audio/filter/af.c b/audio/filter/af.c index 3e7fdf045a..f37a47697e 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -493,8 +493,8 @@ static int af_reinit(struct af_stream *s) int fmt_in1 = af->prev->data->format; int fmt_in2 = in.format; if (af_fmt_is_valid(fmt_in1) && af_fmt_is_valid(fmt_in2)) { - bool spd1 = AF_FORMAT_IS_IEC61937(fmt_in1); - bool spd2 = AF_FORMAT_IS_IEC61937(fmt_in2); + bool spd1 = af_fmt_is_spdif(fmt_in1); + bool spd2 = af_fmt_is_spdif(fmt_in2); if (spd1 != spd2 && af->next) { MP_WARN(af, "Filter %s apparently cannot be used due to " "spdif passthrough - removing it.\n", diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c index 5695bfd8c6..8d403a7f12 100644 --- a/audio/filter/af_lavcac3enc.c +++ b/audio/filter/af_lavcac3enc.c @@ -75,7 +75,7 @@ static int control(struct af_instance *af, int cmd, void *arg) struct mp_audio *in = arg; struct mp_audio orig_in = *in; - if (AF_FORMAT_IS_SPECIAL(in->format) || in->nch < s->cfg_min_channel_num) + if (!af_fmt_is_pcm(in->format) || in->nch < s->cfg_min_channel_num) return AF_DETACH; mp_audio_set_format(in, s->in_sampleformat); diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index f811dfaeb9..38fd84c901 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -497,7 +497,7 @@ static int filter(struct af_instance *af, struct mp_audio *in) mp_audio_copy_config(out, &s->avrctx_fmt); if (out->samples && !mp_audio_config_equals(out, &s->pre_out_fmt)) { - assert(AF_FORMAT_IS_PLANAR(out->format) && out->format == real_out.format); + assert(af_fmt_is_planar(out->format) && out->format == real_out.format); reorder_planes(out, s->reorder_out, &s->pool_fmt.channels); if (!mp_audio_config_equals(out, &s->pre_out_fmt)) { struct mp_audio *new = mp_audio_pool_get(s->reorder_buffer, diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c index d66e38c0e1..1b564f0983 100644 --- a/audio/filter/af_volume.c +++ b/audio/filter/af_volume.c @@ -68,7 +68,7 @@ static int control(struct af_instance *af, int cmd, void *arg) } else { mp_audio_set_format(af->data, AF_FORMAT_FLOAT); } - if (AF_FORMAT_IS_PLANAR(in->format)) + if (af_fmt_is_planar(in->format)) mp_audio_set_format(af->data, af_fmt_to_planar(af->data->format)); s->rgain = 1.0; if ((s->rgain_track || s->rgain_album) && af->replaygain_data) { -- cgit v1.2.3