From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 340F844163 for ; Sun, 27 Nov 2022 22:18:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78F3668BBC9; Mon, 28 Nov 2022 00:17:53 +0200 (EET) 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-Google-Smtp-Source: AA0mqf7H0TdHj1cqjZ1k0f7yX4YLLBSj2xaU8B4S49DzdrwwYRdyk/rCY8GuCOh1zAOpXU/JD/EbGw== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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, -- 2.38.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".