From patchwork Mon Jul 8 16:35:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davis X-Patchwork-Id: 13859 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C78F8449988 for ; Mon, 8 Jul 2019 19:37:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C28368AD55; Mon, 8 Jul 2019 19:37:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7CD468AD1F for ; Mon, 8 Jul 2019 19:37:00 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id z75so7963365pgz.5 for ; Mon, 08 Jul 2019 09:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mmNf5Ufycoes8BBz72FO5/uUsDsc+qkxqhafYDRsNlk=; b=QYbYVEqmpKlocXgjbFXDw7UlPGNSy+norHnMkuytpXr0eJHLnu75wPbh0rMF6vb/be iWYjEzuWb0VS2Xvmyo/bFkRwuRZe9waXYPHJidum874e9iH4N1RxEuiOrhmouV4EIcgl delKfBZ2Qn1FVEFY+Ugxp7KJVQJ9SGkeY/zelFvfX+ChJWAhRk6wmxoca9tagTSqicsN XNYUM9F4mzhmFiT1kb0jafZPh3ndyusEsCaeBNE72v3Hz0EKS9arB7Z+23DRIm3I+Ws8 m/9qAkeDgtOi3SZf1k0bvPPXcLYThjSGs6zlDQkHF0xBf510zgvzw+dRglD1wJ/L5PCH BrhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mmNf5Ufycoes8BBz72FO5/uUsDsc+qkxqhafYDRsNlk=; b=Ysidkl1X/i84a4Av2DMd0lb5oP6Z16OJRNJcaFiI/s7AcC/cvGhr+DibB7LOuHNUIe LQxbqHFAHIXGLa7DekIyKC3UKYM9cRIkRQ9LvzXPEreP/LD8KJ/Dv7jaGtwC5TeEjnjP rgc1zV0ufpVWU4WOT9fPZRXwvPPbh1tvJHj0eY2TL4bdekHZt/gi7H9fxD8zPJSKuEMz KIhuE//ZoGudN5P8UqUapu2uMRUlCHLkxttkcKbU95gM2YY50f5vFsITlS9rZ/3Udt42 rYRq8HnjVSPzIOGCfrknneJn3DKzan2oB5iPOW51eVQGde/bsLI/o6gsh407MtbroqaN a7WA== X-Gm-Message-State: APjAAAUeH0vDzxOrnu8AKE1YjPceuxDbWGUgqn43i4lwphulzF7Goo4h HTDivOqF1b9b7BA7uan2UX1+lqITtY56yQ== X-Google-Smtp-Source: APXvYqxxnsCAUPowY2k58d6Kxk7IsqR1Je3U5oZrlygcN/JEyHDcJaCW3ONbKrHwaOXBoENYnUJ1Kw== X-Received: by 2002:a63:1c22:: with SMTP id c34mr15437522pgc.56.1562603818710; Mon, 08 Jul 2019 09:36:58 -0700 (PDT) Received: from localhost.localdomain (115-64-151-163.tpgi.com.au. [115.64.151.163]) by smtp.gmail.com with ESMTPSA id a16sm21076662pfd.68.2019.07.08.09.36.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jul 2019 09:36:58 -0700 (PDT) From: Davis To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jul 2019 02:35:21 +1000 Message-Id: <20190708163521.20068-1-macdavis1992@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/audiotoolboxdec: Fix decoding 24 Bit ALAC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Davis Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" "avctx->bits_per_raw_sample" always returns 0. Tested with 24 Bit ALAC. The result is bit-perfect. Fix #7287. --- libavcodec/audiotoolboxdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 5c0a9de8f6..95bf9acc42 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -302,7 +302,7 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt) OSStatus status; int i; - enum AVSampleFormat sample_fmt = (avctx->bits_per_raw_sample == 32) ? + enum AVSampleFormat sample_fmt = (avctx->bits_per_coded_sample > 16) ? AV_SAMPLE_FMT_S32 : AV_SAMPLE_FMT_S16; AudioStreamBasicDescription in_format = {