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;