audio: add chmap utility function

This commit is contained in:
wm4 2015-05-08 19:31:54 +02:00
parent 5142b0e3f3
commit d32b71d52e
2 changed files with 10 additions and 0 deletions

View File

@ -395,6 +395,7 @@ void mp_chmap_get_reorder(int src[MP_NUM_CHANNELS], const struct mp_chmap *from,
assert(src[n] < 0 || (to->speaker[n] == from->speaker[src[n]]));
}
// Return channels that are only in a.
// Performs the difference between a and b, and store it in diff. If b has
// channels that do not appear in a, those will not appear in the difference.
// To get to those the argument ordering in the function call has to be
@ -408,6 +409,14 @@ void mp_chmap_diff(const struct mp_chmap *a, const struct mp_chmap *b,
mp_chmap_from_lavc(diff, (a_mask ^ b_mask) & a_mask);
}
// Return the number of channels only in a.
int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b)
{
struct mp_chmap diff;
mp_chmap_diff(a, b, &diff);
return diff.num;
}
// Checks whether a contains all the speakers in b
bool mp_chmap_contains(const struct mp_chmap *a, const struct mp_chmap *b)
{

View File

@ -125,6 +125,7 @@ void mp_chmap_get_reorder(int src[MP_NUM_CHANNELS], const struct mp_chmap *from,
void mp_chmap_diff(const struct mp_chmap *a, const struct mp_chmap *b,
struct mp_chmap *diff);
int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b);
bool mp_chmap_contains(const struct mp_chmap *a, const struct mp_chmap *b);