diff options
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao.c | 2 | ||||
| -rw-r--r-- | audio/out/ao_alsa.c | 6 | ||||
| -rw-r--r-- | audio/out/ao_lavc.c | 4 | ||||
| -rwxr-xr-x | audio/out/ao_wasapi_utils.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c index 8a66b1171c..4953c14c71 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -199,7 +199,7 @@ static struct ao *ao_init(bool probing, struct mpv_global *global, ao->sstride = af_fmt2bps(ao->format); ao->num_planes = 1; - if (af_fmt_is_planar(ao->format)) { + if (AF_FORMAT_IS_PLANAR(ao->format)) { ao->num_planes = ao->channels.num; } else { ao->sstride *= ao->channels.num; diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 1ee662ac77..f84a781e8a 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -467,11 +467,11 @@ static int init_device(struct ao *ao) err = snd_pcm_hw_params_set_format(p->alsa, alsa_hwparams, p->alsa_fmt); CHECK_ALSA_ERROR("Unable to set format"); - snd_pcm_access_t access = af_fmt_is_planar(ao->format) + snd_pcm_access_t access = AF_FORMAT_IS_PLANAR(ao->format) ? SND_PCM_ACCESS_RW_NONINTERLEAVED : SND_PCM_ACCESS_RW_INTERLEAVED; err = snd_pcm_hw_params_set_access(p->alsa, alsa_hwparams, access); - if (err < 0 && af_fmt_is_planar(ao->format)) { + if (err < 0 && AF_FORMAT_IS_PLANAR(ao->format)) { ao->format = af_fmt_from_planar(ao->format); access = SND_PCM_ACCESS_RW_INTERLEAVED; err = snd_pcm_hw_params_set_access(p->alsa, alsa_hwparams, access); @@ -817,7 +817,7 @@ static int play(struct ao *ao, void **data, int samples, int flags) return 0; do { - if (af_fmt_is_planar(ao->format)) { + if (AF_FORMAT_IS_PLANAR(ao->format)) { res = snd_pcm_writen(p->alsa, data, samples); } else { res = snd_pcm_writei(p->alsa, data[0], samples); diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index 2405b2213a..f61401a49e 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -242,7 +242,7 @@ static int encode(struct ao *ao, double apts, void **data) frame->format = af_to_avformat(ao->format); frame->nb_samples = ac->aframesize; - size_t num_planes = af_fmt_is_planar(ao->format) ? ao->channels.num : 1; + size_t num_planes = AF_FORMAT_IS_PLANAR(ao->format) ? ao->channels.num : 1; assert(num_planes <= AV_NUM_DATA_POINTERS); for (int n = 0; n < num_planes; n++) frame->extended_data[n] = data[n]; @@ -351,7 +351,7 @@ static int play(struct ao *ao, void **data, int samples, int flags) double pts = ectx->last_audio_in_pts; pts += ectx->samples_since_last_pts / (double)ao->samplerate; - size_t num_planes = af_fmt_is_planar(ao->format) ? ao->channels.num : 1; + size_t num_planes = AF_FORMAT_IS_PLANAR(ao->format) ? ao->channels.num : 1; void *tempdata = NULL; void *padded[MP_NUM_CHANNELS]; diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index c5c4cd0a9a..afeb7d1dc0 100755 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -91,7 +91,7 @@ static const GUID *format_to_subtype(int format) return wasapi_fmt_table[i].subtype; } return &KSDATAFORMAT_SPECIFIER_NONE; - } else if (af_fmt_is_float(format)) { + } else if (AF_FORMAT_IS_FLOAT(format)) { return &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; } return &KSDATAFORMAT_SUBTYPE_PCM; |