From patchwork Thu Apr 14 06:06:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MCC CS X-Patchwork-Id: 35312 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp601324pzh; Wed, 13 Apr 2022 23:06:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxp+VfFaP0MGzSs9x5UDis2vM5D5bPnlDb8P7oZlSyswmuLvOfY+bHvkSOekyC6bd2VCctV X-Received: by 2002:a17:906:dc8d:b0:6e8:33d1:c6f6 with SMTP id cs13-20020a170906dc8d00b006e833d1c6f6mr945683ejc.675.1649916375233; Wed, 13 Apr 2022 23:06:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649916375; cv=none; d=google.com; s=arc-20160816; b=L8f7sy4bbz8Y3+CMhmjGspHREapqmBE0dxZyXys7xDwEA9XBufgOmQ7/po0408oNZc OFbs1YJavg4UWdMs/BB2WIrKbWGDEfKD8V2xpPS8lsVBD26FonQETeoUOPFPdgnl7h9/ nOZs/C/4Qa/+3rslQnyM/Pt16Q5UydBjOmis/AGxZNpacJawAgahm02BBRGzi0BsEK4T CzBzyQdAbneZ2X2BpurP5i6quFWISePfxk9g22bB3ZwQJ8Ma/4AqN+kkUZjrgV801sHp FPGOcrvZlTQdR81nFHWRVW+IIuzVBUqvXnbuopaMv9I5ApQBmwLLRCq2IfCs6Ue7PvUT wlTw== 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:sensitivity:importance:date:to:from:message-id :mime-version:dkim-signature:delivered-to; bh=pFB19kSwXGGbbsFonelMUUXsqGENAHUTQ3MInIHloE8=; b=TreUuoF0ls1h+GjlzOCg2IqGIAXHu3diAezXGm4l75UcsWemQNGHzeNIu3sFyNqtW+ dSPEpYgf6ShZP1JEW7GgGHwGNIRSWST4gl5gpEz588hyChom5HH219rjFGHgaqeTUQFx z+iwMQmudJOfml2cem9TcQxZzzzeeCCANUzovleYua4u+WlBnJlPUVtoPgi43u2h6QFc mVj631Ec5hKyOTz1yv/S4R5UQk5Wxl4eumOmMXq9boIJgEKo+BzuJ2XI55inYbiNcgEg JeeFzmWzI5ybWjA4UjsZCmbDstA6t4qFqzs9/+eGSA9zVx2zlfWFTaCw9Bo3UvOnJ4Sq 0r8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmx.net header.s=badeba3b8450 header.b="V/yZz54B"; 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=NONE dis=NONE) header.from=gmx.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n5-20020a5099c5000000b00418c2b5bf80si3042836edb.610.2022.04.13.23.06.14; Wed, 13 Apr 2022 23:06:15 -0700 (PDT) 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=@gmx.net header.s=badeba3b8450 header.b="V/yZz54B"; 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=NONE dis=NONE) header.from=gmx.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E12768B48B; Thu, 14 Apr 2022 09:06:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66AD968B446 for ; Thu, 14 Apr 2022 09:06:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1649916363; bh=r0ZF0opTHB1jun/uf3txQ0h8AB/dcSD4E0BV16tgKxg=; h=X-UI-Sender-Class:From:To:Subject:Date; b=V/yZz54Bmlfy6PyWY99oCZh/E29RltB2c0v0z+Vx+R2GoOh9Z9Zg4Ci7rvm6RR06R WhyVPC6bjcADdhhf6z/mmUB4AWONQsYeSiBeJIcpf/rn1lRbFYra6AQZ5wBmjQAwYU ZZXCteXJjJXHqCmEqWWEeeI2U4RzR+byjJ8CcrXc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [31.206.16.183] ([31.206.16.183]) by web-mail.gmx.net (3c-app-mailcom-bs03.server.lan [172.19.170.169]) (via HTTP); Thu, 14 Apr 2022 08:06:03 +0200 MIME-Version: 1.0 Message-ID: From: MCC CS To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Apr 2022 08:06:03 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:m+Xnzc+ADyVXOXoiGQgpSYfmwCoLDGobpw6u4rPvAC/hbYDkh97ZZw+iC5ps4PmWn7/Nt knVbW9pYwqYtD3vtTIRVBEJAvKpYfnaQA55W5UBrACS/ud0GKDCl4/WDnWIvr/e0h1DWJYTs7z4a NpyMVpc3Sow6ymiTqgKWxHKYTiQZoaCwA5cBCn/EvW8haIxgzNCqdk8CdOGyBBxzJVtwcxsjfDe5 r1woT6hMrjTjo2sRQb2pMbgkswIDVwuDzDUV7zb0FQXIednMmeEJRkCpyK4+hjaBGZFTKDPu71fY WI= X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:AHIGnzYoUSo=:ka7prtDVIMu7KeE2aycN95 +/gtKRf4FDsSlZTvkTlXYt8AoO/T7mnsEgeW7huwc4iDHFMJBZIVWbvSCFOjc2bpcXzjKTONh 6ZPfR3zsnlfHHKnG+vsuI3tXDXu6SjvzABh6J3jVEAMTZAkXP2pHT5dpqbp2yHk6GrnUzZ5Z2 6byr6+3yYictsdOF6KieDY2xmvueZz8wQS6T5AJGlwX19mn/QEd+uw2rBiK5KRQXnGYMtBqk1 K57sFl72GbTm7Q9GrZSuajMQy/U20rxnueW31OfZu3Wv6UHNZFTia8SPPCvgRbD9Jay7EXnHb ETlL1kNSvqOGBRko646eG/ylvRh5hQut1QctTtP/IFtzxg0onixIjjeUcjHRw76Q/NawGaizg fQQm0BQDjTZHssR+ysSVCSh1N/4jsZcb7jTv8bq3K9nIkPo+d6HKV8H+a1FOWT2KtlhLuS2hT Ji+cMOsB/3Ul2eOJbMDc5uZMVvBwJlb7KTeok9lNWqbZ6iUPGvTL8sSlegCbEISTk/bQkqqYx 3Svy83S3wDA/jua8bTXLVwRqf1l/A4pn6zjcK5g0wTdG3zq5gh8MQKFMlUAq4f/dPhiO8mL5m vXx9RqeBsOXyTHv/3obHYX24yVOCYnkdES2huus3Ko7nOetRHxsQznEIfKeCbtT8EyRMQecj3 a9+rbUtQZJQOs+n4PzZNYAvzLn+ZGA/2QuDUHB0CAjgz1bmrRJJrTovHWfVoNGL3lSdvq6MCz zDNaTUH6m3b4WmycLoBmFMCoz3htR0FJKNgDZVRU5Pnjwdtj2gqgGs5yn9AzDqoMK8tvk4MpL /AcImq4 Subject: [FFmpeg-devel] avcodec/audiotoolboxdec: fix missing decoder out properties 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: ma1KQfFAbaIB Resubmit: fix title. This is a repost of the patch by Chris Snowhill who originally sent this patch on 31 December - which didn't receive any replies. As you can see on https://trac.ffmpeg.org/ticket/9564 the patch is needed and works perfectly. I have rebased it and recompiled it. Original commit description: Monterey needs mBytesPerFrame and mBytesPerPacket to be set, and I'm surprised this didn't break any previous system versions. Fixes bug #9564: Cannot decode xHE-AAC with audiotoolbox (aac_at) on Mac OS Monterey. Fixes likely bug that none of the AudioToolbox decoders work on Monterey. --- libavcodec/audiotoolboxdec.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.35.1 diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index b8d0e868f7..daccf4abf8 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -375,6 +375,11 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; avctx->ch_layout.nb_channels = out_format.mChannelsPerFrame = in_format.mChannelsPerFrame; + out_format.mBytesPerFrame = + out_format.mChannelsPerFrame * (out_format.mBitsPerChannel / 8); + out_format.mBytesPerPacket = + out_format.mBytesPerFrame * out_format.mFramesPerPacket; + if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_QT) in_format.mFramesPerPacket = 64;