diff options
| author | wm4 <wm4@nowhere> | 2014-11-24 19:40:24 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-11-24 19:44:26 +0100 |
| commit | 2228d4737367fb0303bec263bc06ca90c9ff8757 (patch) | |
| tree | 30231e75b7fedac3424711fb082c0b2f196f04c0 /audio/chmap.h | |
| parent | 7561adb14da8ce5f2a742eea8506823500167ad5 (diff) | |
| download | mpv-2228d4737367fb0303bec263bc06ca90c9ff8757.tar.bz2 mpv-2228d4737367fb0303bec263bc06ca90c9ff8757.tar.xz | |
ao_alsa: try to use the channel map reported by ALSA
If ALSA reports a channel map, and it looks like it makes sense (i.e.
could be converted to mpv channel map, and the channel count matches),
then use that instead of the channel map we are assuming.
This is based on code written by lachs0r (alsa_ng branch).
Diffstat (limited to 'audio/chmap.h')
| -rw-r--r-- | audio/chmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/chmap.h b/audio/chmap.h index 22cf6fb73b..c7851a8657 100644 --- a/audio/chmap.h +++ b/audio/chmap.h @@ -61,7 +61,8 @@ enum mp_speaker_id { MP_SPEAKER_ID_UNKNOWN0 = 64, MP_SPEAKER_ID_UNKNOWN_LAST = MP_SPEAKER_ID_UNKNOWN0 + MP_NUM_CHANNELS - 1, - // Including the unassigned IDs in between. This is not a valid ID anymore. + // Including the unassigned IDs in between. This is not a valid ID anymore, + // but is still within uint8_t. MP_SPEAKER_ID_COUNT, }; |