Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio: fix format function consistency issues

Browse Source 
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".
This commit is contained in:
wm4
2015-06-26 23:06:37 +02:00
parent d6737c5fab
commit 6147bcce35
21 changed files with 86 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
player/audio.c
View File

@@ -229,7 +229,7 @@ void reinit_audio_chain(struct MPContext *mpctx)
afs->output = (struct mp_audio){0};
if (mpctx->ao) {
ao_get_format(mpctx->ao, &afs->output);
} else if (!AF_FORMAT_IS_SPECIAL(in_format.format)) {
} else if (af_fmt_is_pcm(in_format.format)) {
afs->output.rate = opts->force_srate;
mp_audio_set_format(&afs->output, opts->audio_output_format);
mp_audio_set_channels(&afs->output, &opts->audio_output_channels);
@@ -260,7 +260,7 @@ void reinit_audio_chain(struct MPContext *mpctx)
ao_get_format(mpctx->ao, &fmt);
// Verify passthrough format was not changed.
if (mpctx->ao && AF_FORMAT_IS_SPECIAL(afs->output.format)) {
if (mpctx->ao && af_fmt_is_spdif(afs->output.format)) {
if (!mp_audio_config_equals(&afs->output, &fmt)) {
MP_ERR(mpctx, "Passthrough format unsupported.\n");
ao_uninit(mpctx->ao);
@@ -270,7 +270,7 @@ void reinit_audio_chain(struct MPContext *mpctx)
if (!mpctx->ao) {
// If spdif was used, try to fallback to PCM.
if (AF_FORMAT_IS_SPECIAL(afs->output.format) &&
if (af_fmt_is_spdif(afs->output.format) &&
mpctx->d_audio->spdif_passthrough)
{
mpctx->d_audio->spdif_passthrough = false;