From patchwork Fri Jul 6 21:49:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 9640 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp81629jad; Fri, 6 Jul 2018 14:50:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdVnBFrkDdtLTvSvBRqSLvEXxHVfya6as+L7FU47Pxp6G/s05pXnhGiapWC+Dm9gnuHt1uB X-Received: by 2002:a1c:ca0f:: with SMTP id a15-v6mr7176203wmg.102.1530913804801; Fri, 06 Jul 2018 14:50:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530913804; cv=none; d=google.com; s=arc-20160816; b=qJ/OMtotqU7CJa1ivSppc+jgYeqqDOLNMKu1rmdGmsqI5HIUB7CtOUT/3/APTiuvtk /FYctMnMYa867BthyBlvwNGUcXd7YPLJ3ba6xLvLi4J7DWu2oAC8z8jlcCjT8IRErgtT UcOdwS+Bx1nQQy8cKs+fU77mR2v4d0lpoIw3EnxWSROKBorNMmUVDqkB0CF98Ys40Jhd JNFdQ7AUuLwOL+p31NhTLJfGvy6gIeYA6sUmEwrT4NhuFYLyKqL5bZQDv/x4ter8ec6r YWX1NVTvNOfyjeVRT3/5OvMotGE5Y3OUmozu894pTPGEUoKTqoxa0mKWig5WUkOAs7/Q tgXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:user-agent:content-disposition:mime-version :message-id:to:from:date:delivered-to:arc-authentication-results; bh=yf7MSv0A/2LGY5rlTi+7peSjEQNjcuy8Wp9P5R5P61s=; b=KjIVFQpFOqwvqz2rwCQ7A7Wqa5DmIqKlpjbU4MKMj0dPfWqHXKshIFM8zK20jX1g+y Y3UqBppfNysk+CVpGNjyI7szQh2dKJij/FpCiQi2EVg+6d33Tlx/5y1JXJ/zV2e6U+MP 8BsW1S/ZoF6//22JRvyxDlBkKnjhMOP+FHxoLbnSaZ18GLBhgAs802fGTADoS5JEXSCb rhOJacKkkQAUwF2PTwxmENgDiFatg9nOz5/UoulwOz0kuueHvkiSK1+H9PPPfxSEeVvi PxEOx0/RtaI/0s1zXZsfCtWmf2ECLMwxgz7PhoApehgyMjn6NNt6zewZ5kub9Z7KIOu8 wOng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p4-v6si7915653wrm.171.2018.07.06.14.50.04; Fri, 06 Jul 2018 14:50:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D58A468A68F; Sat, 7 Jul 2018 00:49:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3346B68A620 for ; Sat, 7 Jul 2018 00:49:51 +0300 (EEST) Received: from sunshine.barsnick.net ([79.203.71.246]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MEFlg-1fM9M40els-00FSj7; Fri, 06 Jul 2018 23:49:56 +0200 Date: Fri, 6 Jul 2018 23:49:50 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Message-ID: <20180706214950.GA2904@sunshine.barsnick.net> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email 2.14.4 User-Agent: Mutt/1.10.0 (2018-05-17) X-Provags-ID: V03:K1:39sezYJ3wWQ8Kuuq+NXZ62+SQuzif1xEgbHeV3ozgruNuwD1Xr4 QvZYG/wBKms4fE09n47tld7ihWmdt8chA3xJCmGA2JKPYdSX+JNZ25P+ySycfCGWu3fsTIc 1tSQDQ0XbhshtGlStfQUzl5HKa97onHmGYCWVeAPI6dKrM4plPCcCU7ibq2RZHUsJQ+yxtO /RhA9C4zvC0ZD9nVAYa+g== X-UI-Out-Filterresults: notjunk:1; V01:K0:IlAHGPDy8GY=:H+yBEp+EwST3sOKF99+4uO UgtIgg+/L1OxHgRhDuphlHd8XCU1SfiHPR6ANVXxdd0FQXbNKYeFL/3KIq/PkKIfIOVJJaQWL t6yrq/i1lTX9IacF9wzyoEE971LsGyWMy4jHRKBnoOeKOJQ4KuzHd7gJAxb8ukCVaoB2DcZM9 bajUNudDI9q1LRNwhpkbkTBv+AY8/xfS/B6ZXSqGzNyWoGZXBZLpI/VRE8VQ+V31Fa8F99evn ggCJBVGon7NepJ9os8EfBg+grfy0NrOoi2/3GQSfKK8u8wwZpcJa26RXEuHUlNdQ490rxcpZW br1/b8Kuolih/AE/+4NTc5cHnu8WvjXB5ihsg2F8XGQgj2iffabpOO3tr/WcAPVUcUwwMgqTN BD7b2mF53V4+UpnBEgY7yk245pmQiK4IN1NiP2Q6Yj2QyFlZGH8Jiq8hiQwoM6/hFKk1Oz4D0 rOqdI6/JpQqpM/5Lyl68uUmjDcGzJ5kIjxcgOLgqZJX0qZSfmsTZUC18f4fyHp8k5yi7Vitgn YlbDqZXbx3MvnL4zkzIIuz53GkSIDrD7+pdeScAbfMkQklTigi8nXl1h4IuH59O5pJbqYUNXB x3VljcKI2IceuXbMc1l9ibjmMCLwqlyOSJQbzwhBVSsD86c4tWdwrhoAvjoyUTzhpfbLgOsFa oGUjxINOO3zVw9IKC3kzNhZpjcQ6s3N4qdQLpDXjAG8PpjzmtIC9zcdY8P0KOfoawezuZfFCl uAcyBzZaBkUQKZSjo+wAEr/UJyiJl34CfSW1sMqzvaksIUbP4T6B7vf+F5o= Subject: [FFmpeg-devel] [PATCH] avcodec/aacenc: report channel layout by name X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Possibly useful in the error case. Signed-off-by: Moritz Barsnick --- 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;