From patchwork Sat Apr 24 22:42:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27331 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2685543iob; Sat, 24 Apr 2021 15:43:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIVs6gpWYCz4kRjACZhba5YAFw01jXAo3VZsA7gQ/UrG0knYClXQvgyUVAa6G0yBPazORG X-Received: by 2002:a05:6402:2d1:: with SMTP id b17mr12048939edx.144.1619304181691; Sat, 24 Apr 2021 15:43:01 -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 lt9si2138853ejb.678.2021.04.24.15.43.00; Sat, 24 Apr 2021 15:43:01 -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 63CA6680C2B; Sun, 25 Apr 2021 01:42:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2107.outbound.protection.outlook.com [40.92.89.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF632680561 for ; Sun, 25 Apr 2021 01:42:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wq7V4roB2u8uQLc0fPL6hW8+fcJq1NLR+Qph3SAEQNSl9ZyaWe8UdSi+E0yj9t/kruvCSgchyK3FPvB62rs2V1VdrFeRIHRci0U+sFGrJicTbHR8fhCo3rqJMPWtvMDh5UPYkevkkRxZnxQf99bSDMTiVM8WkHCbpPI8mu+coAWe5wLHGnEiDFDHKBZVBuxkUXkQjabi8FA7sBJJiah+YYcHYZWBzFeP4Rgqvv1De+rh+YpP99fc7JaE9zxgrDhJME7/jrgXS19t9YuiwMPgK2Quqqz0q/sd7YPGuC2opKQlV8fk24s/kRMmKgIu+HmwlU1ajRO5aSWphV4PAHImYQ== 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=0MyOIAdOxlqCnDceHx4TBZxdYyGnvy/QlF5NA9GwnWM=; b=YROW3E1a7gDDjjvQ7WlMn02gXGZ5ar5Zk8IHbSAfwFfKpBGKfkDNMwflQ8pjhFpwvd0qFOjO3tBE7SRmM3tWaMDy4Pc4cwR4axRlJkWKZyYo1MUpi8Pqw1M9Z9J3KYL2EQ437Ajnsml4Rt3WKSVdelmEiTK4fla/rIbZy+4EAJK4+vFhLeKwF3Z6MxDFDTmx6+V+GH/4KN1ku29O50RPkEFPaYzUWWfwvQEj0IW/yAntaW2X/zZ6ex1d2VTCaR3fWkT+M3JQp+NQnpswqIx+g7kJGA4YtGyuZ2FMpla83wsB9hYKR3jg0SoGUmK3cwp2eue0JDYYL+xLanssnMh28w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DB8EUR05FT018.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4f) by DB8EUR05HT248.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::227) 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 22:42:47 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05FT018.mail.protection.outlook.com (2a01:111:e400:fc0f::63) 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 22:42:47 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3F4A906EE1E642613949B8429A2AA0C26757C4D9DC781198E2B46DE64A226F48; UpperCasedChecksum:4AFFA4CABA45573672A8B026D3B741D3FBA4B0D482EDCD233CB0C827BCB94272; SizeAsReceived:7288; 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.025; Sat, 24 Apr 2021 22:42:47 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 23:42:28 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 X-TMN: [uvja17YNk2Yr9vBxLXJiy8OAJcOPp4xF] X-ClientProxiedBy: LO2P265CA0312.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::36) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424224230.10148-1-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P265CA0312.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::36) 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 22:42:47 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f91398c8-fc87-4c8c-9b6b-08d907724878 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuQ75gPcT42JL4CyEb3w00p+yWxFfZf3OOVnBVt4mmBF928eLWY2g+oasT/SyUzNXZvI2bVPF88dibYuccaQr9EhmNS4MtP6Pq8gkCEi7lNrOEz0poNlO3PDSgH1GvgjSPNsSlT0dpG62ouPUYm3zA2GuKxj0txugvfpwiBqbf6cqry6BizwwYEPn1nHTsqunnB36PIyeV6PR4ATBkwcj0ZukjD5TWRZ9EwHmg5+coRUKXcnQTikwZTJY/xk+SlKPJG+aHW6VCnNWWmmGvzM4RTtPHAR8r0KxmU+v7ZV+F7Lx8rhQF+UtEofM1LML2CLkhFzwNFQHy8B3GMC0Bz3URVzxsws80+mCOqgI7uUDHDCx7I/UQzTeSHCtUDv5XXkPAnxltqE7aqmOQ8FxpGutUcWdaAcPOYrypAfEcUBxvhfyzmXR1XwKuQTPetTRGVpQJf1If/l4P+UbhqwjPaBMwUWf/NqY7vwsiRny69v5gB69S9l0HzRJFBhaDrlYbR3MAiUCHhCBav0Sivx8FOk4TD6TeS0GY2vGJrUZDuvD8ZL7ykwIqfHElKEejkEvxSGsd8JKCn0QmdzGWeJGagjlvMB5ycl9f7RN//l2nyF3gLNsJsPWfJRqYS6Q5/JVMOzpSfL6FPlbqnUyrWDlntNpLm0vJULKILTTjRVtNn1nhwwdyN/s6S+gwsaOlEVKbfTEoqRsUfjH+oXT/9flF0gasT1K/hnKmxTwIrnyoV5doJL/VzAo//t2rExI6rESeEgHFH8q4XMfNKuYUuPyvyJ8OB X-MS-TrafficTypeDiagnostic: DB8EUR05HT248: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6GywHIgrygbyXvlHrhWT/8snfbBMLNkT7xj6Bkvg/Dmv0hORn6/jvROjF3EcsnOHqM1knE5UXUWeo9Oe2p21sFhOrvjkIOS692eMloKLrpf/bpyzdF8dcvATYRQQa1P+3UZk0WurQePPdnK1s28U2zrJ4qyMrDIfbRUgiazVkEL+EZm05/8xeQRIVBWtJXIh5ZSRdmac6UQArI1Vqy/1gVY1hQu16ZZYA+SKO3fUJ9xJqoaX2FmSaxsKKgxgkkvdbCGYECF4caKCjBSjZszNZbwSGZFd8POrXu3CyCU9lkcyfx4autZQOgUnf7sdqug8axAlsgkMxMz2vg7TrJlPHI9thodwXKLnhqgwqw8UKBFkQxizgyi/Srm1lHI1+nDIjwcxsQA7bfk7pbuipf5Fbw== X-MS-Exchange-AntiSpam-MessageData: g1Flx9pILK6C77CyDlbrFjuxMUth6sP0tjGnzzA+EvTC5/wkKSgHpWn9vYAfJL+rTbTgCplWF3kmRUnp34Gq153iYxNj/zBzhXrpAg4TaAZAC/X1OcBYQame5PwQCJBSu9W29K81OvM8j/Sg7Czz/Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f91398c8-fc87-4c8c-9b6b-08d907724878 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 22:42:47.4937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT018.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: DB8EUR05HT248 Subject: [FFmpeg-devel] [PATCH v4 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: elOd2wA70reg Signed-off-by: Aidan Richmond --- Apologies, I messed up a variable name in westwood_audenc.c in the v3 version of this patch series. 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 Sat Apr 24 22:42:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27330 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2685635iob; Sat, 24 Apr 2021 15:43:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznh+cjWDMFQsFQRhx4uvNGQjvqyd+xENc3yNR+DxHtOJLBRhby4d4Xc/YUGWgRQc/T5vyu X-Received: by 2002:a17:906:90d4:: with SMTP id v20mr10967972ejw.275.1619304190515; Sat, 24 Apr 2021 15:43:10 -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 hc43si10948700ejc.21.2021.04.24.15.43.10; Sat, 24 Apr 2021 15:43:10 -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 B6E49680C85; Sun, 25 Apr 2021 01:42:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2097.outbound.protection.outlook.com [40.92.89.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2E87680561 for ; Sun, 25 Apr 2021 01:42:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZRN86KTf75fJJM47ESiyVMBjXN9l86BFryxIdcdkiWn8pmLYS041IHvljJO8eZHFHWkHPJrHDff9IcGeraaXKP5K9MJreMZAbQOxXEYsVbJW9S6H6nClIY45msE5H+0l/mnKYNurN1O4dkIi2cQxyYfIn94Qkyto4umrlNpd/DkyYIhZ3Y09upq+DLg1PG3mweDeRcI1QDfVV5wxeU8Hkkby7vwbo0xPwIEz7Su8Ghb8DXtrqt3IbCq7IBpt+HQegP9WzX+PN6GHBK8LPxURO3pOPtWX5QhnB0otDdEADqn6zHUPmRHVW341mSj35wCmaIPeDuganQHTMwoAMe83XQ== 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=9NH4PvSQau74ID8HBcgJNl+k0TZVZaWLGd/lRbYlKFY=; b=n6emaVHX71SX+yJIUYBkHk+P2qur1Ory7pGey175Uaf/VQdB/00apmFrxamXoACpFMblm0tak9cGt9HH8+ovikiVpqnAgBh5wSx0huDDJzsKYTNvs8uDuhiMSsu/gKPkWQ+WnlrirkznfvPlEhigSZOnzWv5dbcz/fha/mpmH+3cc4qBCgx/8ZjcoA9IXWAuFN2Nmf6tsxFy/N9uwnka6Z/05VuIOrXx008SWKwBlSPoqnrAiHZlFxGUupiKjqpTN2J/aWIPVM/2bI6PhCDS01V4f7OaTiWDThlFV995dsvZtTe2g81hrg3oMHBTLjQk8gzd1V+KweVAeBJgH5utHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DB8EUR05FT018.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4d) by DB8EUR05HT045.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::422) 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 22:42:50 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05FT018.mail.protection.outlook.com (2a01:111:e400:fc0f::63) 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 22:42:50 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8E3D5F71761F6A43266BEFEE158BF86E535E006F19DE371BA048D427E853B4C8; UpperCasedChecksum:A61099C7E1A3FDB1D156AAA0E55BE287BA405104912ABBCC2F9E99148C9F3E23; SizeAsReceived:7413; 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 22:42:50 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 23:42:29 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20210424224230.10148-1-aidan.is@hotmail.co.uk> References: <20210424224230.10148-1-aidan.is@hotmail.co.uk> X-TMN: [nALrighaJHgGEh/yeMjtD236uY7SHdAE] X-ClientProxiedBy: LO2P265CA0312.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::36) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424224230.10148-2-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P265CA0312.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::36) 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 22:42:50 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 05eaa347-cdf9-4c88-4cd6-08d907724a27 X-MS-Exchange-SLBlob-MailProps: pt8ZUcDWjMXYtuTamvlHMP9Mjv7DCcg7qDz32xVTyJm7srUA9qT122RWAfA9B9GoWBX7RIkZ8U+NRrdbDgpS3//UUM8qgexBBCAl7uZoLD7B28a+EuvyVGaPPX3eaobazq0jJQEnduRNZWwzYpau+/RVmKBhZJ6JouZDfASUxIWc1pKX79tTQ3o0eGTIKXq9zQ98sMnv3JFKMb08qzh+pjSz7HEPN3xYF95/d8ak6Au45oXPiG/V+MDmYitCpP5MbbLz/bwbnIK282RcQ48+G8WiYMey1AhcusMBFiXI1LmptpkkSZjWOUYXMCeEDRUIdgB7VL4p2t/ZdE3LJG/Q8bDjn4B9T++imNEYlk5MiwCrFWQoF7r+p7EnoVDWq16D4F3S7NQgJsILHhx3bXS716uEhyPArURJN8Y6phfVwyi+UdJ+ttUWSClJEITbM0c1I7Nev0ht2bkKWUp+44q9hRq6G3ZWANC8EaD/vetMSeLbKyjSUZFHTY1iA0gd08qDukZZIQLmQS6Zh3EiIro6ANQEqHwjREV7HON7iXZ+hGBJBlcmMvMIZV4BFoOf09lAydwTgrLj0Y71i/Kakb+WfrnZW9eBxwpt3M06/2EF/XuS4tlkeozlc/y/kmG2Z+bO+fyq6/KlLIK+S1gkOJghg+sCA2TGmEJ8W2vmcCFOpDVM9kdCfARJ4mF+dr6HcaGDdH+yu5+zKdy7+LxGave1MWnhS1nxe0AQcVPYgJE2pExwjG59ROnEhB9zCBfj2Xtqcgmjiq05pnoe6OJTf8IqZeoSaPpCxGV/bBtts9KbLKg5T/cbsi5R+d2tT9few5hvvA55Vu6peaeI4gVvycZ0BFUWd25Xj6qtTA6hkTwt8Sq2Tuv67h4+m6gXtZPLfTUi4xUvE/QH1e4TUeHQshc/XYJZDRsSYqF6B6zBdDLHUlVcnH07stSLv+6+g6UpnoQ8 X-MS-TrafficTypeDiagnostic: DB8EUR05HT045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0YDQak34uGR4drTBlFnN+u9odMFNNhTbnU3mohmcw35S08ia2xPmtjfLZfwiRsIqvFAud5qNyOBa53lzlbwcau8aVUnTyA5n51ApkhBJSko3G5w162Fv8bZT2Fd+mlPiRSyMppcr1CPxesKvIboTJtIJdMBp+e8uKHcxFHSFz4tpofu/BpyH/LkDe+LgMWO+WI+shFux2PmKYIeY/DQOMeQPdqH0Cei4xyjYwRuYtYtcS41oLwiy72jjugDcTJjeJoHOPBiEX6SEbuwkjgakTK54LgwAaUuKnGp1E3aiv3shQ2nbVqjkOXAdkezss1FJxZZ0vsSTDWFr+gcmfs5B3uv9SfU1fQf14O60CH8zEPNa9rBrEtcVuZ2syt7O5IUYGnWizsogIjVkMpjJRflUQChkI+yEF2l/wIwwJvOp46A= X-MS-Exchange-AntiSpam-MessageData: VphVbkWvUa6yDYtNAliEwRmydADT2xdjduZX/fH08314+FJZ7gKJP93tDQr8RbZgbBM3rsl32TV8EUESr7+F+3vnOZ4xI++TX7kYCbTQJinQ5FQxhtwZwDWoC5gI7czPvrOLZauWdQv5karX1DUz6w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05eaa347-cdf9-4c88-4cd6-08d907724a27 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 22:42:50.3193 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT018.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: DB8EUR05HT045 Subject: [FFmpeg-devel] [PATCH v4 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: N08WzTs9dVoD 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 | 145 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 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..45875f7873 --- /dev/null +++ b/libavformat/westwood_audenc.c @@ -0,0 +1,145 @@ +/* + * 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_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; + + ret = wsaud_init(ctx); + + if (ret) + return ret; + + 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, + .write_header = wsaud_write_header, + .write_packet = wsaud_write_packet, + .write_trailer = wsaud_write_trailer, +}; From patchwork Sat Apr 24 22:42:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2685702iob; Sat, 24 Apr 2021 15:43:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIZg744eOuMSOCs93OU+Hln3B/tAfyqWhh7D4QL3TW09U9jPtjxhRVkqEc5GbpXKLaDdMp X-Received: by 2002:aa7:c245:: with SMTP id y5mr12283630edo.154.1619304199015; Sat, 24 Apr 2021 15:43:19 -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 va2si1975329ejb.668.2021.04.24.15.43.18; Sat, 24 Apr 2021 15:43:19 -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 DBFE9680CDF; Sun, 25 Apr 2021 01:43:01 +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-vi1eur05olkn2021.outbound.protection.outlook.com [40.92.90.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E140C680C80 for ; Sun, 25 Apr 2021 01:42:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TdKfNu02hDmko2LLkw5ueVO7WxQC6G5ZhsVMObj4fpeMbkbfILp5dF8gYvIKYN4dUCPLTe+3waYa1NEntusT9cD5XoXhE7T17Hx9Jtt36SNT7flIyetyG1q8kndipfIHhh49v/tHaShyAkK5eEVQFAlwCnHsfXa8S73MJYNOby5IEagwkItA8Qp2Gog6kKLNijrZRREM3AdwhoeGHbWWMWksGSfub9IVk8oYoomKRgPVn+sEWLvncaget77k1zAD+04jrU3XjUWNFWZxqGOkqulMyQob1sKEzSqy58mp4ZgU3w+YEj6QiWfzDrE/t3wcdPOqn5DKGmGf/HXjwMjJMg== 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=Nh9tCtNFeAXT6bi7Q4THXXCfeQZe5Se7o0eeGqX/wMuS6WxqrtOaRL2WjTb1lF/AzH1OcFjR85H9+xf2PxzywobN6nXk9fZU8YItV8MK2Q7rEG/X+iExpuUQPr2lBF6FIuspy0LdmPJjgiRtYf9WDbjYanw3eOXN5McOhDCareBdGoHHd9qtFghdcZ8UWf4m+8GFKg3vp7StpBOEIkHFcXfJWRtavi/iJdkxOytH6RWZsoZEFbrqeq3IekpBbSfLttuXCnGAz/yZuiBbOzoZFNeWt9dagYC8g/qz5GfzdKHBvvWCpKLLp7M7mOszxkS2qWb76lR6uvLLk6Lz2h6mzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DB8EUR05FT018.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::41) by DB8EUR05HT063.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::231) 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 22:42:51 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05FT018.mail.protection.outlook.com (2a01:111:e400:fc0f::63) 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 22:42:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B51207CB5F489A9F81807CE8953D865F436E16D4FD32D262F5305202ECBA152B; UpperCasedChecksum:95AD2A4B2033FC098D176AEF8F9B538196E355ADC7EE65BCE2F47A6B1A74C552; SizeAsReceived:7409; 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 22:42:51 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 23:42:30 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20210424224230.10148-1-aidan.is@hotmail.co.uk> References: <20210424224230.10148-1-aidan.is@hotmail.co.uk> X-TMN: [wvveTgxKnQ0p8Db2JoCbOfpaIXm5P+3d] X-ClientProxiedBy: LO2P265CA0312.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::36) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424224230.10148-3-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P265CA0312.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::36) 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 22:42:51 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9284587f-06dd-450d-1ae2-08d907724b11 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuQ75gPcT42JL4CyEb3w00pb2jWdZ2RaiFbcTFOXVH5wo1d97QkD9SF4iGi4l1YuI5mU4E8wD2fxXSJGgfhKalTy48OSkSQvdd/dOBKsJLW1+qr9iqVXvaPSEpcIJyzgENzeRpKgIjvGTdf8p5t+zizBcLnWMP6+OPd+msNnBYGDaqryAfFiztr0cNJxNxR3gwzN6/IgC+1dOfy3vnrd1j42XKOGfVSQxhATcFqwZJsYJv2hGw0MLKylnpv+4VMHqJmio+ntClYwnOZvCg8uy5FU6yx72b1Lh0nvNn5qYRcbHqxoSIkreOeZZKI4VCclN8bNQ7witiCILxgHTVQ9LWdMuBt7aipo3Tvc8l6sxrA2GEtbK5oJPIjwGk5uyjsq/9pPEzWqPS0He7ACHAeFFOwLkgnYB2gAd5u03QNWAvTJE9BLjrfID5mHXH0TWvtUN25RAFNt5cfm5LMQwbsEYiwsX7bqFsL9ZrKK0ZayOpP7aGLmkpuejVkUGI5kiOyE4R2UTiq9UhuSB9Mv/eIrcC1WeujEAqOd3uUECRXYb1eK1v8hwlZ6CX4NHhJqNxD7D6SQ8AKN5+kWtsIBxZfvDsknyZAcJKruFz72gFHcCAVLkKv5I03DHu2XLtjkVpTn1Kk3bDbK8TeB/KWYsJiddEVJK6JcPLMmsntMOXnANGh19Udir/RMSvPK9h5lJR3auzrBwVAn6FXYSt6o1xMdeCbtBfRX2LTsem9dPF+fQgYo4INqYqlOdz6vrDJ/YhjSCSbZaKwDN0FFXevBHVjO7jh X-MS-TrafficTypeDiagnostic: DB8EUR05HT063: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hcw7JQ/fFRGKaSWCs3JYxQ8PJpReYCeDrL4X9gyJIWjr2GN/UKZuYlqEorXoxk24OEW70Ugwrr5/T9R3DNPm2mHsmKfNE5nAOJvj6h0swgsLncQKwb2kElr0WaBmtm3lPfCY1kzOLH/H96j7dPGvQ30wUbj6BZhkejHVoTYbouQTNvpxn9Bvwog2XkKpc3NuWB140gARAfoLrpBScaiXPBa4MFQWqsfR5+lZQS9fYdIdbvHXLR/dtRGG9KCGkWndro/livfH4Tzsz7TNmAOXNvhLdvCFMZQI22sOmpIDsCmLu6CHOM9a38b2NS9QLH6HqOuqN0YD8puvaD4Qd5ztMifN245vZXRkG6TZss5pJ///1WSHviyKqdifwYaXm8/4E/UITw2IYr58SZpIW/5fSg== X-MS-Exchange-AntiSpam-MessageData: zGY8IViXN4SyJEBPLgv20TOZWdTox0kiN5bCLZWzfwWNnyoDVVaoh9e+B5m7fUj/VD6jFzJZnS3+/GwXsK/VKnE1eJpCtP9344SNlXTPTlyzIExVBoX9vc2HOhJB3WBows8yFhcVb9VC5JzlwY7EzA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9284587f-06dd-450d-1ae2-08d907724b11 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 22:42:51.8605 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT018.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: DB8EUR05HT063 Subject: [FFmpeg-devel] [PATCH v4 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: 9/KPaG+ZF0YB 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; }