From patchwork Sun Apr 25 20:00:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27372 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3383043iob; Sun, 25 Apr 2021 13:00:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDDtbIAw/2YCvpNBtLw3JaEHKHbeOsfgBzJpgEXE17ZSGQnbjnqJYgWksbsRT6GUaeW6pp X-Received: by 2002:a17:906:5056:: with SMTP id e22mr14949487ejk.289.1619380850339; Sun, 25 Apr 2021 13:00:50 -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 a3si11518739ejj.228.2021.04.25.13.00.48; Sun, 25 Apr 2021 13:00:50 -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 E8AAB68812C; Sun, 25 Apr 2021 23:00:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070028.outbound.protection.outlook.com [40.92.70.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4279E6880FE for ; Sun, 25 Apr 2021 23:00:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W/FPWLb5ZcokR0ipc/BfV5WFngZ72MA9p32UTu64U/LJ9wLmRh6CyBF0ZHcebE56GjSwCsL+MVBF11t4mcOVVxiwEeTs1hWledvs8zzv1c8rx9p8NkRc2aW5A1PaZ+RiyjTdAxFWPFUCFB/gC4ta9Htw0lc5vBnhSKslPunT2QbsFJGP1OWzMKeBcmn94OUIUy17stKvM7EqxE4EgzXLNSE3ExSiqp5vn4vuMEYJd8R1m5PbofcLW95rZi7aZY6k3PT9ihjRttTN8XA3kIRrfPawjsTqHQ+beqxKEDjrOGZLBnVYXHuewVmvBx/pCNDq9MZ9FLUXJ6kMkihiTZOocA== 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=Xc/wgMZv2LXO8vH+fZat3swm4bhCmJJ049qV1GbCGun5GA/Yy/caqJFVZKVOn60qIEgUCtbbuX5+JVD5B6aP8IS8AcGq4MTexgeL+ptDeXTiRmYh+X8rKIH04azH9pRSbhEKFpytiCOVYkU16Pd0zL9M6LZqy4juAHIxGDwFlz1P9u8PIpfIG1jfbxoduDY49v6ugJURtj/3yVxP9ewelXeodYslPxBSeO+D3NuVynqfbbkssaiw1zjznce4ML5XBdE6ME/Nw1biLAcT31oM5aZ5jDsU8eXND6xKaLXsGexXOguaClBwj9AOgzd8omW3PbkajKtnuHGK5HtDhUp1PQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VE1EUR03FT005.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::40) by VE1EUR03HT241.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::470) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sun, 25 Apr 2021 20:00:25 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:7e09::40) by VE1EUR03FT005.mail.protection.outlook.com (2a01:111:e400:7e09::172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sun, 25 Apr 2021 20:00:25 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B0CABCA5CBE94F7107256D9771EBF1982A5BCF081E768040BA0FC8251FE2999C; UpperCasedChecksum:89F75EB1B25F72D107118BC629B50BB705309E80F5814561EC2C06844F341BB2; SizeAsReceived:7414; 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.026; Sun, 25 Apr 2021 20:00:25 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 21:00:02 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20210425200002.16708-1-aidan.is@hotmail.co.uk> References: <20210425200002.16708-1-aidan.is@hotmail.co.uk> X-TMN: [Ia8atpOEmebZ5Cjld7eGFUsW2oHLCkhK] X-ClientProxiedBy: LO4P123CA0411.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:189::20) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210425200002.16708-3-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO4P123CA0411.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:189::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.24 via Frontend Transport; Sun, 25 Apr 2021 20:00:24 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3270adb0-24a7-4ef3-ad24-08d90824c3e1 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEt0UNIrprIYO7QmEwrtLZxZnZKqdJHEvzSolrUsuKKByf7P/EYA+A+5hTpvAnVHyynq21BbOylzmWF2KaxWZBYBN/CnN8U1e5lZz9+eaO1z8fz4uaW0ZHMONO/ftyatozRkTquW5Imr2DVBiWhoqJnDB0j7OCI29CtdojmPTVCJcQ6G24qKZ/7UdmfDcLMb2Xx0dWpgG3n0sZeOSYfCn1VXmPjM1GX192EC5JdNMfJQ9+ECZ4T716OfLX6RUcUkYtgsljrL32Y72SQrQxfPXzX5O7z8ISu6JBaq8otesNxr6e3P3rrrIp+la1kgfsiuk6XzJjUbRUxrG1VoQ1KSOtz7HhIHSkj2knYwr23tNAqk2CTQKvWBp22v/shZs55BZoV3+cSmlNFLZ4NVJXJKwcWOWtkmzCeXoP1DATIjg5Axp0eXRHt2Refv/LgUfblfVEKvP+MXdIuwUihSlrwQG/C4+drNlSOedhgzVfMjmwFnBmBaeyXHAgYk1nceZLyWoX8Ydw7s9TppdlV/svgiXz8bedz8FQB/Ns93rL6BaZ8CYEu17YCN+I4wdW3JQxwr/qI+UhVVcr6LPuQ66Q/fAXwKHFgaIeJnhE874Y3F4qYHET1M7tspzlfn/cIgUsDB6KGFRkz2O5qpPyC4acN5f5Gym5ZpYnkb9MuJ5BDUpQicVvxtSRvK4wVUKkXg6LlaQJj3BnkOJMhpLUL2X5qEkzDFyi64qI05wOaSWmk6V2KcWeQD8E0yGOvFT1X8iPc85kQpEZ9oSteEaoTZ/50JK072 X-MS-TrafficTypeDiagnostic: VE1EUR03HT241: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YaberOlatLIsRqPviKYrNPcBsHTsCeRjhtjmEgUd9JIiTEB5qoRORyV754N61xKaQ6pA1OyrTsByJp6G1+cZS5HDvU7rsAmF+LTAufnvlBNNEIaOrWxqKWDg7Miye1kcT1IdX8s0ZWU5nKcX0MswKSfPN8bsYloxLjgjSsanzc3mqp1EntG7xeEpwCk52ebbaweFd7lZkvMhM+U7aA6UaSNvl+JhPBVPnQVh9Wr1qKlywOdNYywiHxv86qqTxX3lnQzA8Di7n5F06OAcuxtjBRlNzlL7Ex9DqkCtB82cMjL1nuq+RXHn2T2Kfoyg7ub1ZwbIQ3QJsgZBIplrPGuBtZiWd6SCDtWpWWnmTlpMIqJHUlE2Ki16Oma3FpmfsLvCtC+f8Th6SlvJ1tufukUT4g== X-MS-Exchange-AntiSpam-MessageData: J7GfKe3BBEqJ45wl7GNhOYqSM850wrvWs/6d34tG4890D3H3HBtA4B6E6HwPI3Ou048FrFo27jzolGZPRocZZfrV8qB4AlaYWQuro9cLDDGQtgIuj4Wnlh8p4zX32aSLnDtsb6ZhiLtI3w4SA9Ya6w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3270adb0-24a7-4ef3-ad24-08d90824c3e1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2021 20:00:24.9490 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT005.eop-EUR03.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: VE1EUR03HT241 Subject: [FFmpeg-devel] [PATCH v5 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: qK8xP8aSzHlj 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; }