From patchwork Sat Aug 1 11:07:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 21422 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 A0CA244B0E2 for ; Sat, 1 Aug 2020 14:30:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C0CF68B99E; Sat, 1 Aug 2020 14:30:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03A18687F9E for ; Sat, 1 Aug 2020 14:30:42 +0300 (EEST) Received: by mail-ej1-f66.google.com with SMTP id o18so33924614eje.7 for ; Sat, 01 Aug 2020 04:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=T2fhNcqrWVCEjs1T4hfHcYHW89hJ/Up5DhBLZnri9ZA=; b=Il2z4GZP8rMfi3q3WJCWLLKAkoaa09BVBpShX2xQ6U6d7mk50N59GTxz0vxzZ/YWsz I5Y26XEIfQ+9sDGNQrV1nlHhPKgvvphkAR21xNj9ETF22vcakk7WACLNP/kfYvtbRAya XWRzgTfNAT4+hoEJESY1k+6Q+J8MymdhvX8nmS5XUIE3/w/75aM1fNsDag02tYTaCBo/ QOTQHx4GRHn7SmnVY0nc2rCz+VeYKGs9szM5JDr/r2CDzmKtjusulEoJCRihyJhOjsZL 0d556UTc1VpBeR0YVkcx7WsXavSIidS+nuNy7Zsv5bsKDyQq2HD9tbmqxDd2DCJ2okbG h5YQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=T2fhNcqrWVCEjs1T4hfHcYHW89hJ/Up5DhBLZnri9ZA=; b=WCxaFnDK9+BLXJiW+aWRFcXTQiW5cTqpseEvHCyL8FaNc4+7Yr8+dkxnLwtWcEvVIN tEDHu6CmbJmtA7Z3eZbpm9H1M4JGYplOSoknS1wkg4lYgbfc0IgfKKUK0r05Ce0KkGUB vEU3zYTPxKD2Rl5TizCUre1n/sGMKCHfdjbuNEfbulL4fGzRRe7s5Q3kHKII9/ucbVu/ i7K/ftCvBTeh7q+wzusu1TeJOvonB+rheZFw6NV3ugM9lj3yEkJnXP6n5+Q5NkXigAkP WVrz1gwADqduqkUWRC8Le5cp1+gsGXFIU1e/TCmqQvakgfJFHCfNJgLybncg7BxQOFLq IEfw== X-Gm-Message-State: AOAM532N1DVeQq7LTQTWjg/8JT20KjY2O5X1BPLbV8E1Rol+iYX3AxX3 ym96Ea2cEdmUslUFGyGi+ayfZ+w9 X-Google-Smtp-Source: ABdhPJyq2GVyl66HXorOwF8skNfURzdt2HnAJnlluHsy4I8BnEQ2daMhuTw1sHkFRtTQ8xzvNAFKNg== X-Received: by 2002:a2e:6119:: with SMTP id v25mr2493456ljb.119.1596280060417; Sat, 01 Aug 2020 04:07:40 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id f24sm2694045ljc.99.2020.08.01.04.07.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 04:07:39 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Aug 2020 14:07:29 +0300 Message-Id: <20200801110730.30642-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200801110730.30642-1-jeebjp@gmail.com> References: <20200729113952.14574-1-jeebjp@gmail.com> <20200801110730.30642-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/aacdec_template: mark second LFE element as LFE2 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" We now have the capability to do this. --- libavcodec/aacdec_template.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index a473e1bad7..21db12fdab 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -368,6 +368,15 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) }; i++; } + if (i < tags && layout_map[i][2] == AAC_CHANNEL_LFE) { + e2c_vec[i] = (struct elem_to_channel) { + .av_position = AV_CH_LOW_FREQUENCY_2, + .syn_ele = TYPE_LFE, + .elem_id = layout_map[i][1], + .aac_position = AAC_CHANNEL_LFE + }; + i++; + } while (i < tags && layout_map[i][2] == AAC_CHANNEL_LFE) { e2c_vec[i] = (struct elem_to_channel) { .av_position = UINT64_MAX,