From patchwork Fri Dec 31 05:23:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Snowhill X-Patchwork-Id: 32953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13701042iog; Thu, 30 Dec 2021 21:23:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxo6u5Jx6QwRQgEO7Qos9muBSWtD7JsX/YpCQcjFWOWLg58Xe9D0OOYC3ay2d9eTjrUPHNH X-Received: by 2002:a05:6402:b41:: with SMTP id bx1mr32689352edb.292.1640928206556; Thu, 30 Dec 2021 21:23:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640928206; cv=none; d=google.com; s=arc-20160816; b=Y6SurLyD4oWDkhq9G5Ayr8sOz/s5FSr68gmIVS1rHX/sGJSusLpf47lgaLCbj6XKSo abj6psdJyyQ3yBgB0T1jx+ZO9z5FV1nL6dKXsA6I0warQvT3uHtrTx9c2dcB3lDHv2sA f71Zs4s4LwE5dqcA4F/R+oj1Ji//TcUmnoVvrALK5nmlUD4tzil2YnbVHvYqtDVl+ABl G7DgK+q0LE9xfopr00WKH9LeTa3wZDXoGeU2OAtksL5vwnqAYXC0z5TQzpQ8VAOhn6+l rBdsFBsGTvlMxrntOWBCtayNAOlLV/Ai8qE77p6fgyUHpuQ1qTvkZ34MaIa92J8IAb4n E08g== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=FrcGcaVQnyEBNx1ogEIvSdBvGK7wYxEu2x4DL0go3k0=; b=MxAg4ntmuDdaZsGHeTjRZHSNrYFrw9Kwd08xMqZxu0a6G3DUfPN5zxuuFQ7PEsyxBM znsUHPmPT2BA1h+cZoWw1UGR37J/PxgBK6iHAv1elYoIEUmD3ljn+EVFDrl8kwQV83ou 0Y6HEcQ0/TyBeN5wW+xDOVlISWtJGp+Bv1x/c4oMgC5SCJ0GafyNdo29pbvpmctdm1k1 +lUALA4kdEFxRZGrT3sEM2RJiAS7tRo0nhAnszerstT1nrl4gAozrK60hInkIt0ESFzg QWENIJ/fhcihuJM5EiO5vPHkzQk1Las+oOehJ4MuJL+9Gx0OXtM6mPL5+De7SDTxoe+I wJGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZB5edWU1; 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 n7si13707607edw.348.2021.12.30.21.23.25; Thu, 30 Dec 2021 21:23:26 -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=ZB5edWU1; 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 CFCA268AF2A; Fri, 31 Dec 2021 07:23:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AE39680836 for ; Fri, 31 Dec 2021 07:23:15 +0200 (EET) Received: by mail-pj1-f50.google.com with SMTP id lr15-20020a17090b4b8f00b001b19671cbebso24891521pjb.1 for ; Thu, 30 Dec 2021 21:23:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mkaf5lzCS1k/jfXXGgHGcn4yImPSNm2P3/TC9++2Hfc=; b=ZB5edWU1AmImZPe0nDZ7vT56mWD6cqhrSpIexgjG+Y966kAzqkCqoW8q74zBQacfuZ R704EEq9lLe+csvnstZGZCg5KJPM1lQx3CMhBWEPl9CVtiQrPlhRynon2jKzMJjxwmlY Yq7rTMCUkIR0x3pr56NPlM7s/DU3U7c7lFtZQ+3Bdz3651VMP3xsa6VGhXdcVMXZMwcF U8NUqJgOzw2+CW0GDbId63Z/V6Dbg9aCMSvF3Q0jhClrQHNTUfDYSgI7/iVV7EZMkBx3 pXk+ef5vynVC+hqNEBE7oPSFMknahzNmAjHRdJonyzXkm2PvPVQlBKkIw0zvwzo/icGt uPiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mkaf5lzCS1k/jfXXGgHGcn4yImPSNm2P3/TC9++2Hfc=; b=XHa4El+HAcmRrIU0kyiyigrbscFD6ggPldbmufYWp6NfL2xC/BlljByFV8I8kwmpi4 KwUAFlhBzC1FxJD97+8g4qKbkbtHA6KV5LlbwYcPvCHMkiaG58DVAfNnzGFCNMgNm8Na PApWVitXTqHw2HhG7hFfFP1z878PZGHnPRKI3IMWz5Arj0y7n9wzJ7erO9OWUbe9iqX3 NWrVmzW3SFDD3gDDkG9jnF7QiZgDnZtVou02phCOD1h0gTynQ/6rw/rD1JQy+3ak+lrv AWP4in3RbovOgidbvSJ7L6lUhH38DjCTbGdoin5D+4vBhRy0P0/g/POrrizkCNZvA8Tx IsCA== X-Gm-Message-State: AOAM533VpeKCBdEiKrmiA9HHdp51A6n/vTLQJnxyHcCIta6xJXSJ7Ui/ L2JoVYN7zmeE9QuGLtoNBjc37yjA+HcfKg== X-Received: by 2002:a17:903:244f:b0:149:873:e165 with SMTP id l15-20020a170903244f00b001490873e165mr34062105pls.158.1640928192145; Thu, 30 Dec 2021 21:23:12 -0800 (PST) Received: from localhost.localdomain ([2600:6c51:4c3f:8ead:3103:3039:5ba3:a82f]) by smtp.gmail.com with ESMTPSA id b9sm30323343pfm.127.2021.12.30.21.23.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 21:23:11 -0800 (PST) From: Christopher Snowhill To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Dec 2021 21:23:09 -0800 Message-Id: <20211231052309.42415-1-kode54@gmail.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH] avcodec/audiotoolboxdec: Properly fill out_format 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: Christopher Snowhill Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yqc3oPkuW73t 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. Signed-off-by: Christopher Snowhill --- libavcodec/audiotoolboxdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 9939fef218..4abcb63a03 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -370,6 +370,11 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, avctx->sample_rate = out_format.mSampleRate = in_format.mSampleRate; avctx->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;