From patchwork Wed Apr 13 15:37:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MCC CS X-Patchwork-Id: 35306 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp269817pzh; Wed, 13 Apr 2022 08:37:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw149sEXYVFe2qj3qt8Zn4pYWPDlc/wEHhGRZy7ltvA3UPaeRTMEgxt7z7Dj/4WWEOj9xYc X-Received: by 2002:a05:6402:4487:b0:41d:9622:3292 with SMTP id er7-20020a056402448700b0041d96223292mr7729939edb.330.1649864245398; Wed, 13 Apr 2022 08:37:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649864245; cv=none; d=google.com; s=arc-20160816; b=e3yMljb2ZpfthxdN5Gc8Vv2KXaRgae5OZLJqXsHww2KeckrLxzLh9hSRIeylhhJ/38 Fk1l0+DGBnBCswDCoswki1kDTHopaXHbcnGGhRjojOHD2l4iF+Bw6EeGro3J3zj/sYa1 ni8k5OWHmN23RyLrxkhqM52pSZYFBz1fbRfHxHfRVvVdxNCqOEe31380Z0VtQCdY5oe4 //X2YfW2jKFfOcDq1FKv14D3kFzgBuYqbEbFZTJSd3EqBGSc8DWwdRi42nJ4XkdbU8ye 2ccLkb1PV/8fX22vuy43p+MPm95Me9wx8fKW2ufG2nIhgooA/dOiuOQMB574YoGIXcS+ qPBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=5SFW0kGbiNXawl+Lstn8dLKeIG1yTAI0zzV9fd1V2UE=; b=XbWUvuc75WWyPZrTuBkWwLP7e+itouPtKjtdJBubVkWG0wbQTJvfm+ms1zCP1dJ5uR vgG9za8zfq+LEE+2Ssp1sE0SZi8C3IMUOVnVpDRwEy8BbpegHRDOhs1A4Jrayp/XuJH0 mUB0Y8V/KA7iXw56SOiwYTFb237rVmVbUiAiSmusUyTH3DCFyS+qsl+VawKfCfx3WB/h iAnYfeWkRertgv9FvDM4HYT7bIM3/uvEPX6D7B4K3k3feQ0V8Jm9a2clM6uN6tHU9DYZ UFNN5vRV9xaOVJdn924VxbKln1WSI6EUKeiIKxlF2dWhmsPl+jZCSC4kmk+gz1pXElmj GYgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmx.net header.s=badeba3b8450 header.b=hpKoszxY; 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 a16-20020a170906369000b006dfc5bed32esi200719ejc.128.2022.04.13.08.37.25; Wed, 13 Apr 2022 08:37:25 -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=hpKoszxY; 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 185F368B419; Wed, 13 Apr 2022 18:37:22 +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.17.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BC9D68B308 for ; Wed, 13 Apr 2022 18:37:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1649864234; bh=nc3u+evFtUqJDC9QpWf8KkSyyL+Y4XGl3jFF+GfLZBw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=hpKoszxY27yc0VQHQuPWrsOy0xvf9AfK9f44AAFRHNUEau1rYlLDDUuLgXm1+J+e1 sY2cKJzUWnn2AlYAe1TVWRyl5rourxdGWIPEP/6oGmAfObTXLinAaA66eTv0pgTsW7 TRq/bTdkRtDM3msLUSycMVAkVWSfys9R5iec4Y+Q= 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-bs11.server.lan [172.19.170.179]) (via HTTP); Wed, 13 Apr 2022 17:37:14 +0200 MIME-Version: 1.0 Message-ID: From: MCC CS To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Apr 2022 17:37:14 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:NrGZcVJXAlFibYSauirg60r1Rtj7x66H7YsBaex2oxk5C6WO7eLJRzmZsIIChvm6y6wKK C6JvVlAHlbvxCtazuiAvv9KNQfR090+lNOS9axOPM0NXdWuTiA10SQIf1I4eUoqu4NgM9i6P1hVY mE5Yf+XteydJAraGPRjDW26k5tzCIM2LnSkypgJJJnUEKeOV7xsUau89eThewEpnRLqz2UdQHCzN mIvS2us+Nu+wtz/mzWmLm/BLw3tcmNAIk37J6nrbNhSEol9pmyzgzDdHy0iQYMJSjS+tJEwRxOEw As= X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:346SBZayvQc=:gLdppY7tCjWpsq8zCUOotU mW926MD98N6sAFQKRl4L5zdjBl83FbigmF3ZVad9gBVWFYWbGim7FW9/B9Vt7YKkVEpWTqO1Q FhZkgcmIwKkiopEFT3LSa8fyjyYSWnFqxChmlDSco30Jm5uxMvvdTBjpmom28iM2tDHYz2FLo PjPS0QtDZYiAHA5S8IWP6CtTIqgLisv7inHLkyvhwD5rBau1wLxKK0ux/jwYatI2GuGA7lFcC Ssj2VWLiZQPU1wf8zVBQkTQrQtPIV46M/7euerpSHeEHlg3XrYLUDbLLo17Zx0mtcZYHhtS38 oE1XsuOyg/YTvK3JrEuZUTXC541QZzPOwdg6FwCg/NOg4rF6amcG9lBFWNOcHcs2c759Va+KS HMhgN2upWDRch+PjxkzFoOxuqt1CX+yvmmxnXBHEVyt5cgunhcCjN7Cr9Ty+B6xPY48oleP31 R2uxN7Fvj6FXyY1y6XsbLFwocC0UuI/llTa3UczqtHCTQ58PXr3DHfgMROZtJG5QsMVXMgJam AESFxk2yDIbmzdnD94pnNUYjzFf7/0VDt0TPW347n4QutEyac4qXRQ0oXmHuHz6ousNRC6u2t 4aPKGcbUmx5gxFAQ4jtMQBpEj83KpAukYOlxu6J0YiNThkb7LyRIYzIGC8QRfedu3sF2TGluI E7bFfr1EPoPfab5thqrgpn7pgUSG0PQTV5A85xOK+NynKl+hxDqBf3oluCMUZN0vGEnayFV/i UkJ+9MmNuCSkbC+oyZXnH5v/Y1yvc/BfY9qfH8QbwNjlXbimN/TvQnnJd0Zc5aIs7DMMaWLwB /Coynov Subject: [FFmpeg-devel] Audiotoolbox 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 Cc: kode54@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o6/smbsJMUFD 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;