From patchwork Sat Apr 24 21:54:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan Richmond X-Patchwork-Id: 27327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2661528iob; Sat, 24 Apr 2021 14:55:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtHnsObbOSLuftT3e3M1NAEm+wgNHVNLdnYjubWRueBZLxm60TZRAqFDnbKimY3tDQ5kqJ X-Received: by 2002:a17:906:cb11:: with SMTP id lk17mr10774400ejb.517.1619301328818; Sat, 24 Apr 2021 14:55:28 -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 s23si9233991edc.25.2021.04.24.14.55.28; Sat, 24 Apr 2021 14:55:28 -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 A071F680BD5; Sun, 25 Apr 2021 00:55:24 +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-vi1eur05olkn2056.outbound.protection.outlook.com [40.92.90.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6951B680825 for ; Sun, 25 Apr 2021 00:55:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g9YCVOvvOXXZHYKYHZzEroQyb7RwLK575Rv1Y4zmqJM5LH7Aqlc2XcEYWoC03xGPFI59Qi3uJq0tHg3p3fAU6NGkjkccxQgtIqTqvPoFdXvwQtK9cSR1aAeI0EctQuvJwrHIiSdQhCXFtwv59F5Bi+YJ/m7nXSCZMsr4HVPavziqeLxHQrh3wPKDNyJw1+D+gca+wTUDtfK5ZfiuXSAluC7TJfaa/30FTy/sISjG9CHC1FLD4HtHgZOtdpjfL4OoRv+bCJvP+4yiD1e0BCcbhIrMczy7QwPZxKLcZ78vlg/MhHyoghzVRjCqeUT5of4lmXUuGwFvwomdEB0PEAbbcw== 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=kgfrFptZ/YNM3uFAmROCaHxqsoScKDrhvyx8+iVxlAPLbIJvd7SvPs7LkAtd1gKToKw0T31uFvkaJ5G+zinG0qZmxZcFSpkJWkWrW8uxBw/FZxo8QsCPIFVuLToZ3cbYCqKrmsqE9T8dKTO1tIcAMScDJFf+1pJdOW8ZPwGzK1hooQ8GJTpbVzZPNM2UghYNpW9l3PLv2gtvJAPBzgenh+PisTWm6gNNGhC2F6EOe1H+RhsFcbL6yLwEyPLZDBZ1O1sg/D2entIgSLNQd70OcHZiEhu+YFnTwgYxt/LKBfx3EcMCOE5ZVIQvVxz8VKBwcH7MbJ/CnlH/r2Nd9NEYyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VI1EUR05FT059.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::46) by VI1EUR05HT109.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::182) 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 21:55:16 +0000 Received: from AM9PR09MB5170.eurprd09.prod.outlook.com (2a01:111:e400:fc12::40) by VI1EUR05FT059.mail.protection.outlook.com (2a01:111:e400:fc12::335) 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 21:55:16 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3EF9CE025E91DEF3455A535323D729D1B0FF34149D0A5F622281E32EB93DAD52; UpperCasedChecksum:AB2F688C2DD47C388EA47A89D574D3CA4619F9D0CD989C13A4F7997B62818D41; SizeAsReceived:7276; 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 21:55:16 +0000 From: Aidan Richmond To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 22:54:54 +0100 Message-ID: X-Mailer: git-send-email 2.16.1.windows.1 X-TMN: [UB6TGD7wVJh6VE1bLz0ECJDqgW/gVHJj] X-ClientProxiedBy: LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) To AM9PR09MB5170.eurprd09.prod.outlook.com (2603:10a6:20b:301::8) X-Microsoft-Original-Message-ID: <20210424215456.39000-1-aidan.is@hotmail.co.uk> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.28.139.128) by LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) 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 21:55:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2dff261d-b999-446e-8014-08d9076ba4fe X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuQ75gPcT42JL4CyEb3w00p+yWxFfZf3OOP6ZMNuz1N4OA4+xCBswksZiu2CjVp5hEe0P6JF7OeDPM04lVlnOXEzsFqHrWo2KYLHBsmCdazCl7phXNj4jrB0GIpZ6x0/7yAD8/bJC2WgKOmhbayQCP70EgUrgxZktCZA4Y57PH0GCcbEdR1WuDacT7eweA+DBgm3IeU7Ch6VzPVeVD6WJko/tAjwfg5NOtsaLdZ9O5Q2jrkevXW1LLiFrpxx/V+dzHWi9rvYM3DevSZC/W1YZgCvBcyTe2n2ZPTGXkjPpX+NhFi6maUcPLlz29UxdKtqSqt2JPPfSzOYaVEBCH9uAVsDRq1uGrda0nreayVSFssJW4XrAcioN1i72YbNG+jPVQMwn/4CSwyw0k9I8fwXEUqSo/B95tyU+6Wj+7YM3ATYIYr1bhmaQ6DscKP+0bhDl9pFPk8swS6s0gGF24r1VP3M6+kBsShuwz1Fsyn2LZyjJLTuHFm6cWCQ9kCd9r0L3tqEFasDFiwrxita4NGxiu3n70drWMIJfuYwD2VyQ7tCySSXyLbk3fZITTuoWUpwIseRqzn9cmmZl0WJOkU0KS9CBBWsGgPtJALQ2JmEA36z0VYaTurU5Oi017RcG2cVHB4ABS/erX/gt47U3b+WPpZh2ljiT5FdOLa8D2Env7GZGMueozJgo6soc6qtsghuCdi7Wwk9cltHvq5ED5NGYo26vauQGbp86gcCmBhheGCiviC9N6RJQyy1NdZD93jE9hTBT+ldsul3N86fd1nefh5 X-MS-TrafficTypeDiagnostic: VI1EUR05HT109: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OcqSXNDT1Mmw71s9eyK9QMHleDkC3wT/SLbzq3agRjwwQQjm4FUcm2WzXdPxZp6DIvf/88IqzG+ME50AhyWXQTsVyX/9BoLEADM8t4YMlqDEe+8M+sjPWDVj/ZdjEXGqVwOppJAcoLnhvc496gNpGV2lHw0dS79Wp+MHqa/61/NwPxYhFefqG8n9wKgKUf1kgOJM6OzRqACCHLnofXaUxmQTjJdLbOIqc5/R/C92D85Tr+cjDAvvkJtjq905+wa1ExjLfxbIqdnq70DNd4eXGMSdXnVv+UxEmAI1t1Imn/cizXheE3oDIhQ3yvHI84QlmyRaiILouhLJ9n65NA+6npJpEZ1Izo537iPBRRRwgaeKuwmCoOmBxMdkHd+7wzPnGKn9+/tzxcCeG5Ammy1y0A== X-MS-Exchange-AntiSpam-MessageData: cgJVzJaW2BHNnZTYPAjNjXWenNMjKdDdLLeUTHAG3Jw7zqnhr8ZLiczLARDDKCAclwAfgeVJ93xgblU66P4GGeEU7OeL+CQs5Y92ofwQLcxeyxaVrh52L3MqlIQWZr6rnFApYVMg25PLeHxjRsP2Ww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dff261d-b999-446e-8014-08d9076ba4fe X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 21:55:16.4038 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT059.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: VI1EUR05HT109 Subject: [FFmpeg-devel] [PATCH v3 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: TD5cKnA1P2A+ 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;