From patchwork Thu Aug 24 23:21:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:f07:b0:149:dfde:5c0a with SMTP id fl7csp74893pzb; Thu, 24 Aug 2023 16:21:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJkIlu6IxAE+QToUcT+PfgpaGcyxh+YTgGKoOvyZ6ZdJ588UHdbljNky+9uNqCa3rJEKom X-Received: by 2002:a17:906:3051:b0:99c:f47a:2354 with SMTP id d17-20020a170906305100b0099cf47a2354mr13425719ejd.70.1692919318393; Thu, 24 Aug 2023 16:21:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692919318; cv=none; d=google.com; s=arc-20160816; b=1JJUJABtcC0YTXrKgPShR0WGc+i3mhQPONT79bD9GAv/gZgLcjYEF6Ek3fkaXWtHIi WuXnONE/TUHCeNBD9Iogcmkkn/bOUiu0Ku0VRCQP4LM+V3UPLjpfH6BvGwuy2oRIi9QY W0/AgNGVP290u5CpsmU375RW72rDxWo+iHRvpLnY3oe9Y62Qjp7A/WG8YO8Piv/vQy9r kPZYOraktQWpOJEzmC3xhfl5Ap8xTDXFcuBjvg03P9P9+B3npPW0acxU/6n6IguCOAI1 VA1VNPwFBoC0xG2J5TyMf4QXyNSTGEi1dhgON2qQdwfHuGxzAi9FbiRtwssAtxbNcb5m f0AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=upK8pduE+ia8h/lm8Rkjir2XDzdl5NivB0w/oR3kB40=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YJxmiMJN7NK/ELyc7AtIEDkiKxfmUChcYcpgfgfKHf/C4aZ3hfiFiCsQ2Ou79YA5uK BsKsy4E+SxI1Oxp+15Sx86sS7gnuy4wIA7PPVIy5RKwxCLZl/0BEuXzLbF6rPnrdFtyu lg6wzuj0dumwSoimniQ1mx+F3cRa4LeC8Fcb3jPpKv6tLXqZ0mPfNWM23f4ZKZTDx/wk Fx2hVI3K5aWYumYkwyv9qmX4brDp1hjbTpPVlBuF9cCNly5fM6oVzIFGnsrZwEvX5n3n 0mnyZUueVPy3PfbmnTXd+a7n8Fdt8RXIXkCP8RgK/ClDNXlaXZzBwjuoPKttRIcJ2y4k hkvw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lc8-20020a170906dfe800b00993689daad0si242294ejc.269.2023.08.24.16.21.57; Thu, 24 Aug 2023 16:21:58 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF55B68C683; Fri, 25 Aug 2023 02:21:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E614968C53B for ; Fri, 25 Aug 2023 02:21:37 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 26953FF803 for ; Thu, 24 Aug 2023 23:21:36 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 25 Aug 2023 01:21:35 +0200 Message-Id: <20230824232135.26854-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230824232135.26854-1-michael@niedermayer.cc> References: <20230824232135.26854-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/apedec: Fix CRC for 24bps and bigendian 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: X/UtIegaMcQh Fixes CRC for vlc.ape and APE_48K_24bit_2CH_02_01.ape Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index cc0d7e2749..d48d3a676d 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1592,13 +1592,24 @@ static int ape_decode_frame(AVCodecContext *avctx, AVFrame *frame, s->samples -= blockstodecode; if (avctx->err_recognition & AV_EF_CRCCHECK && - s->fileversion >= 3900 && s->bps < 24) { + s->fileversion >= 3900) { uint32_t crc = s->CRC_state; const AVCRC *crc_tab = av_crc_get_table(AV_CRC_32_IEEE_LE); + int stride = s->bps == 24 ? 4 : (s->bps>>3); + int offset = s->bps == 24; + int bytes = s->bps >> 3; + for (i = 0; i < blockstodecode; i++) { for (ch = 0; ch < s->channels; ch++) { - uint8_t *smp = frame->data[ch] + (i*(s->bps >> 3)); - crc = av_crc(crc_tab, crc, smp, s->bps >> 3); +#if HAVE_BIGENDIAN + uint8_t *smp_native = frame->data[ch] + i*stride; + uint8_t smp[4]; + for(int j = 0; jdata[ch] + i*stride; +#endif + crc = av_crc(crc_tab, crc, smp+offset, bytes); } }