From patchwork Sat Apr 24 21:54:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27328 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2661670iob; Sat, 24 Apr 2021 14:55:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrZ+Czfk83aDhfWpoxbgrTW3x71nC+L1vlW+B+OuRpKRRnWxUaOtxRnDtLF/39vpPOEhpe X-Received: by 2002:a17:907:9811:: with SMTP id ji17mr10965263ejc.188.1619301354536; Sat, 24 Apr 2021 14:55:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l21si9448650edw.602.2021.04.24.14.55.54; Sat, 24 Apr 2021 14:55:54 -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; arc=fail (body hash mismatch); 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=hotmail.co.uk Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC893680C7D; Sun, 25 Apr 2021 00:55:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2022.outbound.protection.outlook.com [40.92.90.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2E35680677 for ; Sun, 25 Apr 2021 00:55:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MvrmOi4M22p/VHK9YpD8O6mfma1Qym+iYx1uJyzbo06EptiRhXu2mrK6AFMttG7/F+Ap9RjZ1vZPcabmvcDMqEOQr+SFOz5TaO7Dn5+glSOTuOfEUBtZH7OLEczGD0o9jjM1VqdWgKb0QTRai6eGD9xfMJkiXEZZpKk+fK5Avec2PgaGnX5cj8S78A2XcvgHe5G1nouDKyLN3nsfuVvRPgVBZOHBFeoQ5k5KqhGNFgImYIzH/OF7vBOFeAlyUkvUPYQr5/4pojHtTidLd1TXZdZt4+6LINpgdIjpb/ii7SRgjOSs3IePkb7JPjxO+oRFp4Gdf5QP9oNEGM5Z+OvsTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+0pS9n9VGBBq45z6ujxUt03lIfe/lfJb/0RfV29/Iho=; b=GsAJN39Y1uIv6dHhgnkgLbVwNnoXV5gV9vUlOirylisNjjwtDJbAx5LOe5OH2pFJ3jS1PaaoDLnDs9PdEozRyLMZYpgGhbd4sGeUegvIE0cVgn7nRBuq/X2Izm0yEpYnVRkbTkIO8mKNVeEnSvIfKf5LMBVekzMWokfmuUBI6XuU1phJkMtWcblZaahm/hZtOmytpv9g2+YSFh73JLt+dsAUbxMDAub/wgx1sOd1X0CQMe2AdsqFStjG/efQI/lxPyRVuatxdA635X4CXOu/Df7Ib4JM4afnFASHWyY1QQdrpBuI/kJNbbRoH5pWaMOH0k8VP9eRGCvLienrC0CwUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VI1EUR05FT059.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::4c) by VI1EUR05HT168.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 21:55:43 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc12::40) by VI1EUR05FT059.mail.protection.outlook.com (2a01:111:e400:fc12::335) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 21:55:43 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C5601C014FB64A4F5DF99E6B18B2E0A12B08AB77AF8F92F834F8E0FAEDA59C0B; UpperCasedChecksum:1FE0136D50EE96A20CBA28FE81146F0CD36F31A1F01914BE70D7D75F0902D9D9; SizeAsReceived:7405; Count:46 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436]) by AM9PR09MB5170.eurprd09.prod.outlook.com ([fe80::4545:9b8c:a216:3436%3]) with mapi id 15.20.4065.025; Sat, 24 Apr 2021 21:55:43 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 22:54:56 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20210424215456.39000-1-aidan.is@hotmail.co.uk> References: <20210424215456.39000-1-aidan.is@hotmail.co.uk> X-TMN: [hjpm8IydOSF+EPrIXgAyRW/Zj6z+iGxm] X-ClientProxiedBy: LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424215456.39000-3-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.25 via Frontend Transport; Sat, 24 Apr 2021 21:55:43 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 5d446837-1667-411a-e089-08d9076bb571 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuQ75gPcT42JL4CyEb3w00pb2jWdZ2RaiFbcTFOXVH5wo1d97QkD9SF4iGi4l1YuI5mU4E8wD2fxXSJGgfhKalTy48OSkSQvdd/dOBKsJLW1+qr9iqVXvaPSEpcIJyzgENzeRpKgIjvGTdf8p5t+zizBcLnWMP6+OPd+msNnBYGDaqryAfFiztr0cNJxNxR3gwzN6/IgC+1dJYDBqPSmpFxHP5cgv8Unbzdbbd7/t7dGZOQxeAwA17dTpQjcXNsrj1keQnnGXWygYQcZORMYpLRRFwTU7+dhNTdlsHriEZxxuZP8KLkA65VjYqvRkuHCxhcHZyOrpP2ttlJRuO1KGieCuK8x4VEJXzFIfMSdgrK1WlrWQn3GkyPjq9RtUf1ZebUJZNfggJaN53NzCTYO8UAPZYz4T/S6HLoSGpkwurmHh3Mz8H35Uz/mmExzj07gHj/Pc+3UFTeyz1jGgWOlCPtkdZGqOou6HeHApiscqTkL5Bzp60/Za3LCfEMhOTM5e72SQL2022H18wkwYRWbE0aUbwpCmUc4rJxHzJA8sUSdPhtBvsGuTMoqlkzHmuEYG6A6Y0Q2fC4jRkUKQCJ1VImrdjl4fGn3Hhh5AU+ZfBtTK4AZcWobGVQlTWRvKH7mYWm1U5Vr005zzhA4+o1Rm/5FAqWEf1SGbnFEyTyO7FL9PyDvpMyO2bAX+eJJqE1Di9g1PCm4LwnqTCykdkGhq6tGnR5vNflP5bCt745LVr1SUYcxwRIRULL0RcXmQmXjZ+2FT6I7jxw75+EN/YOqYlx X-MS-TrafficTypeDiagnostic: VI1EUR05HT168: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7YKv19cDt/tOf5RAUws5BMD9DR6MYYFy9/b3tTdXfloQfiQJFb0/DGN1cHZQlrx28slHMUrnzNgtzR7E/X1Fmn2eTD/eQevHUHF/SWIWVNOh6dFCFuCvQhekSuNP3teRuVnYTonAKHJPGhjcVojM5w12ZbhTYmClty8cpLjwcaLhTWGe1Uh59G4irNHz4WgeryadvJejomoXp7LiuMvyRLfSosYgcKFOgi+u2y4n9AJhXoeomk1vrN6FPvJ3FGF8Bsc7Ow9josQaHOyiJWeFQ4XEAzy3JyebLvfXA/DQr2Skhbu5+tuyK16yxSTnuWOxFxQG7YAQOlvYNGvbB2iMK+etRZ17yRmiNtuoTO1KnZ2im3OwxESn6rTeHaZ6To4p+SsCUUKHubY20vYSx1Hczw== X-MS-Exchange-AntiSpam-MessageData: AzweDtiaM2IYFbQqzy0rfB7c72bKhVSQ3IdzSsmln6NtUuxcQhH4kjwkBPK4yHDXu1K8ganW9HZYaiz1FIR/Pv4ZZj9azqhPNJvvJahf4hDrnbdfZQ1jt9nTBnpCFIU9OGxBDjCL2w3Ihje4i9tshA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d446837-1667-411a-e089-08d9076bb571 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 21:55:43.8203 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT059.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR05HT168 Subject: [FFmpeg-devel] [PATCH v3 3/3] avcodec/adpcm: Fixes output from Westwood ADPCM. 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: Aidan Richmond Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4BKCmJYoNNQr Fixes bug #9198 Signed-off-by: Aidan Richmond --- libavcodec/adpcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index be14607eac..5ec9691001 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1400,16 +1400,16 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, for (n = nb_samples / 2; n > 0; n--) { int v = bytestream2_get_byteu(&gb); - *smp++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); *smp++ = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + *smp++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); } } } else { for (n = nb_samples / 2; n > 0; n--) { for (channel = 0; channel < avctx->channels; channel++) { int v = bytestream2_get_byteu(&gb); - *samples++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); - samples[st] = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + *samples++ = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + samples[st] = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); } samples += avctx->channels; }