From patchwork Sun Nov 27 22:18:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39515 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7105320pzb; Sun, 27 Nov 2022 14:17:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Ef/STlq6l9Ah7qXnQYOlmPV2kW/O5qgb/iSEanqZibHCS/Y1MkKx+YLjlDgrQ+ECPKmuQ X-Received: by 2002:a17:906:9f10:b0:7ad:86f9:1d70 with SMTP id fy16-20020a1709069f1000b007ad86f91d70mr19795771ejc.179.1669587476619; Sun, 27 Nov 2022 14:17:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669587476; cv=none; d=google.com; s=arc-20160816; b=B/+ZrYqiRrH/Uk7AxqvRfoGwfXFEiBvQzSOHKEbdhMvLF/dHDjnnfxlQlJyYGKwGNz L2sJwQYhbI6nJcExXuCkznje6niZBhwP1mRJ8SkNzsqvKJEGGZyOQkG0DSGxXFTVCwIX EMFdLTRn2p75G+CK7os710G6+JFOJ4JKF4AQ6MXGfI1ReYkRlwP+6TmtlccC7aIDR8PE PIg3M47wt6F5HGg8Lk1Rtac21ar9h06JZG6cCkCUNLcIg+BFLPj9NPXGC5qFCGvL754j bfvjQk6vKQ4euzKMOVdtwtti7wnFU9Kx6TGnCohMKqqqpOlve4kJnJokaWlb019XyzwI mskg== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=NVc8tloWG0atWK3Ltgpb3vV2LVoE9k52I3nC8iUgv+c=; b=MAuaOwmOM39fhrUOkMug/wSmAIFIRbDdc7lvJC9jOQUxgvDu7X+j2tfftuTBim7Y3u dVhUIYzNhsjbyUxL2cXCFFDqMFSzt5QYwGcTsuEpX+2fZczZUI12lt3hK6PhY3psdBwn pVt47eq/XXq6cPY3sbfzV8bC8SLCr2BXyExjH4ThnSj2c35gRQnsvf/mqEFHWZlFpDVI eVUKzL38wBb+22fH+ELOa8xBZR1GnECCucUeb7V8zP1fiICZhq6b1PiFsQQToFFNWvoP AHr4BzFK6m4xAG/CI+37AKNackqyORaXsgfb4UEmM3mnR0QH2qgkG0a/FjLalM5QC7b1 K5lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JoS6Chw9; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p17-20020a056402501100b0046b37fca53fsi676355eda.293.2022.11.27.14.17.56; Sun, 27 Nov 2022 14:17:56 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JoS6Chw9; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A081268BBA4; Mon, 28 Nov 2022 00:17:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFBD368B83A for ; Mon, 28 Nov 2022 00:17:45 +0200 (EET) Received: by mail-oi1-f176.google.com with SMTP id v81so9858779oie.5 for ; Sun, 27 Nov 2022 14:17:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=CtA09PXBBF0AiXjsHxMyHTBXbvvE4us07X8q3bYaGis=; b=JoS6Chw9Yxss3ru3DDtZZVqKMxdDzQzRzfi/ErmQX/LGnnLCQyXFD0wR9l30NN8NyE zjEnXEghOlomDHdSXWCUfBHfM46WrOpJhBKCS0jsz1UaOd18ovbWp/ylo16SZhZQzazR NTWiK4tWVwJO9IxsRZ8CymlusKJYv8W81FYAtbxxgrWlttBEdZb8SECr+yuemJ76Qz7O JzR3hdb+Wqfr8JkdKdkn4d+YFYeQlPKVZ7GU+L0OC6DxZqE5TNsGK1YSD9mSS0CSfNHC ekLt7qOLghRuEUMRj5isCR7jYuZ7zS9/G/kQ5ogD3Z7Q8vxee6C7210DgXfFWqiPENIm zkOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CtA09PXBBF0AiXjsHxMyHTBXbvvE4us07X8q3bYaGis=; b=wkKBj9QVP1mq2DChuHEiEcbPN0b0P5RVOHGxpdiczzGl2o35P6S7nTN8TbyC+zevdG pRp5qRxWPRYTTJg1/xeqWtyFvvZxKJj0nbjauM6N2O5UxVdX/V1ufknjbYhG4JFPhjR3 S/bwjccyGoYiUhbjU7AecjA331Q/8VKqa8PwlGIX8brLX6BgKI033XGNe9NLzeel3/E8 FHYZ11gmE41hPjvCfyWd1q2se/7CDKywIKOlginaSQhEdXNMks3tkKu8zHrR+4M3+lki 2ELKiOsSxnk06G32xa07W1zyt7EZKNxYAW6QLHEx4AxzK0D1vQ6Jt/dzo7ciu14mGcT4 CsUA== X-Gm-Message-State: ANoB5pk7XJx8mam42zPPBLTeWPF89YhoV3Ig/8OqMUxT9Ns1Q581dW24 A9Rcr3xDPASlp6cZgV2G4JTkOwSkWxA= X-Received: by 2002:a05:6808:120f:b0:35b:1eb:ac83 with SMTP id a15-20020a056808120f00b0035b01ebac83mr14945440oil.37.1669587463482; Sun, 27 Nov 2022 14:17:43 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id l13-20020a056870f14d00b0013b911d5960sm5054522oac.49.2022.11.27.14.17.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 14:17:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Nov 2022 19:18:01 -0300 Message-Id: <20221127221802.1412-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libfdk-aacenc: add support for 7.1(top) channel layout X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Zfkuoy/dJfXP Signed-off-by: James Almer --- libavcodec/libfdk-aacenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index d589964453..dc2ac377d0 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -195,6 +195,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) cpe = 3; if (!av_channel_layout_compare(&avctx->ch_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_7POINT1)) { mode = MODE_7_1_REAR_SURROUND; + } else if (!av_channel_layout_compare(&avctx->ch_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK)) { + mode = MODE_7_1_TOP_FRONT; } else { // MODE_1_2_2_2_1 and MODE_7_1_FRONT_CENTER use the same channel layout mode = MODE_7_1_FRONT_CENTER; @@ -451,6 +453,7 @@ static const uint64_t aac_channel_layout[] = { #if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12 AV_CH_LAYOUT_7POINT1_WIDE_BACK, AV_CH_LAYOUT_7POINT1, + AV_CH_LAYOUT_7POINT1_TOP_BACK, #endif 0, }; @@ -466,6 +469,7 @@ static const AVChannelLayout aac_ch_layouts[16] = { #ifdef AACENCODER_LIB_VL0 AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, AV_CHANNEL_LAYOUT_7POINT1, + AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK, #endif { 0 }, }; From patchwork Sun Nov 27 22:18:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7105383pzb; Sun, 27 Nov 2022 14:18:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf6l8PwGyviftusLwQatqh6WKd6px+U8R3vEfW8F6c3sSh4Eh5a8mSAR9WiXBnnPQ8nixRRI X-Received: by 2002:a17:906:ce4a:b0:7ae:5ad1:e834 with SMTP id se10-20020a170906ce4a00b007ae5ad1e834mr40759448ejb.312.1669587485219; Sun, 27 Nov 2022 14:18:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669587485; cv=none; d=google.com; s=arc-20160816; b=XYMuoc656j21DZAj2vXQ2o6+ReX4jMT5zSp1oxdEWXg6s/bnLPvX0A3ViWQrjeM1q6 BfpDIJ9chrPclHmAZl9MlfK0C7/ksAnP0wlxuDMKQu8OAbkxXo8b3Ankmqn1Kv7gkXFY +9wLhHQ1w1I6pPoyOh9v2jyk9Td4SYbfS7IuhU/xai699t+rtoVP0UH9PGF1VPE/X0hP X6fu1RF8an9M7+HH8HhmQbsXilZEBYWhaNFEXo3qFA4wMAOoLIphNIYovhvuftQdrhGd cJeh3LiSSRE3jCoixzTzxbgS2bBRgczzuyGpBuUWZpjaNWCW+tulXfpRpskhEkZkAIos EEhQ== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gviqpO3t4aZVFpwqT+j/jusNPUax6UY5p446hPQ92Qk=; b=JdZBGwWyF1h855ZKM/4CwLLFI6XnlBFEo4TqGKRZIsVorPCS7gJTH+g3R2PPKBpofT bjgBsrQMPy8rOQ/cAWSY0k2NVOK6yKouoMgHsxpTUnuCeLO2Rcj5wQSf0YnRflHULKp3 eVZsV+pxc9E08YDjXXZAesxu1D30Om3HWeipFlTMA0PvUuDnezZAt5JWkosherl+OkP/ 1mxdb4c0AkVOpU6QvWZMUZRTCFO6r/5Vcts0PohP9bukVjOJ5qjD7Rry8P30oXCMP7PD Dbr3gdPDLXrm2QoV8i1Hw/wUCEnTTND2xI4mLnhETvwUFw15wKgPc6IbIakoQoAcTrrZ 0p8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gQ8atdnE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc7-20020a170907168700b0078db719e54csi10252345ejc.98.2022.11.27.14.18.04; Sun, 27 Nov 2022 14:18:05 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gQ8atdnE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8E0268A073; Mon, 28 Nov 2022 00:17:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF8E468013B for ; Mon, 28 Nov 2022 00:17:46 +0200 (EET) Received: by mail-ot1-f45.google.com with SMTP id a13-20020a9d6e8d000000b00668d65fc44fso5869670otr.9 for ; Sun, 27 Nov 2022 14:17:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b3fcjAVR3zyNcFUzi9SF9iEkGijIj/YzzCPu0gBBcho=; b=gQ8atdnEoU74PGUPFDYOYzWiCkuuwxPR6yx4uz3hwyHHbPVZ0xCz+k2Yspho/0+ZN5 wJsYt5ZaLEiEgQIiecMIxcx7ev7VbRzrdZB/k2iZZ5EGMOvegb8Do08xopUn6QwQCO+0 4hA+pQuYuT2LB538ZSVdpnM5jhD6z7k7oranNwiG/4SWp6B0UCjAX01epMu9GfM8EBct Q0JLMVA4cXWO2Uxbb/bxpKdN+VryrCk6+F5Yzf1HF+0rFm0suz3E4tnpp09hPf4E1vNJ /3FX71+Nvt0xQr/IzwCT/yepHtGk0h7fPIfha3+6FFAX8xip+/HfNsk+f7+pnKQT2xsr dQqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b3fcjAVR3zyNcFUzi9SF9iEkGijIj/YzzCPu0gBBcho=; b=ruajh8wXv1UV2fiRxJk1UrtLYufaZuZHlUAGWGEw9VCtNg9KecSA62iP6UZjtoKGaJ fhZ2FH/ETf/kAiBxXc+1bXcoffKBGkx1VGT+lNmAY9sf+OkpToirPlSNe5LK9m4E2dKr s4y/scOT7YS7EsXE81WBQyasw1BSDitwOVCI8I426empkxPJTOJaj5MWrc5+zk7q51gU 01N28SPhzN2SWJ5WRqN2ACVEbQ4MyUt5Mt1PDvBx6UhKnaUrynXEx8gpuATMGOnkh4m8 vc83tG1W57gvUARVb7qFNNF9KmGX4zflV7/zFL/5NlYXXqZY3eyLg1ziCCsr2a9fK71C uQqg== X-Gm-Message-State: ANoB5plWFFrKf2ajc9Dyj+e51py1RXYfbKeHnq6crWHuku3RDQqgKPWM rpoXmJthkz9DNWpKR1sq4NbOUPtlroU= X-Received: by 2002:a05:6830:1554:b0:66d:f49f:1b29 with SMTP id l20-20020a056830155400b0066df49f1b29mr14162315otp.166.1669587464705; Sun, 27 Nov 2022 14:17:44 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id l13-20020a056870f14d00b0013b911d5960sm5054522oac.49.2022.11.27.14.17.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 14:17:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Nov 2022 19:18:02 -0300 Message-Id: <20221127221802.1412-2-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221127221802.1412-1-jamrial@gmail.com> References: <20221127221802.1412-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libfdk-aacenc: add support for 6.1(back) channel layout X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: TjBXYbdnOSM+ Signed-off-by: James Almer --- libavcodec/libfdk-aacenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index dc2ac377d0..4aaeb1aeaa 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -190,6 +190,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) /* The version macro is introduced the same time as the 7.1 support, so this should suffice. */ #if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12 + case 7: mode = MODE_6_1; sce = 3; cpe = 2; break; case 8: sce = 2; cpe = 3; @@ -451,6 +452,7 @@ static const uint64_t aac_channel_layout[] = { AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, #if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12 + AV_CH_LAYOUT_6POINT1_BACK, AV_CH_LAYOUT_7POINT1_WIDE_BACK, AV_CH_LAYOUT_7POINT1, AV_CH_LAYOUT_7POINT1_TOP_BACK, @@ -467,6 +469,7 @@ static const AVChannelLayout aac_ch_layouts[16] = { AV_CHANNEL_LAYOUT_5POINT0_BACK, AV_CHANNEL_LAYOUT_5POINT1_BACK, #ifdef AACENCODER_LIB_VL0 + AV_CHANNEL_LAYOUT_6POINT1_BACK, AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, AV_CHANNEL_LAYOUT_7POINT1, AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK,