summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_coreaudio_chmap.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-07 23:07:14 +0200
committerwm4 <wm4@nowhere>2015-05-07 23:07:14 +0200
commitb91b4944bd7ddf6fef4c4254d457117017292c0a (patch)
tree9df3f41d12fe7dc3599d1a0794e1b2b2eb9f1b5e /audio/out/ao_coreaudio_chmap.c
parent34770887410cab45e2779d43a83aa4f6bdecf926 (diff)
downloadmpv-b91b4944bd7ddf6fef4c4254d457117017292c0a.tar.bz2
mpv-b91b4944bd7ddf6fef4c4254d457117017292c0a.tar.xz
audio: define only a single NA speaker ID
Remove the requirement from mp_chmap that speaker entries must be unique. Use this to get rid of all the redundant NA speaker IDs.
Diffstat (limited to 'audio/out/ao_coreaudio_chmap.c')
-rw-r--r--audio/out/ao_coreaudio_chmap.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/audio/out/ao_coreaudio_chmap.c b/audio/out/ao_coreaudio_chmap.c
index f50bf4f3cc..8da0c4c6f0 100644
--- a/audio/out/ao_coreaudio_chmap.c
+++ b/audio/out/ao_coreaudio_chmap.c
@@ -51,7 +51,7 @@ static const int speaker_map[][2] = {
{ kAudioChannelLabel_HeadphonesLeft, MP_SPEAKER_ID_DL },
{ kAudioChannelLabel_HeadphonesRight, MP_SPEAKER_ID_DR },
- { kAudioChannelLabel_Unknown, MP_SPEAKER_ID_NA0 },
+ { kAudioChannelLabel_Unknown, MP_SPEAKER_ID_NA },
{ 0, -1 },
};
@@ -150,12 +150,9 @@ static bool ca_layout_to_mp_chmap(struct ao *ao, AudioChannelLayout *layout,
return false;
}
- int next_na = MP_SPEAKER_ID_NA0;
for (int n = 0; n < l->mNumberChannelDescriptions; n++) {
AudioChannelLabel label = l->mChannelDescriptions[n].mChannelLabel;
- uint8_t speaker = ca_label_to_mp_speaker_id(label);
- if (speaker == MP_SPEAKER_ID_NA0 && next_na < MP_SPEAKER_ID_NA_LAST)
- speaker = next_na++;
+ int speaker = ca_label_to_mp_speaker_id(label);
if (speaker < 0) {
MP_VERBOSE(ao, "channel label=%u unusable to build channel "
"bitmap, skipping layout\n", (unsigned) label);