RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-07 15:41:55 +00:00
Code Issues Releases Wiki Activity

ao_coreaudio: move digital detection before asbd creation

Browse Source
This commit is contained in:
Stefano Pigozzi 2013-07-03 08:17:31 +02:00
parent 6473cc59b1
commit 24cad42363
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
audio/out/ao_coreaudio.c
View File

@ -78,7 +78,6 @@ struct priv_d {
struct priv {
AudioDeviceID device; // selected device
bool supports_digital; // selected device supports digital mode?
bool is_digital; // running in digital mode?
AudioUnit audio_unit; // AudioUnit for lpcm output
@ -263,7 +262,6 @@ static int init(struct ao *ao, char *params)
struct priv *p = talloc_zero(ao, struct priv);
*p = (struct priv) {
.device = 0,
.supports_digital = false,
.is_digital = 0,
};
@ -315,10 +313,17 @@ static int init(struct ao *ao, char *params)
if (!ao_chmap_sel_adjust(ao, &chmap_sel, &ao->channels))
goto coreaudio_error;
bool supports_digital = false;
/* Probe whether device support S/PDIF stream output if input is AC3 stream. */
if (AF_FORMAT_IS_AC3(ao->format)) {
if (AudioDeviceSupportsDigital(selected_device))
supports_digital = true;
}
// Build ASBD for the input format
AudioStreamBasicDescription asbd;
asbd.mSampleRate = ao->samplerate;
asbd.mFormatID = p->supports_digital ?
asbd.mFormatID = supports_digital ?
kAudioFormat60958AC3 : kAudioFormatLinearPCM;
asbd.mChannelsPerFrame = ao->channels.num;
asbd.mBitsPerChannel = af_fmt2bits(ao->format);
@ -340,13 +345,7 @@ static int init(struct ao *ao, char *params)
ca_print_asbd("source format:", &asbd);
/* Probe whether device support S/PDIF stream output if input is AC3 stream. */
if (AF_FORMAT_IS_AC3(ao->format)) {
if (AudioDeviceSupportsDigital(selected_device))
p->supports_digital = true;
}
if (p->supports_digital)
if (supports_digital)
return init_digital(ao, asbd);
else
return init_lpcm(ao, asbd);