From patchwork Fri Dec 31 05:23:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Snowhill X-Patchwork-Id: 32954 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13701160iog; Thu, 30 Dec 2021 21:23:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwK8sUvark8HbQe0twF8aUwoTvsq5C25obk7kOzgs0UM5RTu0kLD3qeEVe1uJ+xuicrs2Mb X-Received: by 2002:a17:907:118f:: with SMTP id uz15mr27797011ejb.726.1640928224508; Thu, 30 Dec 2021 21:23:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640928224; cv=none; d=google.com; s=arc-20160816; b=E2asAnmavbA/uz/vx00sweluJroWm5vjhviTRovol8KwipxX12oxLVf+N/tDPO8skw sedjmjo/CjjeAR4fPVVIsUCbgxuuEGE4OhDpAYjUXlQWcR1Z/oKT5y6ZU5cvssv8WiUd zIjJkD6Yc2z+cnww9/SRnm5DLYIrq7zkzFH5vwLZu+s3oZ0qFVCur/br9ll0vVW7Z4Mn wOOh+6topqGy0bEl0AjfaqeLmdh+b0KjmGCbFHy/Jq1vHR0DDNMAwIx1f2rcoU2XZgbo 5dabTY9PrulL1U2YqM2j754Ahm/0yyOLUpcxZNxQIHd5pnSfwdmpd8HRR213C/vL3jI4 O69Q== 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=kmjqB7KNqBXqVK+glffTVF7GeAu6FVxHAqEdYbo2mV0=; b=XoPPfl6UKd4A89VXMlJ2/ytAur1a3N7sCbJBsXgXaL3LmPIzxbhOWm7F4tiLCvPGKm lvptLNfW+ZFllTaG0mg7OB8z29NAUwp9OiqGFEUutc6NTgYLyvpum41LnZgVT+t+3qYp 5PrKIiAw1tc5rowNpR5AKJnyOTcENlbMyBSf4IOmGw/jpavhr1/5c+zxRQkM6gMyy/6w eSLNMr2diWHA9AAasTLk6ZvQ82TwW3v2aKqr2qTCdHKVOQplcyB1erVzN7UkcUqEwbEH r0lmAa9c43MkukMEB0JeFIEncX6qsOUZhHhaT0C1lUCiOtiAZDsEbZdENnbCA/xxCVHG uXrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bV+jXqbf; 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 cn9si13630053edb.46.2021.12.30.21.23.44; Thu, 30 Dec 2021 21:23:44 -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=bV+jXqbf; 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 012DC68AF88; Fri, 31 Dec 2021 07:23:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B98C66801EB for ; Fri, 31 Dec 2021 07:23:35 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id z3so19584246plg.8 for ; Thu, 30 Dec 2021 21:23:35 -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=hrJb8byynpCl3jRKD9Lb9HXpSXijIY9zdEK2RtotpzY=; b=bV+jXqbf1XJQ79vXGnhAz29uz3oP4c6UXlV073xqNk6ZU19sLqGD1WzSCQyBXmSGWs LhQUYsHA492iqD0VLVJHkVGJ1OW0s/T/oaR6wB/HVCgVn7zXg6nxO3QUifKTWmAySUf3 WBcmsFlgj7bfr1ggzbk+5Tsd94L6bXwv6a7U//m05azS2AT79YLfwfMqu2yZ+GiaPfjp SruU6VGCdMSEPwdajOmWzxtI5ing/r8Nb8kJLaBB6cwhtkDSDOxY9g1yIgbZ5OGUtn87 JuE1elRQTxTfd1tEkQmtrhr5c95iphmy9SPF9PiPnhkUurd0WcRDh7jq03Jbssctq88U nVUQ== 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=hrJb8byynpCl3jRKD9Lb9HXpSXijIY9zdEK2RtotpzY=; b=3A0iRoXLzJjlowTbS0IXlZV8iXhDL26bE7MxyKoB0tk3r8n/EFjvEpR1RcVGauj5lg /BrR092ivqORgDhEIJUJLPEdtkOug4K1CfdOWxnSe3xFnP33qQ9RgegaNxgnT3l11S9/ PHl9cGz0KZmAkorI4MWblTYESp//9RqTpvhOQ/xYgEkRnfPrKbf8s+XRURej3+F9pne/ SfT9Gmt/B8DqIwcsUbawTSgzVfdB9znIYVR9iikmLXBvD456jvggQmAVargCjhjjHW/A oEMZ8d8PfaOxhvByEJaLDCpZWOaRUndrF6bNS0+HThElrt6ipapy73d4psd9db4CP5KI 6EnA== X-Gm-Message-State: AOAM533Xe0HTzWjridVj0jmIQKB1Oc9se/LGWCwuvrSIzof4skm3XDrD G4ftHQaFKYU0wPuHDhgLvs0va6D4nuUcRg== X-Received: by 2002:a17:902:7c85:b0:148:ddc3:7d2f with SMTP id y5-20020a1709027c8500b00148ddc37d2fmr33787177pll.80.1640928213712; Thu, 30 Dec 2021 21:23:33 -0800 (PST) Received: from localhost.localdomain ([2600:6c51:4c3f:8ead:3103:3039:5ba3:a82f]) by smtp.gmail.com with ESMTPSA id t10sm30569387pfg.105.2021.12.30.21.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 21:23:33 -0800 (PST) From: Christopher Snowhill To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Dec 2021 21:23:30 -0800 Message-Id: <20211231052330.42471-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: Decode appropriate formats to float 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: Eo4CV367xf6y These candidate formats are likely already decoded in floating point internally anyway, so request float output so that it's also possible to clip or peak level as necessary. Signed-off-by: Christopher Snowhill --- libavcodec/audiotoolboxdec.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 4abcb63a03..427f143468 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -297,6 +297,25 @@ static int ffat_set_extradata(AVCodecContext *avctx) return 0; } +static bool ffat_get_format_is_float(enum AVCodecID codec) +{ + switch (codec) { + case AV_CODEC_ID_AAC: + case AV_CODEC_ID_AC3: + case AV_CODEC_ID_AMR_NB: + case AV_CODEC_ID_EAC3: + case AV_CODEC_ID_ILBC: + case AV_CODEC_ID_MP1: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: + case AV_CODEC_ID_QDMC: + case AV_CODEC_ID_QDM2: + return true; + default: + return false; + } +} + static av_cold int ffat_create_decoder(AVCodecContext *avctx, const AVPacket *pkt) { @@ -304,8 +323,12 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, OSStatus status; int i; - enum AVSampleFormat sample_fmt = (avctx->bits_per_raw_sample == 32) ? - AV_SAMPLE_FMT_S32 : AV_SAMPLE_FMT_S16; + bool sample_fmt_is_float = ffat_get_format_is_float(avctx->codec_id); + + enum AVSampleFormat sample_fmt = sample_fmt_is_float ? + AV_SAMPLE_FMT_FLT : + ((avctx->bits_per_raw_sample == 32) ? + AV_SAMPLE_FMT_S32 : AV_SAMPLE_FMT_S16); AudioStreamBasicDescription in_format = { .mFormatID = ffat_get_format_id(avctx->codec_id, avctx->profile), @@ -313,7 +336,10 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, }; AudioStreamBasicDescription out_format = { .mFormatID = kAudioFormatLinearPCM, - .mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked, + .mFormatFlags = (sample_fmt_is_float ? + kAudioFormatFlagIsFloat : + kAudioFormatFlagIsSignedInteger) | + kAudioFormatFlagIsPacked, .mFramesPerPacket = 1, .mBitsPerChannel = av_get_bytes_per_sample(sample_fmt) * 8, }; @@ -471,7 +497,9 @@ static OSStatus ffat_decode_callback(AudioConverterRef converter, UInt32 *nb_pac static void ffat_copy_samples(AVCodecContext *avctx, AVFrame *frame) { ATDecodeContext *at = avctx->priv_data; - if (avctx->sample_fmt == AV_SAMPLE_FMT_S32) { + if (avctx->sample_fmt == AV_SAMPLE_FMT_FLT) { + COPY_SAMPLES(float); + } else if (avctx->sample_fmt == AV_SAMPLE_FMT_S32) { COPY_SAMPLES(int32_t); } else { COPY_SAMPLES(int16_t);