From 1693a6818730760b3f2e9fbc13354dcb6c31c86f Mon Sep 17 00:00:00 2001 From: Moritz Barsnick Date: Fri, 6 Jul 2018 23:49:50 +0200 Subject: [PATCH] avcodec/aacenc: report channel layout by name Possibly useful in the error case. Signed-off-by: Moritz Barsnick Signed-off-by: Michael Niedermayer --- libavcodec/aacenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 6d94c76905..4d0abb107f 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -982,11 +982,13 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } if (s->needs_pce) { + char buf[64]; for (i = 0; i < FF_ARRAY_ELEMS(aac_pce_configs); i++) if (avctx->channel_layout == aac_pce_configs[i].layout) break; - ERROR_IF(i == FF_ARRAY_ELEMS(aac_pce_configs), "Unsupported channel layout\n"); - av_log(avctx, AV_LOG_INFO, "Using a PCE to encode channel layout\n"); + av_get_channel_layout_string(buf, sizeof(buf), -1, avctx->channel_layout); + ERROR_IF(i == FF_ARRAY_ELEMS(aac_pce_configs), "Unsupported channel layout \"%s\"\n", buf); + av_log(avctx, AV_LOG_INFO, "Using a PCE to encode channel layout \"%s\"\n", buf); s->pce = aac_pce_configs[i]; s->reorder_map = s->pce.reorder_map; s->chan_map = s->pce.config_map;