summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-08 19:38:21 +0200
committerwm4 <wm4@nowhere>2015-05-08 19:45:16 +0200
commit8b7035c8ff15f14c17b6c019e951226b9eeaca02 (patch)
tree0e18749b8d3592a0ba666e743e0b3c26cb1d6338 /audio/out
parent3560a50029e160f0606d0cdc6aa1da662bbcace8 (diff)
downloadmpv-8b7035c8ff15f14c17b6c019e951226b9eeaca02.tar.bz2
mpv-8b7035c8ff15f14c17b6c019e951226b9eeaca02.tar.xz
ao: log reordered versions of channel maps
Useful for debugging cases when no standard orders are used.
Diffstat (limited to 'audio/out')
-rw-r--r--audio/out/ao.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c
index c23b22d985..e2d01d65a3 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -415,12 +415,19 @@ bool ao_chmap_sel_adjust(struct ao *ao, const struct mp_chmap_sel *s,
if (mp_msg_test(ao->log, MSGL_DEBUG)) {
for (int i = 0; i < s->num_chmaps; i++) {
struct mp_chmap c = s->chmaps[i];
- MP_DBG(ao, "chmap_sel #%d: %s\n", i, mp_chmap_to_str(&c));
+ struct mp_chmap cr = c;
+ mp_chmap_reorder_norm(&cr);
+ MP_DBG(ao, "chmap_sel #%d: %s (%s)\n", i, mp_chmap_to_str(&c),
+ mp_chmap_to_str(&cr));
}
}
bool r = mp_chmap_sel_adjust(s, map);
- if (r)
- MP_DBG(ao, "result: %s\n", mp_chmap_to_str(map));
+ if (r) {
+ struct mp_chmap mapr = *map;
+ mp_chmap_reorder_norm(&mapr);
+ MP_DBG(ao, "result: %s (%s)\n", mp_chmap_to_str(map),
+ mp_chmap_to_str(&mapr));
+ }
return r;
}