diff options
| author |  wm4 <wm4@nowhere> | 2016-01-04 19:17:18 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-04 19:17:56 +0100 |
| commit | dac5b598f57daba6d863d4439b67c0455e644d8d (patch) | |
| tree | 2e5a6c523ced9c54b97f4fa3324efe2ff9987845 /test | |
| parent | cb8b0cc329fa8db3590682afc8c25bb00666843c (diff) | |
chmap_sel: prefer inexact equivalents over perfect upmix
Given 5.1(side), this lets it pick 5.1 from [5.1, 7.1]. Which was
probably the original intention of this replacement stuff. Until now,
the opposite was done in some cases.
Keep the old heuristic if the replacement is not perfect. This would
mean that a subset of the channel layout is an inexact equivalent, but
not all of it.
(My conclusion is that audio output APIs should be designed to simply
take any channel layout, like the PulseAudio API does.)
Diffstat (limited to 'test')
| -rw-r--r-- | test/chmap_sel.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/chmap_sel.c b/test/chmap_sel.c index 0301045e23..38a5254073 100644 --- a/test/chmap_sel.c +++ b/test/chmap_sel.c @@ -52,6 +52,10 @@ static void test_mp_chmap_sel_fallback_use_replacements(void **state) { test_sel("5.1", "7.1(rear)", LAYOUTS("7.1(rear)")); } +static void test_mp_chmap_sel_fallback_inexact_equivalent(void **state) { + test_sel("5.1(side)", "5.1", LAYOUTS("5.1", "7.1")); +} + static void test_mp_chmap_sel_fallback_works_on_alsa_chmaps(void **state) { test_sel("5.1", "7.1(alsa)", LAYOUTS("7.1(alsa)")); } @@ -89,11 +93,11 @@ static void test_mp_chmap_sel_fallback_reject_unknown(void **state) { static void test_mp_chmap_sel_fallback_more_replacements(void **state) { test_sel("quad", "quad(side)", LAYOUTS("quad(side)", "stereo")); - test_sel("quad", "7.0", LAYOUTS("quad(side)", "7.0")); - test_sel("quad", "7.0", LAYOUTS("7.0", "quad(side)")); + test_sel("quad", "quad(side)", LAYOUTS("quad(side)", "7.0")); + test_sel("quad", "quad(side)", LAYOUTS("7.0", "quad(side)")); test_sel("quad", "7.1(wide-side)", LAYOUTS("7.1(wide-side)", "stereo")); test_sel("quad", "7.1(wide-side)", LAYOUTS("stereo", "7.1(wide-side)")); - test_sel("quad", "fl-fr-fc-bl-br", + test_sel("quad", "fl-fr-sl-sr", LAYOUTS("fl-fr-fc-bl-br", "fl-fr-sl-sr")); test_sel("quad", "fl-fr-bl-br-na-na-na-na", LAYOUTS("fl-fr-bl-br-na-na-na-na", "quad(side)", "stereo")); @@ -118,6 +122,7 @@ int main(void) { cmocka_unit_test(test_mp_chmap_sel_fallback_prefer_compatible), cmocka_unit_test(test_mp_chmap_sel_fallback_prefer_closest_upmix), cmocka_unit_test(test_mp_chmap_sel_fallback_use_replacements), + cmocka_unit_test(test_mp_chmap_sel_fallback_inexact_equivalent), cmocka_unit_test(test_mp_chmap_sel_fallback_works_on_alsa_chmaps), cmocka_unit_test(test_mp_chmap_sel_fallback_mono_to_stereo), cmocka_unit_test(test_mp_chmap_sel_fallback_stereo_to_stereo), |