From patchwork Mon May 3 11:31:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 27567 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp158572pxh; Mon, 3 May 2021 04:32:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzu8hF9OMPKKpk/Cy+fLc113gjMSemhTOd+EopVHYJtrVaJ+7KRaiCiz0fgaD7JrYGTYq2K X-Received: by 2002:a17:907:6ee:: with SMTP id yh14mr16015134ejb.375.1620041537450; Mon, 03 May 2021 04:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620041537; cv=none; d=google.com; s=arc-20160816; b=QK2ASCyZSXfwIiwTAd1cVwlAYGe+fq05O1VraFBg4pmS84sUiKkdEiDYLZ8qYszGO+ T5tK7hYkCFwhcjXiNHGWpMj9TskN+EWjdkRhAqeX1lw3cXwkvOapmJtjYvg2BFMBYRKw EWF1D2Ij+BUX3Gw1/n5RT2wlPyHMp/FSlkvVYrWRaCPW50d7VKzLWzw7I1XkaQcQEYpw 2eRD8+SpbELrDmfHzwKMXLRIb40lPDY4FND7Ic3USZ11q08KznkPTPRwjz1QQmQvRoie HK7ZwbGUNsBtyPsYOe0IHvW9VWGzdBSTQiWeg+A4uhk9i9LiFfQERJQHzOKMox9kVCEd adbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=Ael6zqTd2YMmOeP3pJPX1fmxRzHgyaw8899nvJRxHW0=; b=AyW+/y6JkpEBVkNiZ69rHUZU+OPVlvpS9kjKIz0bIUtNtRZszQEDDmaU4dDC8w5Xw2 zyZBYvGC/HOjt/J20IyiO9Gc9Yol/I9DU1Aga8EYHtVn+6+yQmOAw39J6NY5Iujt3qgC Njvza5v9RTonFLmh7pjO6Gj5ErWwkyACNYlpLIiZf+L0iVDeL74NAQ+CEvtcNyWKlvp/ AucxPjuqOEX2E46h9T0NCrtk3y/Vj2pE28260m+R+tNM0slzYZItU6lGPnOkEpH0mmNq jzoc1+cl4ysdmCVCOnHRdvzL96gPsALE0AhTjLNRbvyB050rQIonA/906Ecu7h6FhCHW bqnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=GStnkzKG; 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=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bq19si242615edb.311.2021.05.03.04.32.16; Mon, 03 May 2021 04:32:17 -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=@zanevaniperen.com header.s=key1 header.b=GStnkzKG; 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=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 704F4687F64; Mon, 3 May 2021 14:32:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96F9F680CEA for ; Mon, 3 May 2021 14:32:06 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1620041525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mSrSceqYIaRJrY/z77AF5uPJDxAoSnoBuOMKEI+rWog=; b=GStnkzKGwuH6O52vKqAdy+F3bsb6OZ/Zb7hoCRFUljVExNLgTrFfeDEfm9dEfgclY4VrO1 j/uPlJjYD9tPCJnkI5N5dS7NQfUCemqGuiWoDRw3c/pyV31AV0vtbP26lGa8REncvpQm1O Cmkl0paqqjeYlri8tFPaTO0Z7g4n+5ZHR8FyxtgZmbUejPCEo1xCmiSKzF8v2NSlvm+oo6 yboj+4t/99uOwwmPm0UUrezDSQ9PZ9q3L/lAkgRGk0pWLE7tdKMeeSbfQd0p5e3MAjSxBR oM7kAGZB57FZIAe5es2xsbKfKuNC+hXeKDE+STUxmSNEX19Vuacs7b3Xh6o6bw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 21:31:54 +1000 Message-Id: <20210503113157.2215-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/adpcm_psx: always fetch next byte irregardless of flag 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R4iCo9e1FwTS Even though all samples are meant to be zero (if flag == 0x07), doesn't mean that they aren't there. See No$PSX docs [1]. [1]: https://problemkaputt.de/psx-spx.htm#spuadpcmsamples Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 3da6b734cf..8c07f3673d 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1990,14 +1990,14 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, for (n = 0; n < 28; n++) { int sample = 0, scale; - if (flag < 0x07) { - if (n & 1) { - scale = sign_extend(byte >> 4, 4); - } else { - byte = bytestream2_get_byteu(&gb); - scale = sign_extend(byte, 4); - } + if (n & 1) { + scale = sign_extend(byte >> 4, 4); + } else { + byte = bytestream2_get_byteu(&gb); + scale = sign_extend(byte, 4); + } + if (flag < 0x07) { scale = scale * (1 << 12); sample = (int)((scale >> shift) + (c->status[channel].sample1 * xa_adpcm_table[filter][0] + c->status[channel].sample2 * xa_adpcm_table[filter][1]) / 64); }