From 55e777f10b3e241f2634b471e482bab230773ce0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 7 May 2015 23:15:52 +0200 Subject: audio: remove UNKNOWN pseudo speakers Reuse MP_SPEAKER_ID_NA for this. If all mp_chmap entries are set to NA, the channel layout has special "unknown channel layout" semantics, which are used to deal with some corner cases. --- audio/chmap.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'audio/chmap.h') diff --git a/audio/chmap.h b/audio/chmap.h index d3ce5cdb21..d4cdc3ea85 100644 --- a/audio/chmap.h +++ b/audio/chmap.h @@ -56,15 +56,12 @@ enum mp_speaker_id { MP_SPEAKER_ID_SDR, // SURROUND_DIRECT_RIGHT MP_SPEAKER_ID_LFE2, // LOW_FREQUENCY_2 - // Special mpv-specific speaker entries reserved for channels which have no - // known meaning. - MP_SPEAKER_ID_UNKNOWN0 = 64, - MP_SPEAKER_ID_UNKNOWN_LAST = MP_SPEAKER_ID_UNKNOWN0 + MP_NUM_CHANNELS - 1, + // Speaker IDs >= 64 are not representable in WAVEFORMATEXTENSIBLE or libav*. // "Silent" channels. These are sometimes used to insert padding for // unused channels. Unlike other speaker types, multiple of these can // occur in a single mp_chmap. - MP_SPEAKER_ID_NA, + MP_SPEAKER_ID_NA = 64, // Including the unassigned IDs in between. This is not a valid ID anymore, // but is still within uint8_t. -- cgit v1.2.3