From patchwork Mon Oct 22 21:46:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 10750 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C5E84449DF3 for ; Tue, 23 Oct 2018 00:46:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DD1068A281; Tue, 23 Oct 2018 00:46:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65287689A25 for ; Tue, 23 Oct 2018 00:46:13 +0300 (EEST) Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay12.mail.gandi.net (Postfix) with ESMTPSA id C248D200004 for ; Mon, 22 Oct 2018 21:46:40 +0000 (UTC) Date: Mon, 22 Oct 2018 23:46:39 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20181022214639.GN3743@michaelspb> References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [FFmpeg-devel] [PATCH v2 3/3] avcodec/aacdec: Translate PCE to avutil channel layouts 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" On Mon, Oct 22, 2018 at 01:47:47AM +0200, pkv.stream wrote: > (commit message changed to include number of trac tricket solved) > > For context , search for the discussion: aacenc: remove unsupported PCE > mappings > > Additional details: > > the aac decoder decodes PCE correctly but since avutil channel layouts are > obviously not part of the spec there is no pre-defined one to one > correspondance between ffmpeg channel layouts and any PCE. > > At the moment the decoder makes educated guesses for translating PCE to > avutil layouts. > > In the case of PCE written by the native aac encoder, there exists a > correspondence though of avutil channel layouts to PCE. > > The patch adds that table to the decoder; for PCE which are not in the > table, the patch adds an algo to assign a ffmpeg layout. > > The patch was tested extensively for all channel layouts in PCE table which > include all the channel layouts in channel-layout.h (ln 85 - 111), breaks fate TEST audiomatch-afconvert-44100-stereo-he2-m4a Test audiomatch-afconvert-44100-stereo-he2-m4a failed. Look at tests/data/fate/audiomatch-afconvert-44100-stereo-he2-m4a.err for details. make: *** [fate-audiomatch-afconvert-44100-stereo-he2-m4a] Error 1 [...] --- ./tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a 2018-10-21 02:32:29.141768581 +0200 +++ tests/data/fate/audiomatch-afconvert-44100-stereo-he2-m4a 2018-10-22 23:45:49.033198329 +0200 @@ -1 +1 @@ -presig: 1924 postsig:1644 c: 0.9909 lenerr:3568 +presig: 4151 postsig:-583 c:-0.3995 lenerr:3568