From patchwork Sun Apr 25 20:00:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27371 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3382908iob; Sun, 25 Apr 2021 13:00:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynlR5a5KHye63EWHNcffOZQ6SJKyS+vB5mERgOOPsbRHAvSkFkMf8M0/n+XtS26hyN7ac2 X-Received: by 2002:a17:906:855:: with SMTP id f21mr14822706ejd.364.1619380833345; Sun, 25 Apr 2021 13:00:33 -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 d19si11503659ejp.154.2021.04.25.13.00.32; Sun, 25 Apr 2021 13:00:33 -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 11BD5688081; Sun, 25 Apr 2021 23:00:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071079.outbound.protection.outlook.com [40.92.71.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 676D56809C9 for ; Sun, 25 Apr 2021 23:00:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gnie2vJqVsJDp0tmpccj6LPdEwIn447/iVCWcvsRXPBQR1WUOz3rLyXaNHTfcotnYzWWhk9Ou7kwgzVUeLjyBM6dI20yafQhDYGtjGqkOIltzmmmbp2HGHCJYoBEwXFzNCUQZhLTrdz6KKgpyu2A1ard2+s3r6NKonYszd1b+iTwij9PNLgNcibyHlwlUrGO1a8aUZaN7E5C2tecOZQM/lV8npSUwwWubbg+fhwS6lJHLYPWLSr6yGq8xFSqnQeRR+ztkgZVP6cPr6Mr4wvHinIG1de/izPXCb5R8Vgv3CnWTskuAfwYR1095mLg3tQo4GPKzKmcY7IfszJ4GnbNcw== 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=v6pUr6Ue6u16bKX1j2AXAABRQAvHMhnkirAcmR5/iOM=; b=Zfv/fXOFP4gVqrB7xn+Sdj5lEctKjTcK/0oG6jxP1wr+rrdxMi9t1SYlrlA1AodYTtI2JmDTEGsm5nZqK5RRsRV9VjiMAUZF2dCk/x7NVHyXv5B/DmB6vJFGLta78N2MD53ySgUgZ196m6YTIQsvFUgDxpzALDrdpKbtv3PMcl+23vG7xKqnv14sxEIcpx14E2sRYih8Z0jMv50iVLrGtHOWdWa9tSUrCptDmWO2VuGRt5PcbCtaFIl9B3iPDg7lG4Dqrn1i6Btqb9jOcmNHleK6tEamH3nJIn41oqn5jCHHzZ5ogIq8qU4M9AI2HZxQKMTqDoTlWFLM2qQIrxS6OA== 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::43) by VE1EUR03HT155.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::246) 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:22 +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:21 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5C7E8A49B39B4E68DAA94139D4AED74B8BB9E33D5AA7B33C2AC0F62FFED5662D; UpperCasedChecksum:78973929D2B19007CB34F5BECCCB687646E29AC1CC5E38B028125E80B3FD6680; SizeAsReceived:7293; Count:44 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:21 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 21:00:00 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 X-TMN: [AQ2RgFaHIc0FSwJb+6DL084wAudv+KIZ] 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-1-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:21 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ca405fc7-ccd3-4ce9-6587-08d90824c1bd X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEt0UNIrprIYO7QmEwrtLZxZqQpoM4gTDQYdMUg1Un3rRMV25iPhsGDfz2r4HReLVGY53QfOHayN9ikoEpl5Jkt/R1EV6Bs/teZL0cvjeQ3D+11dV7oLQkt37ph1UaZj70qRTy29ZCCOx0I782TWWWjapRSbVZbZNg4frAhjF+6FfqpqaSjpjIdRxqhXVXZQPEBkU8D9d0FQ58nZrIFrFP/Pny/b8U5xP8R9I52IRjNjJ2ln2dn4d5PBt64r7aJXvCGj41udERaf3vjbhey+iSfUq3LIizmMPr+eDIVt4lAfl79xnS0v5BgipC8dbGaPX3orPN7NDCaCQEXEQXbevHZv3lsTkgvZ+tFh36WmsyoXucjYKVszzRj1/1AFVYWTZdgv+4HP3szpDO6Cp2YxFj+NdnVZTE5l8e+uxcrsSV4A2ueS6WuplWrbatsVu+SiYmfDTxoNpKH9knLBssw9RbvRpOmJnWCROb9SCWJpiJx52rEDpfTKMsGxKzmhr8Ps5iFBhSzoXNA3Qv5TTwqzefLdow1Ur8oDEI5F+FZYaFlKjCupGJebofDTAB6vIz297qwHFGXGIOlfmGREYeKNSglTqQOdS77dko8ew4XX0YCdXTqB/K8S6dG6ZZFpEc/8X071wXnlviuC4d36eTF7zfhNEE7OPs03F01G354FpS3RrN+Bejse1sIcv1B5lbGELG/LE6oOp5YZhKgucUTypHupqdz5qZey4yfQ8oCNmWVeAywdTkSKC1nhlN9grcF3hyGSGxaIIrZpBAG41jxsI89R X-MS-TrafficTypeDiagnostic: VE1EUR03HT155: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j8PqY4wKcx4ShvTqvz+w+ocFeE1mcyLcPoTisGDSYBxgWkgDRmr1g3kBmo7Di9XLLKOQA5TH+q3J/dRHS01owIxGfpys7q+6UJqbj4WWK5U3qrLb5yvO6bcvbOY5wbKhvlX2iJdVpd5aFqjLQrsNIKh/JG9Zuss11lTAPzaTkpRSYn9lz1rIU5k9jMA0aXb7U6QK/nMljcbSE5bvvj46Lxzkogv6aZ5K9Q6EC31Ul9CnkN6nsr2YkyLusVeemYz4tLX3yeG2iuIOSbw5gy89RmvWmROgHbLvVGrilhLeDG6NXNzATN0aHt5JLKxY8fom5Kihm4GPdWuPgIUflJYFCOjJM/yQJz9rL5KHoEhB7Ov0Bg+OwY05G1iA/llDzi/CnGstU5za6jKz3ZoOi16Qbg== X-MS-Exchange-AntiSpam-MessageData: u+cQAcyGIUL7xY0QeaC1aHHoPxbgP8Nh48pvSclreJthWsdVhdRNBjWeNAHKX5W3cvHeExcM+L5eRFcuSHKPLsFsKpaVjZsVAlY9NdZB7OAFUGXwR892Yx16BN2ncEOhvFBoIANlRZXtODHYBepzMw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca405fc7-ccd3-4ce9-6587-08d90824c1bd X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2021 20:00:21.5300 (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: VE1EUR03HT155 Subject: [FFmpeg-devel] [PATCH v5 1/3] avcodec/adpcmenc: Adds encoder for 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: cvOt3uAxxYZE Signed-off-by: Aidan Richmond --- libavcodec/Makefile | 1 + libavcodec/adpcmenc.c | 32 ++++++++++++++++++++++++++++++-- libavcodec/allcodecs.c | 1 + 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4a597f727a..fcddde459d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -898,6 +898,7 @@ OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_MS_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_MS_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_MTAF_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 9dc77d519a..752cae5cf4 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -94,7 +94,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) if (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI || avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM || - avctx->codec->id == AV_CODEC_ID_ADPCM_ARGO) { + avctx->codec->id == AV_CODEC_ID_ADPCM_ARGO || + avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_WS) { /* * The current trellis implementation doesn't work for extended * runs of samples without periodic resets. Disallow it. @@ -192,6 +193,11 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->frame_size = 32; avctx->block_align = 17 * avctx->channels; break; + case AV_CODEC_ID_ADPCM_IMA_WS: + /* each 16 bits sample gives one nibble */ + avctx->frame_size = s->block_size * 2 / avctx->channels; + avctx->block_align = s->block_size; + break; default: return AVERROR(EINVAL); } @@ -594,7 +600,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI || avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_ALP || - avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM) + avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM || + avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_WS) pkt_size = (frame->nb_samples * avctx->channels) / 2; else pkt_size = avctx->block_align; @@ -929,6 +936,26 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, flush_put_bits(&pb); break; } + case AV_CODEC_ID_ADPCM_IMA_WS: + { + PutBitContext pb; + init_put_bits(&pb, dst, pkt_size); + + av_assert0(avctx->trellis == 0); + for (n = frame->nb_samples / 2; n > 0; n--) { + /* stereo: 1 byte (2 samples) for left, 1 byte for right */ + for (ch = 0; ch < avctx->channels; ch++) { + int t1, t2; + t1 = adpcm_ima_compress_sample(&c->status[ch], *samples++); + t2 = adpcm_ima_compress_sample(&c->status[ch], samples[st]); + put_bits(&pb, 4, t2); + put_bits(&pb, 4, t1); + } + samples += avctx->channels; + } + flush_put_bits(&pb); + break; + } default: return AVERROR(EINVAL); } @@ -990,6 +1017,7 @@ ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_ALP, adpcm_ima_alp, sample_fmts, AV_CODEC_ ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, 0, "ADPCM IMA QuickTime"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_SSI, adpcm_ima_ssi, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Simon & Schuster Interactive"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, sample_fmts_p, 0, "ADPCM IMA WAV"); +ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Westwood"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_MS, adpcm_ms, sample_fmts, 0, "ADPCM Microsoft"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_SWF, adpcm_swf, sample_fmts, 0, "ADPCM Shockwave Flash"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, sample_fmts, 0, "ADPCM Yamaha"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 2e9a3581de..b748c9718e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -645,6 +645,7 @@ extern AVCodec ff_adpcm_ima_ssi_encoder; extern AVCodec ff_adpcm_ima_smjpeg_decoder; extern AVCodec ff_adpcm_ima_wav_encoder; extern AVCodec ff_adpcm_ima_wav_decoder; +extern AVCodec ff_adpcm_ima_ws_encoder; extern AVCodec ff_adpcm_ima_ws_decoder; extern AVCodec ff_adpcm_ms_encoder; extern AVCodec ff_adpcm_ms_decoder; From patchwork Sun Apr 25 20:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27370 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3382969iob; Sun, 25 Apr 2021 13:00:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxROIgb9u4OfWn3aDK2wk+BYgqvoEzssBc+VUISbfN68WguQBc5l+DDVH5MBsXnNIIwOJu1 X-Received: by 2002:a17:906:3f88:: with SMTP id b8mr15443021ejj.36.1619380840875; Sun, 25 Apr 2021 13:00:40 -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 n23si4932088eje.216.2021.04.25.13.00.40; Sun, 25 Apr 2021 13:00:40 -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 015E26880FA; Sun, 25 Apr 2021 23:00:30 +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-oln040092070094.outbound.protection.outlook.com [40.92.70.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF5D868807C for ; Sun, 25 Apr 2021 23:00:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iJi+oJaZ59CZsfKdU5X9ctBNNIFDtjk8TwBgvTt9WA2EK+9TqmhwPOGeBVdyqI/80z2VI+m5AyDLZhMyrOuK0h2qTGzaM+vI9Hh83UkI4I5tYyMcAzf1D4TY0fwfkldO1QzVhzAhoFXoQz1VsbPIDOJiMPC6WN4sFpneFaumItT7PzNqc99l6rFSUqvIvm/7XZPyXiFGWO1+8Xp3ZpeYeKGwDwKy1g2k07KqphCYanVoS32TFBNackU6EqM/IJxhxSScLqnqxrxTR0HBntPDdW0nzMqRekHMe6h4ZRsDwBQuPiajhVF6fJa3AG0zZTsyWaWa0o0cyGpYmCiWSP6nsQ== 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=HpaxScU1J+Yia3RAnb1XviJ3eirB4DRwyg+AWq9oPSI=; b=OhZy/VYK6CcEngIkAUMsUD1EILDlV/FWlf0vJYWpZe+FArHEZb1V5xEwDx0Bqdb0KqaLw8YqpSlTtaNJCvNOyLwa7e6jfN7CSS7eZMUB+y9SpiaBAmu0zmib7APx7m10WNa52US9krj8iNP+3yHus3z8WstopiO/AjiZ6Naxl+3ugRXUQzFzjYqsLGOELZyY/zFuAXBWKVNjCs8y7dtqDRxgil4j1o0oGchTvGm9oey2zxdD3jfXrtGRY4R8Cq7fxYjiV7buC+0UZxX9UIIsX1cd6koJQNM3ypfKCSWg9hpl+RLxUS8Dznw15G9wIRT/5P+2ziniCtptjEtKMjE9yQ== 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::4d) by VE1EUR03HT178.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::396) 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:23 +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:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D2FEEE6D828C9868D2C4BD0A10E3A5EB7061073210D95AC2608D56C5BBFC8119; UpperCasedChecksum:F982DB47D74DD19B22786A393A330295946421AE9DC2BCB37C5010A4F7916E8C; SizeAsReceived:7426; 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:23 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 21:00:01 +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: [eyuKF6+rvQ96G5dq45ckVgW/HgXUHi2h] 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-2-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:23 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 12b2f570-de11-4608-0cc8-08d90824c302 X-MS-Exchange-SLBlob-MailProps: pt8ZUcDWjMVOUy0JiOhI44kpuqFG4v58ctUVGL+Xi3FxRjua+PBbKH/9lvUj9CQojbQLUOVU7bPiaNu1ugUZc5Xamc+m+2mVhhJ4nxKQQPKDLe6mo4sxM2sBXswFpzEPbgDMITe+w9VIv08N9V1g+8ouCcHJIYxgAUKhcN8uyOt83qCLGYy5hOlKvpZeROqCCeNly5B0xhs33CE8oAJrcDx8pTPItyuAWRU8693H2lgzu3ZseOqvAQcxcRwrshNVOseg3toBXS+HziABIGAEiHG5gOipzf7PWSrXtuSKHuHA6CfgjhmL18dRB/5U6uOa/ESmTAv62SxUfXmNBtuWO7TFXZmoTbntHt0cIdXA8dmIGez0wbhGSwOETe7Ze1ljvS4CNm+2T7dH/HYyqRw65g/cQyvXbs6nW0GxeDmL4i5DT4FYDH1xk0Z45ptttcXJtBKjybpfO2g1PVAHGuiW9ViVJMm4gLfWvMSsoIO0COR+EGnQGf/goo0pbBDLTrWMMqr+IMdcZSf92HV0fOtpQoKrgazNbIb+r30DhoFuK6wh75t258b+2+qOb6POsmt2RqnfEcOVSnMOsNwChz8hA3jnQRpj8cU5QOQ5ADY6UQm/wT9pbe+dUPhMBpCien+1bWARxQAqR+s4K7jQ9NfgwC0z1toan1ELTHqQgk69y5Swobk7W1Zk+NfbD1TcvA6VWaa4R1i51/x5FtDWMz+Y47eE40lG0BihNP0+kptCiu1umViGZlbAaonQoCQ3qlBhDHoxPcI0K9i98EvbQFB7MAikA+sPCa6FH3LBuUp+oEM5fU+C9dWfO+eNph//oUtLFDj0Z3zQEsU6wHTRytgvQbzT/t3Nu5MLbEd7EvVcLPKrF6+lHSZo8EONdGA0BUNd6IPO4y5NtMrW0ITpZ/Y3zjbH2UARqgqCnYUN3nJIPQbQMPSTtiV1sCsXIUbYTFxP X-MS-TrafficTypeDiagnostic: VE1EUR03HT178: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /hewVVeQM+IXjKxY1zwauXPmULKauUz+CypTy0K/K/sjViAks5Rz0fpsuXpzvvTmQOVh6D6TtdILvfap6h0ke8XYB+oxbpjK1jpShN/Zs9OCqEUHAMdhcZ8hsusrnKqObYqvgAOb1urowSQrCw2ymjIz/r1h8dtbY+hOrI0j6c+Th4TyVTlESfuzH3FW2qxM0Lm1+S/hlEQv0fbSLhd79CM6TlNwzb/mH4kv/F/UvNA5uq+ll4aZHfOYP9NqDwPFA5sBIBgpM+ssNauCenDLkW5q0BG97BZcAekxalcTts1Ire37pDm3UGOQELpeiXBq8K/Eut0Co5mvvCuhuqtmVJcDG1huPgSyft8I33Y8InvosLzMo8Z7t6PcPTpIVlSSxIpgrDsOlOOlPxUvFD/B7WmwLIL6U8IJnWzVl/gPSVQ= X-MS-Exchange-AntiSpam-MessageData: JIEuAyTqYn40WdmhiX/noniQKnz+pnZOAAXjxpjXa0NQonVR3uWguZg6z1mobCjrwVYXl2YojqtBII0LD/uh7CEw5KISPqzduEYiYOeLcwQd8nP6LMtHErz0gezdyVln3GcoWhXvopdzrx6s2t9+LA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12b2f570-de11-4608-0cc8-08d90824c302 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2021 20:00:23.4924 (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: VE1EUR03HT178 Subject: [FFmpeg-devel] [PATCH v5 2/3] avformat/westwoodaudenc: Adds muxer for Westwood AUD format. 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: Wc5SQTJb/m8B Format is still used by modders of these old games. Signed-off-by: Aidan Richmond --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/westwood_audenc.c | 141 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 libavformat/westwood_audenc.c diff --git a/libavformat/Makefile b/libavformat/Makefile index bc1ddfa81c..85b5d8e7eb 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -581,6 +581,7 @@ OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o +OBJS-$(CONFIG_WSAUD_MUXER) += westwood_audenc.o OBJS-$(CONFIG_WSD_DEMUXER) += wsddec.o rawdec.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fa093c7ac2..fe70a1e9a2 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -478,6 +478,7 @@ extern AVOutputFormat ff_webp_muxer; extern AVInputFormat ff_webvtt_demuxer; extern AVOutputFormat ff_webvtt_muxer; extern AVInputFormat ff_wsaud_demuxer; +extern AVOutputFormat ff_wsaud_muxer; extern AVInputFormat ff_wsd_demuxer; extern AVInputFormat ff_wsvqa_demuxer; extern AVInputFormat ff_wtv_demuxer; diff --git a/libavformat/westwood_audenc.c b/libavformat/westwood_audenc.c new file mode 100644 index 0000000000..b95a3a5d72 --- /dev/null +++ b/libavformat/westwood_audenc.c @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2021 Aidan Richmond + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Westwood Studios AUD file muxer + * by Aidan Richmond (aidan.is@hotmail.co.uk) + * + * This muxer supports IMA ADPCM packed in westwoods format. + * + * @see http://xhp.xwis.net/documents/aud3.txt + */ + +#include "libavutil/avassert.h" + +#include "avformat.h" +#include "avio_internal.h" +#include "internal.h" +#include + +#define AUD_CHUNK_SIGNATURE 0x0000DEAF + +typedef struct AUDMuxContext { + int uncomp_size; + int size; +} AUDMuxContext; + +static int wsaud_write_init(AVFormatContext *ctx) +{ + AVStream *st = ctx->streams[0]; + AVIOContext *pb = ctx->pb; + + /* Stream must be seekable to correctly write the file. */ + if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) { + av_log(ctx->streams[0], AV_LOG_ERROR, "Cannot write Westwood aud to" + " none seekable stream.\n"); + return AVERROR(EINVAL); + } + + if (st->codecpar->codec_id != AV_CODEC_ID_ADPCM_IMA_WS) { + av_log(st, AV_LOG_ERROR, "%s codec not supported for Westwood AUD.\n", + avcodec_get_name(st->codecpar->codec_id)); + return AVERROR(EINVAL); + } + + if (ctx->nb_streams != 1) { + av_log(st, AV_LOG_ERROR, "AUD files have exactly one stream\n"); + return AVERROR(EINVAL); + } + + return 0; +} + +static int wsaud_write_header(AVFormatContext *ctx) +{ + AVStream *st = ctx->streams[0]; + AVIOContext *pb = ctx->pb; + AUDMuxContext *a = ctx->priv_data; + int ret; + unsigned char flags = 0; + + a->uncomp_size = 0; + a->size = 0; + + /* Flag if we have stereo data. */ + if (st->codecpar->channels == 2) + flags |= 1; + + /* This flags that the file contains 16 bit samples rather than 8 bit + since the encoder only encodes 16 bit samples this should be set. */ + if (av_get_bits_per_sample(st->codecpar->codec_id) == 4) + flags |= 2; + + avio_wl16(pb, st->codecpar->sample_rate); + /* We don't know the file size yet, so just zero 8 bytes */ + ffio_fill(pb, 0, 8); + avio_w8(pb, flags); + /* 99 indicates the ADPCM format. Other formats not supported. */ + avio_w8(pb, 99); + + return 0; +} + +static int wsaud_write_packet(AVFormatContext *ctx, AVPacket *pkt) +{ + AVIOContext *pb = ctx->pb; + AUDMuxContext *a = ctx->priv_data; + + av_assert1(pkt->size < UINT16_MAX && (pkt->size * 4) < UINT16_MAX); + /* Assumes ADPCM since this muxer doesn't support SND1 or PCM format. */ + avio_wl16(pb, pkt->size); + avio_wl16(pb, pkt->size * 4); + avio_wl32(pb, AUD_CHUNK_SIGNATURE); + avio_write(pb, pkt->data, pkt->size); + a->size += pkt->size + 8; + a->uncomp_size += pkt->size * 4; + + return 0; +} + +static int wsaud_write_trailer(AVFormatContext *ctx) +{ + AVIOContext *pb = ctx->pb; + AUDMuxContext *a = ctx->priv_data; + + avio_seek(pb, 2, SEEK_SET); + avio_wl32(pb, a->size); + avio_wl32(pb, a->uncomp_size); + + return 0; +} + +AVOutputFormat ff_wsaud_muxer = { + .name = "wsaud", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio"), + .extensions = "aud", + .priv_data_size = sizeof(AUDMuxContext), + .audio_codec = AV_CODEC_ID_ADPCM_IMA_WS, + .video_codec = AV_CODEC_ID_NONE, + .init = wsaud_write_init, + .write_header = wsaud_write_header, + .write_packet = wsaud_write_packet, + .write_trailer = wsaud_write_trailer, +}; 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; }