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;