diff options
Diffstat (limited to 'audio/chmap.h')
| -rw-r--r-- | audio/chmap.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/audio/chmap.h b/audio/chmap.h index 1ae4fb0697..296b2a1712 100644 --- a/audio/chmap.h +++ b/audio/chmap.h @@ -61,6 +61,11 @@ enum mp_speaker_id { MP_SPEAKER_ID_UNKNOWN0 = 64, MP_SPEAKER_ID_UNKNOWN_LAST = MP_SPEAKER_ID_UNKNOWN0 + MP_NUM_CHANNELS - 1, + // "Silent" channels. These are sometimes used to insert padding for + // unused channels. + MP_SPEAKER_ID_NA0, + MP_SPEAKER_ID_NA_LAST = MP_SPEAKER_ID_NA0 + MP_NUM_CHANNELS - 1, + // Including the unassigned IDs in between. This is not a valid ID anymore, // but is still within uint8_t. MP_SPEAKER_ID_COUNT, @@ -101,6 +106,8 @@ bool mp_chmap_equals_reordered(const struct mp_chmap *a, const struct mp_chmap * bool mp_chmap_is_stereo(const struct mp_chmap *src); void mp_chmap_reorder_norm(struct mp_chmap *map); +void mp_chmap_remove_na(struct mp_chmap *map); +void mp_chmap_fill_na(struct mp_chmap *map, int num); void mp_chmap_from_channels(struct mp_chmap *dst, int num_channels); void mp_chmap_set_unknown(struct mp_chmap *dst, int num_channels); @@ -116,7 +123,7 @@ void mp_chmap_from_lavc(struct mp_chmap *dst, uint64_t src); bool mp_chmap_is_lavc(const struct mp_chmap *src); void mp_chmap_reorder_to_lavc(struct mp_chmap *map); -void mp_chmap_get_reorder(int dst[MP_NUM_CHANNELS], const struct mp_chmap *from, +void mp_chmap_get_reorder(int src[MP_NUM_CHANNELS], const struct mp_chmap *from, const struct mp_chmap *to); void mp_chmap_diff(const struct mp_chmap *a, const struct mp_chmap *b, |