From patchwork Mon May 31 14:29:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 28023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2932453iof; Mon, 31 May 2021 07:29:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwULbcbN3KF+YQRnhoHXSwXiMYuQbUTrt4YFwS0xpH9ijTlWeiUiCdssilwaYxKa0LwEE/T X-Received: by 2002:aa7:c349:: with SMTP id j9mr17880268edr.48.1622471367054; Mon, 31 May 2021 07:29:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622471367; cv=none; d=google.com; s=arc-20160816; b=vDFfmUD4/CRll3D5C9bz4g3s5znsN0BeVqrX/3pOcuw7d1wjrdeZkfBZ5H3oSBwHIj q59J70vJaAb0zlmo+ztWz6Jyz0yE8g7DEqb0j/oF4dBKMydv9/gwiIML0guqfIxfT/Xs 7HW/QdlEdO+Y+0rd68sm/baKa/mH1gUIfpVyrOt5b8iEWFUeeUKMSzU0o5bT5Xs1PvLG fPVBS4tEFKfBMMx81pvLzHRwtwZL6qVDhFjA1rCduVxkfvIznUII1jKfzaphEEFCnb2S 9m911MwaaFjNYZtuLzbR3JFJsg0hl0AzEeG2oVRjdqMosKbwWtI+0RqQzsViH9bI/0yL avig== 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=9miJEY3oZYKpTEELTxi+AvNJjRmYan2psZYSDwhAHR4=; b=QRqwurXVdppjqgQxysaDpGydLUpzUnDYTGLZG0uM+wR9iHYt2AzsTG5PYEUDJIsO7+ gdW0+JKBe9ixkOmQVDpRimFinSrCfYTtGSpSQ1Xkl4pqvP3iSeszxSfzk8lEiW4dJG3I L4rLb1ucJGHqzPbdkfsBuZDw6UZKLSjOJTPaf3/75SsSupqQU8qaXGWxW6QPOBThxt0A GIFb1YYJp1j6MlaP3tLF/OynZzKRnjRrjW02xBzV9tvVGMQ5kaVAx6kYGaINFCg8U98b TYH0dnNPi1KNQ6iLuPq/2STB0XD+1E1/k7aH5K0D86/lAowwalDqcf69eDfiCfstNxbG 5cfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DN6jfzZJ; 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 b28si10028197edj.344.2021.05.31.07.29.26; Mon, 31 May 2021 07:29:27 -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=DN6jfzZJ; 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 293536881A9; Mon, 31 May 2021 17:29:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C1C56805D6 for ; Mon, 31 May 2021 17:29:17 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id f11so8292979lfq.4 for ; Mon, 31 May 2021 07:29:17 -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=VPjgnKgabD8Em+S/JAqIm4Y/Qn3bJ3UxllUWANsCOBc=; b=DN6jfzZJSU7UUo2i9uujQWTKGkxbigdtYYNV6V5QoXfpDXebh7p9tpezrN3koYfDJ9 2dxXvDn2dUV4xxjpXYELLBOU134xfF796pd0YEx32RLGjOgNhaBLj1mizuat6Z29EKuA tSWI7hK0LWuzj/lSbbV+vHR6a2UJhaY3prOhuzptp7bOCvIB84GJYBXBFok4rU4/jMw7 ml8Qkcb475YVAqN6GqndYgPY75w/IBdKhN9xddNSeo1AlLfS+lG/DY9rQmjMgRAHGiVi /P2aKWg3QxshWeZMoKyisbFdT/7rvtbAiR0wAsJRFUIjyEuDq0AAKwkx0t8IAO1pFe+m yHqA== 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=VPjgnKgabD8Em+S/JAqIm4Y/Qn3bJ3UxllUWANsCOBc=; b=VWCnOJYgeU8KFd6TzKT3qBlvQZ0acxHyvIG6Qt9Ru8HsnZTHBQf72c6yhVb8MbSDG/ m9aL06f2TQZLWepdyi5/4kIb8nUklfsp9n/l5TmMrUH9LR16UW+7r61Kd7luAIAG5WtH wQGCye6hGJEacZF92HMzuClXnDqo5Afl9W9lai26UNIzyYmCpTi2Ek4+VS6ZRVf0OknV X4I2GnqEn6U+D8HnYFsmmxos4DHLy4KseSOALhpw7z1Nmt3FlYKaww3+EbCPGtj0wAvs MBMbaIfq/+XZ4mwPEEUgFLPE/tAPy3+3S4QqgDd+bin0qfQ0veaC5TF8zWYu9YAGorY8 aiJg== X-Gm-Message-State: AOAM532t31HtVgKVavSMb6XKm2WUDa81YBvEdxcruJalCAYYxg5g+lWH FGNUodjR6Z2nawMDOpTIjWcUkOqagnXJEQ== X-Received: by 2002:a19:4949:: with SMTP id l9mr14546790lfj.642.1622471356539; Mon, 31 May 2021 07:29:16 -0700 (PDT) Received: from localhost ([2a00:1370:812d:8d4d:8d84:163e:25b3:1177]) by smtp.gmail.com with ESMTPSA id c15sm1357967lfj.262.2021.05.31.07.29.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 May 2021 07:29:15 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 May 2021 17:29:16 +0300 Message-Id: <20210531142916.359246-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 "avctx->bits_per_raw_sample" always returns 0. Tested with 24 Bit ALAC. The result is bit-perfect. Fix #7287. 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: nUlknxj5nXnk 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 = {