mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

audio: remove mp_chmap_contains()

Browse Source 
It's unsued now.

(cherry picked from commit 8d5924f2c9)
This commit is contained in:
wm4 2015-05-08 21:14:23 +02:00 committed by Diogo Franco (Kovensky)
parent 438ae9f742
commit ba799895e1
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/chmap.c
View File

@ -417,16 +417,6 @@ int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b)
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)
{
struct mp_chmap d1;
struct mp_chmap d2;
mp_chmap_diff(a, b, &d1);
mp_chmap_diff(b, a, &d2);
return a->num >= b->num && d1.num >= 0 && d2.num == 0;
}
// Returns something like "fl-fr-fc". If there's a standard layout in lavc
// order, return that, e.g. "3.0" instead of "fl-fr-fc".
// Unassigned but valid speakers get names like "sp28".

2
audio/chmap.h
View File

@ -127,8 +127,6 @@ 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);
char *mp_chmap_to_str_buf(char *buf, size_t buf_size, const struct mp_chmap *src);
#define mp_chmap_to_str(m) mp_chmap_to_str_buf((char[64]){0}, 64, (m))

24
test/chmap.c
View File

@ -24,33 +24,9 @@ static void test_mp_chmap_diff(void **state) {
assert_int_equal(diff.speaker[2], MP_SPEAKER_ID_BC);
}
static void test_mp_chmap_contains_with_related_chmaps(void **state) {
struct mp_chmap a;
struct mp_chmap b;
mp_chmap_from_str(&a, bstr0("3.1"));
mp_chmap_from_str(&b, bstr0("2.1"));
assert_true(mp_chmap_contains(&a, &b));
assert_false(mp_chmap_contains(&b, &a));
}
static void test_mp_chmap_contains_with_unrelated_chmaps(void **state) {
struct mp_chmap a;
struct mp_chmap b;
mp_chmap_from_str(&a, bstr0("mono"));
mp_chmap_from_str(&b, bstr0("stereo"));
assert_false(mp_chmap_contains(&a, &b));
assert_false(mp_chmap_contains(&b, &a));
}
int main(void) {
const UnitTest tests[] = {
unit_test(test_mp_chmap_diff),
unit_test(test_mp_chmap_contains_with_related_chmaps),
unit_test(test_mp_chmap_contains_with_unrelated_chmaps),
};
return run_tests(tests);
}