From patchwork Tue Jun 16 21:02:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 20428 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 40C4944A400 for ; Wed, 17 Jun 2020 00:09:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26BEF68B5BE; Wed, 17 Jun 2020 00:09:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 146EA68B0FE for ; Wed, 17 Jun 2020 00:09:40 +0300 (EEST) Received: by mail-ed1-f49.google.com with SMTP id m21so234044eds.13 for ; Tue, 16 Jun 2020 14:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9ZykfX/f+/KibkTt9xXNc01RwX8uJivdQbL4wIikwpQ=; b=lcWZqUhnaEvbyRTuJGdx+F+3lK02/RJPo2zXSwXmLSj2NJrWZfaUPmeiNx0efbHjH1 XbgUBTWGurb/7fuU5crHfvXO1xDgAL81cTk6+YLuAJ7KKddk0JAn0HRMhqVUohauHHi+ eRc3RQiR4bHCyI4AbXCO0nPO5xfcr3UEIgjRYWgf8ROiG3h5807CiMtU3+2PgSv0D/8s Zi/2bDCleCHxoRc0eMLxabVzWrIMq4XdWuq9x8s2UnavhDYY9O9FyRlDgX+LMYGwtpYM hOwaEuZASOHFmkVJU/nGFH8hVZajEWIL5s9H47nSI43zwRkYLvz7k7kRJ2xK/8FXxfDt u13A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9ZykfX/f+/KibkTt9xXNc01RwX8uJivdQbL4wIikwpQ=; b=fCZwQxu4/PF84sqkPxRC3pnHdXMt8fM+NZ+PNqNYNMpdeQ6LR7c0Ax8C0hnokpHrue NUQw5m+mU9iFV5DkQ5a3XEbeB6pPMfvrrTbRcynM3U/tN5XkMb+4ET2465UC9tq0ps+i BfmuDlLeuVCyGz/C2g5kr4Ml+8vXlrdtV8RQaB4fxntsQ/dOGR5BOKEDZNcvyh+zi/0+ 2tVLjYMUsHIaHnsSVmD5OTOnGy+ExtMU1gejDHMBNOlPMhE8kYvEk9BCrFfX0UMlEXMx meyZ8ALdNYWxH+lozTxUUth7UfXoxZdlVSFjMjx4OOr0t+4VimypsDD1Uyzmapn0743l Q7eA== X-Gm-Message-State: AOAM532dF0YG8+CWX0lfoxJPSwtz7QnLxJl8QZNcSEObTs92Zsn0gv4e v9i7dqIZgATP0fAz74dfoe4QB8KW X-Google-Smtp-Source: ABdhPJx1e60OOBMiXqnXOtcvnB4Gz/J2kJ6R/kheX3iab3AMmvZYorg2k3R0yL7yT5ritp7E4jcQlA== X-Received: by 2002:ac2:5197:: with SMTP id u23mr2704117lfi.109.1592341374959; Tue, 16 Jun 2020 14:02:54 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id c5sm4608925ljj.37.2020.06.16.14.02.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 14:02:54 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Jun 2020 00:02:48 +0300 Message-Id: <20200616210253.7169-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 0/5] 22.2 channel layout support for AAC decoding 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" Now that we actually have sample(s) for channel_config 13, it was possible to see at which various points the AAC decoder fails attempting to parse the bit stream. I have not yet found or generated a channel layout test sample so I could fully validate the channel map output by the AAC decoder, but at least 7/24 seem to be correct looking at the decoded WAV output in Audacity (front left/right, center, top and bottom front left/right seem to be correct based on the sample linked in #8714). Fixes #8714 Jan Ekström (5): avutil/channel_layout: add 22.2 layout avcodec/mpeg4audio: add newer channel_coding mappings avcodec/aacdectab: add mapping for 22.2 avcodec/aacdec_template: mark second LFE element as LFE2 avcodec/aacdec_template: add support for 22.2 / channel_config 13 doc/APIchanges | 5 ++++ libavcodec/aacdec_template.c | 55 ++++++++++++++++++++++++++++++++++-- libavcodec/aacdectab.h | 23 +++++++++++++-- libavcodec/mpeg4audio.c | 17 +++++++++-- libavcodec/mpeg4audio.h | 2 +- libavutil/channel_layout.c | 6 ++++ libavutil/channel_layout.h | 6 ++++ libavutil/version.h | 2 +- 8 files changed, 108 insertions(+), 8 deletions(-)