diff options
| author | wm4 <wm4@nowhere> | 2015-05-07 23:15:52 +0200 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-09 21:13:52 +0900 |
| commit | 0ed627d5ab0a41bb33eb54e92a2b3e8890fbdadf (patch) | |
| tree | cf7ce0a3d77e800be8475192d51e4817404649a3 /audio/chmap.h | |
| parent | 1127bb41c2aa4bf60be960ab80fd163bc7011bdb (diff) | |
| download | mpv-0ed627d5ab0a41bb33eb54e92a2b3e8890fbdadf.tar.bz2 mpv-0ed627d5ab0a41bb33eb54e92a2b3e8890fbdadf.tar.xz | |
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.
(cherry picked from commit 55e777f10b3e241f2634b471e482bab230773ce0)
Diffstat (limited to 'audio/chmap.h')
| -rw-r--r-- | audio/chmap.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/audio/chmap.h b/audio/chmap.h index 5fbc491dd8..fb3c118bf2 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. |