From patchwork Fri Apr 23 08:51:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1336724iob; Fri, 23 Apr 2021 01:51:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/kWuI2qKobdVfqmbNuqLIKkH7f73y8MkLgRNE48tXpWpPiVIxnG7ueItOir12rl68D5Ys X-Received: by 2002:a17:907:628a:: with SMTP id nd10mr3097718ejc.326.1619167899989; Fri, 23 Apr 2021 01:51:39 -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 t20si4698591ejr.751.2021.04.23.01.51.39; Fri, 23 Apr 2021 01:51:39 -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 792B56805B8; Fri, 23 Apr 2021 11:51:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2061.outbound.protection.outlook.com [40.92.16.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD69E6805B8 for ; Fri, 23 Apr 2021 11:51:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AtuqETxVbXHWjvM6OLa9c9iD1/VhXcNGAKdeYhkBcFNXu4Ru1swHvy1qLiLL3e0ewNpqalfOWLaE8tkSUf/ogYe7wQdzov042KgRF7/R7YglyoGMIar4dubGhuM4jxsMGjoef04e/UCMUMx0/dCFBnuVbuZ9a9trz0bCOuevFudgy3kOHgucNkEu/hvLY0ZwTCvl+qlyfr5TBgDI8ugP1E3iaKH1duh1QZGi7isBG5S8GW3MwWiKgLuwljcuEk+kj/bkA1Q0hV3fxisjlU3Tm+HymM/Ws61uyTDcIrMPHOKSE6sznd7oQQoiNIUuseZ8ZJ30ND16V+D8qnWFQSvNeg== 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=Tds70LJHc3sIC/51fT0bEpFDA+7yTAY7erm/XRCALOA=; b=AbdykpSbQah9TNtYfN3f0ebqZnqOpZTvYpJ0iZOs+HHtEGwJ42wjw5bLr767kusDvulhR0zuYLSYRzSjNkGPsRnNDJtjd2YBoy91jfLyM0lEYAeO63GU7/rCBbQP2XpiDdAYai9ZYZgt8EA1cpa1Wd/AyOm6y4Y2iY755sv/vVc/iSSvrEDfeNszHxN6JNVzYHH5d5Lcn8zKuk6YB4c6nkJD288XTaBFKE9s1m1mKy5MmtAxKST/1LDSkd9jgIfS569EzVkMR3najPewTIpATiYjWOxffjDkq/kqcjrJK3TIivIrGD1lZ+SA0saxHM8zyx7vU2ih64A0hBA5VNwtog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DB8EUR06FT027.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::40) by DB8EUR06HT167.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 23 Apr 2021 08:51:27 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc35::48) by DB8EUR06FT027.mail.protection.outlook.com (2a01:111:e400:fc35::305) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Fri, 23 Apr 2021 08:51:27 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:AF056DD6E050821EB125A3E4735F08CD4288949ACC152D9A3399AFD34481B825; UpperCasedChecksum:FCA798EA0C019BBE715DCFCA067F8BBF652EC7947314898E3F1BD48074703234; SizeAsReceived:7259; 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.021; Fri, 23 Apr 2021 08:51:27 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Apr 2021 09:51:07 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 X-TMN: [x22z6xq9y1D5ms9uv+zCUuoOUmG6QaSE] X-ClientProxiedBy: LO2P265CA0354.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:d::30) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210423085108.14528-1-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P265CA0354.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4042.21 via Frontend Transport; Fri, 23 Apr 2021 08:51:26 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e4af8731-7044-4972-710e-08d90634fae6 X-MS-Exchange-SLBlob-MailProps: QMhK0M23Qm6SCC25vryuYOapc1ndJ7s0GSyT/TpqeNXSBTc675rijYHATvbA5gwhcXniateTcNPPW4V9UuqhiFLmjVkjWkYnKx5d3G4FkDNB+lC7SwxqkIZ7nHc6w+TlRqvBtGhrts1+z2wy8Hpz1DN8GmwI4G/CJSiZeardLm9m+EUokRRJoWKF3qRFbCJNrQoKM1jqKGFmTeKkDVREwlGVkIfVCzUpd2CBgCLrudf3pOuHd/n368vPXgKvJgGGdX00Q9IAFOEkIj9L6MC2oDfVrUfX+WGhTseZ5tP0XpqGkBQDLaYLKGwxBR0lSuLFDIo2VbgrZD1uDt+64CDhvVImr7uTpCXJso66QAXF2U2C0//rnb9llyEaJ+ewmZsfN3WNkz9xzMHkOW2GwJaKiO6W0LOWsRrMcjPk7vwGIgneJLBTY9RG9hxflwEh8Nq42d5jWxo/7C/Cm5HsX7WsF67TUbiFqoSEZVUSl+NEjxAT2jayaj4H8D1Dupj2p9vYCqU2YpJD190QlSp6gk8lGFsJbRiiVqthdmP3+kz38VUTKmYjKD4Ux8S5gnDLfber8aKxHuq9yGypw29gNQ+SeOo86l32iYOtBKEdsE4D+eplPg+4e48SuazWxQTPrObTNciT2VTOuzashYz5z1esua0v5GHM5bsV9gwDH5b74I6fOPQmlIKje14QlyEVTSgj1xVrX7j+yQsgpBacI7WVmkBHcBpjsr29jO7FS1AH/OotNITYMySNM6CyA+KUqblCzmA0CQ0GU/D59/kvEFefMMz7Kt8M4KhW X-MS-TrafficTypeDiagnostic: DB8EUR06HT167: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lFzcQ7/sqIlE0zHOoN8nHeMqA5pG/psEMG00kUaoXw2v+qGP7FG66O59xrCF/mpTXt5g83WxkohfUpHKe2JqhU/XJ/kVniBTlOM0e5HaqnGySyuYS8VufyHBsMyD3NTW4PWoHuokUGGpOhfTZxaiN/tU199GqI0MuTq8zftG7HhCIC7NkPJ/vrpMeE0JJbit9nx/JAxHtsRm4t5tmZottwrRMOizTFgatuqYswV2jZSVvAv7G3Q0P/UXsIZxVxz4KPnGmo/EDoP4eSmtX5cXJh+b/9AZPCR0xkiaSaEpoud0tIb6xwfz7yFb3SISUjA8rfL2ZizR+eL4SJ6Dy0D/d76IMMFMGyFQWVnsP2KV9SlpFdHcjCRkDsImtmPCB2bA4spASFvB6z6XgaQ2fLEBqw== X-MS-Exchange-AntiSpam-MessageData: M361BukEEYDm7lxcOov8KB8zu0QcEcHgTHQn1aa2vnp14gJy9UHDXRaIpXl69vOHUTrr3Ll13Q8/zFH6TMdCK+/Ezhq0Rf4ZWv7unb1+rOm+pyECiBsoTGCd/GP95aRnkAoPdCCaKH5tPGj4+Ju1OA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4af8731-7044-4972-710e-08d90634fae6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2021 08:51:27.0533 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT027.eop-eur06.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: DB8EUR06HT167 Subject: [FFmpeg-devel] [PATCH 1/2] 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: kxP9LJrgT/ht --- 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 Fri Apr 23 08:51:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1336884iob; Fri, 23 Apr 2021 01:51:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCcoaLLIoyOddl4QR2wNxpjtAwCxKa/5Jd9zIjQWu6YR3Zlo+Hr9o9og0l5U28TVf7+lpk X-Received: by 2002:a17:906:a44b:: with SMTP id cb11mr3193429ejb.518.1619167916691; Fri, 23 Apr 2021 01:51:56 -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 l14si4682335ejr.311.2021.04.23.01.51.56; Fri, 23 Apr 2021 01:51:56 -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 C1D1A689C2B; Fri, 23 Apr 2021 11:51:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2058.outbound.protection.outlook.com [40.92.16.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27E9F689AA6 for ; Fri, 23 Apr 2021 11:51:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YHCSa72Z/7yAz6xDSM9j4AemuB5fpJB+Ajp/My002uaFxlUnOTFOafLFfqXe7VL8aC8w+A1dqPwFwn7yB86OfO7BDj3B6CKtfft1sKsboWUrL1FS4mrpJh5d8iQLn7FqhCCRYlqMZcnx+kmNU5o/8JJefAB/KMwY6S1QB6ZCxCD6FS+QRfb2RQFKOiitWfdoTquDPvQLWvvb35Tm25S4FT/fyUO3gilxqvafUo30YVHvQZYMrfddAEucu56G7Vqbqvgz7GrCPBrZFuLW8aMAjKPJgz4of1jVXgP/BcCBbUhEvYoOY0aE6BsDL3g1K/iSt/3Wcj5UWRi8VjSGrZ7r9A== 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=ftvsBMD3ENMgGuIHqjvg9WmXJlr6k8cqYq6MzLJTir0=; b=hUBllLlR/LzWR/U9Z7YoK2b1jxgmvLB7T7O+QVNCTBMWELQ90/oj8dD6ZivuyLvN15W41Y006HCRvuLhq7KycHeHTFddOVCmLnZkWMiGW51T96hKZM0C6eypxXjbfG/+y/sLVLQDVbVDc/hb1anKEM+zvvFjFTb2XvDFza/xH/6hI84jjPC8BuSU2eGjMemoCyLVtAg7OYRE8GtMxlJTmGJsIqGhRHlv1kdpB0VU1m1LG1zPiYFK0bx9jkAwKjBAESfEegnZEIJBnDlWKLcM6le9dwVSNArJjpHuV0xzvegYmvy/1IxxD9nQ7YQ00R8/xZXa838N0NYDG2+aHS+WUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DB8EUR06FT027.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06HT052.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::386) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 23 Apr 2021 08:51:46 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc35::48) by DB8EUR06FT027.mail.protection.outlook.com (2a01:111:e400:fc35::305) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Fri, 23 Apr 2021 08:51:46 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:40011A9CC435EDC255B1715DEE792F503F8A7BF49A7C999749380E44327F21B6; UpperCasedChecksum:862F290F752D87C052506278E76B287844951BEE6B66C4167F8F1E455863F617; SizeAsReceived:7392; 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.021; Fri, 23 Apr 2021 08:51:46 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Apr 2021 09:51:08 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20210423085108.14528-1-aidan.is@hotmail.co.uk> References: <20210423085108.14528-1-aidan.is@hotmail.co.uk> X-TMN: [aZqjin2Jz3q+toGhEOD51BcDMmWYrRty] X-ClientProxiedBy: LO2P265CA0354.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:d::30) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210423085108.14528-2-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P265CA0354.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4042.21 via Frontend Transport; Fri, 23 Apr 2021 08:51:45 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: a80f0c05-ee6d-495f-9a36-08d906350652 X-MS-Exchange-SLBlob-MailProps: ZJ4yP2VsLUOaXSV7znmNtuZ+gW1u4u91Y6clEDCCaDVzEVugt845mzCPXTPdJU5AwSGtm4F3+909dwjWBeeYU16FyzV+uvMy8ZmHHOYeY9U3ozz+pIbCviVZcNSSqc1nq+F8CNkkPoBRMLN2EMqx1NHjn+RGaklXrtRWRYxdNrAve19hVXGh8dc0FVSo+KY5/3mcp+vVdHFPoovGOZPe33wHDYFwPbMX9cL5OtdGuZr78w8hACXqKLWdMM3aSemBUOnoG3lGoYaRshVhUXDU4FRQBOLi95+0QzZrPDgOKUpmTtV2/y7IlFFjCbXLudwFY/QT7aPNOoeerbM76vwJd0qjqtJJdjMaGF8lOL58WhrTPSipEzuHwjyGFW6E55WhacfN/XOYjX73MmP/9HSKP9JgrV5jmUeCSGY+MnukU1lKDG9worp5/2ArgN3OBRQyKA9zWSOEmlM4GLwLawZMWE6zHLbTsTIzbVBGbJojhP6eCgbhgLh/KKPUYwXV8SnFYiJH6E7tVjwTYmIV98EDugOY/2M94v0ksOwV0ZyTAYBz00bbo7VhBeB4pRzOFw831DRK9c7qJ6LlWfotj8bwXPMfb41Ke4iAmVdsPhzsfqDLYVZlN17/1ibTlqcOCy9/sikCFf8fjD3Z2H1wRg0xXQ6L7Aw/v7MDQTSoUbJvqO/yxVnsVqYvP01h3hy67hOM2Up+RbrRQqLf1NdPqO95qsjYKtNIwliJx7oYG4Qt10srWBahyMBj7srQt5AcxttE7Tr+i9UVCt6eXGdMa0XMQxygCcuuFbyU6mrAjAj8Ubpxpu8d8gay9oqyp3XmTcnpl2C4heBc0KusQY00URs+ask0klxu9v46ge68p6TPseatCBTKzjcOm5Fr7DW6WT5L8pGfuLDSW1VPEIww4DLTHVqhKplXo+6nGJfBHdQPEWPwdxSOA/dOdgRY8tzpPOBd X-MS-TrafficTypeDiagnostic: DB8EUR06HT052: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZdPR6ClmsqUHSdx2Fw5npnzWD8fY8kD2uEW/U4htn3TEwMgJGUzHIdZJwW9+KIfo3luXC+cmapDfnKRz1V84lqJ4U97URJ6+kn5ljvDlYBaxKTOAMhYSxr1tfMHVTKgAcGKw4ezLXLmY6ViMfxoY6g8zyzPQAYaAttFc0hz0nYT8AK+zk1XTnM90ObSqEdO0SPeNdmN+nZcmXH8qO4BQAvx3SmCt5s2QGopqIw7Ht44gPSg1f/y0PD3x8TNg39fqDQEcoY5276Wz4l49ILnycTBK+djXjXXULeV2ew4FnVfoz3z0fkAlyQYCI/sQ3zet0COMbmKmdGSvd1zw4H1ATupI8ZS3ylYaKd2p3sDwozqfLLH4bVkh3YRZyxdL1KYnfxClErQ3X14OBDn83+xw+nJ58rmaJUaD7JMU/tegwxIROa32P1MZbSHk9zsdKdB3 X-MS-Exchange-AntiSpam-MessageData: msTOTyYJmjvYY2zvD+lmyGf9mZppWUHd/gV7s3vwHtzM+hJnEoi1FriUuKF/2Mo0F0bvZNVBoUGwHtrcxGomUpFHHiMbPBnB84oE6I7+d6Xuo2B6aVlgU6YyrI675g8KsDem20tncVt5Dx7Ktk59rg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a80f0c05-ee6d-495f-9a36-08d906350652 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2021 08:51:46.0677 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT027.eop-eur06.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: DB8EUR06HT052 Subject: [FFmpeg-devel] [PATCH 2/2] 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: tnMnZvGBFlO4 Format is still used by modders of these old games. --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/westwood_audenc.c | 120 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 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..49310a47c8 --- /dev/null +++ b/libavformat/westwood_audenc.c @@ -0,0 +1,120 @@ +/* + * 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 "avformat.h" +#include "internal.h" + +#define AUD_CHUNK_SIGNATURE 0x0000DEAF + +typedef struct AUDMuxContext { + int uncomp_size; + int size; +} AUDMuxContext; + +static int wsaud_write_header(AVFormatContext *ctx) +{ + AVStream *s = ctx->streams[0]; + AVIOContext *pb = ctx->pb; + AUDMuxContext *a = ctx->priv_data; + unsigned char flags = 0; + + if (s->codecpar->codec_id != AV_CODEC_ID_ADPCM_IMA_WS) { + AVCodec *codec = avcodec_find_decoder(ctx->streams[0]->codecpar->codec_id); + av_log(s, AV_LOG_ERROR, "%s codec not supported for Westwood AUD.\n", + codec ? codec->name : "NONE"); + return -1; + } + + if (ctx->nb_streams != 1) { + av_log(s, AV_LOG_ERROR, "AUD files have exactly one stream\n"); + return AVERROR(EINVAL); + } + + a->uncomp_size = 0; + a->size = 0; + + /* Flag if we have stereo data. */ + if (s->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. */ + flags |= 2; + + avio_wl16(pb, s->codecpar->sample_rate); + /* We don't know the file size yet, so just skip forward 8 bytes */ + avio_seek(pb, 8, SEEK_CUR); + 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; + + /* 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, + .flags = AVFMT_TS_NONSTRICT, + .write_header = wsaud_write_header, + .write_packet = wsaud_write_packet, + .write_trailer = wsaud_write_trailer, +};