From patchwork Mon May 31 15:03:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 28024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2957782iof; Mon, 31 May 2021 08:03:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg9ZqtA8thm6VFavsatWc5Bv7XjHpCOWAF6UTfqEOPmExviO5CFGggGpRBvZt8lmpuUKWn X-Received: by 2002:a17:906:c010:: with SMTP id e16mr23543681ejz.214.1622473394263; Mon, 31 May 2021 08:03:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622473394; cv=none; d=google.com; s=arc-20160816; b=ObTZqyy4Kn5hA4Empk/UI7S2Abow6SVpGJ7utOhkTPRtrCADAnsLuLqTMl5HwMdars RUlFy6uh3b4PRM1q6AW6eRjzqd7slXSUn28VqtqeAkTjzvsr7fE67NQPJF5bu95dt0Ku gux/LjkNszQV+C/Dmfj2zs19MY65vyjorLtoTtKw6XvT+SQ85zyEEsBmo2DqZH1vflqt nzyZBtRFhzb/B+vUUU1oORQGAk7GXPvm36pUxYz61Qek99EoDBsAq08KWFFoKJHVkbNs gB8ZPXtABlcH6vtDspQJ9v/6Jjfvuh1Hk4+gQDE4lqorQY6Vo7hdXT2pGaGOBtAtKvXd wMNw== 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=zSm1dGqwCh/z0ZYv2Qplrk9MWCiA2M1vv4heE6BYsUg=; b=iZCoXOq2xNdl1NAZDsNA/AF8YYdJlbOsMsl0KJIcSqv0czaAFIuUJ8tAtV5LglQrLP S7ua5xXbxzdVfI2y3rj0g8hdP3iULc72tIQC5H46pPoD7Gbd04NhfdnrCdIEFGVGLQHi roSVxSc0Tq62tuRsWFxpTt3gJOoRJDYVXZAIOuMEkdt/Xzps59POhEV4NN5WC3hfPPj5 1PCnus10zQXK4JoAPhXpI3BOOAslvlqJJtzBUVtPSqiyIGmX7CGyPSZ1zQpHnMRjT4tr p4PcoN2n8lbjZPC8eDCJFbsn1W42BmYqT5DXvWq7CE3MNBMiE2NJc656BBtd4m8/TmE+ eLfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CtUqew5s; 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 q2si15536767ejx.698.2021.05.31.08.03.13; Mon, 31 May 2021 08:03:14 -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=@gmail.com header.s=20161025 header.b=CtUqew5s; 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 C4883688068; Mon, 31 May 2021 18:03:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD26A6808D9 for ; Mon, 31 May 2021 18:03:03 +0300 (EEST) Received: by mail-lj1-f173.google.com with SMTP id e11so15330184ljn.13 for ; Mon, 31 May 2021 08:03:03 -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=7AE7aAQTmkfulkSIy5YHNp5UObaL4WhAGlxsOmn8ooc=; b=CtUqew5sMKEETyTK0fhcaOPkpTElzDiq4B3Cil43o1Hkug1B5sTei7hQc5gIozob4j QUobqy9pAQ5jfPABgSzdtNTKf8lAjhPnsKjQCoQMQxI1xGpvXLkn+Jyc4bdieG9ozq8G YFPm+BQWQm2zO0kujLHDsTb6NKrp3Co+y6WQGIEPqDBOHjAszQ1THXwpRcnnpJXg5DBT Ngu50tibyCHd/biMjEZQ+TVqCZZwRoEL5kZ8AP5cM7JBaBou1/lXQkcXfz+wLvHN3F6Q Zs+omyF+GfP/drEkXdXsyaDQ0Ojsk4pqfJXxnVX6Ze9Bh8M0jG+apBTQiAwAAQ+kd8c9 sOFg== 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=7AE7aAQTmkfulkSIy5YHNp5UObaL4WhAGlxsOmn8ooc=; b=mUOqG+7vZctzB/uA4v3ezn5WPpX25GVUe7k5bRZfuMrdjX+7GgNNthXTzlGpZxJ+ur 7MpBLHXZ4aMMqXlO2Qf7BY0fCUy1CJ8Jn7L+dpQ/lSd83JvJKYg8Azz34Wm8/Y7Vr99D IRIm1JhT1zB+jds4jCR4HbdcVe2vs10v4Mr3tSHifAx308Ev2oMao7VK2PxGeMJjXuPk cwfPrSQwOdjX/lZYWN6gF2ihoKG+8FEJ03yv0c0cG1Lyxm+4JnM5RcBKgsA2hbmhPxN/ be2Jr8uRXEdNcHCrrR+c4REhMcZ0maS3aDKZ9C33n5nn5T8lXc9ycpmF97AB1rHrmc6i zYpA== X-Gm-Message-State: AOAM530D0PvBVeDKORjXyxHQRw6t5D0413QOYR1pHKlPYhUtAuNmn/7F FwXk16ZYTvUh3oDzTjuaPW3bX/nuy1j/JQ== X-Received: by 2002:a2e:a44e:: with SMTP id v14mr16696757ljn.243.1622473382703; Mon, 31 May 2021 08:03:02 -0700 (PDT) Received: from localhost ([2a00:1370:812d:8d4d:8d84:163e:25b3:1177]) by smtp.gmail.com with ESMTPSA id d14sm1377775lfq.13.2021.05.31.08.03.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 May 2021 08:03:01 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 May 2021 18:03:02 +0300 Message-Id: <20210531150302.359628-1-val.zapod.vz@gmail.com> X-Mailer: git-send-email 2.30.2 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.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: Davis Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4hoItjbAgYZ5 "avctx->bits_per_raw_sample" always returns 0. Tested with 24 Bit ALAC. The result is bit-perfect. Fix #7287. Co-authored-by: Davis --- libavcodec/audiotoolboxdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index cbd381ef12..c7e1760645 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -303,7 +303,7 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, 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 = {