From patchwork Mon May 3 20:09:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Cawley X-Patchwork-Id: 27579 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp590520pxh; Mon, 3 May 2021 13:17:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6ssdCe2loYoTuBBm3M4MUu8oKom4UfYAtUEpyZzhjIl7Zbdw3lb9GH15WRkYsZybToBN7 X-Received: by 2002:a05:6402:682:: with SMTP id f2mr21795184edy.297.1620073049520; Mon, 03 May 2021 13:17:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620073049; cv=none; d=google.com; s=arc-20160816; b=U+UosxyWmjTloTeECbZbbSGDIin0jAvfkKJOAQ40g/LH6cbEqyXP0UwTJrx216c68i gctLYQNp5HpnDQnJRy2n8+CmK1HzF1sonebFKjc6ZtxHBq7qxd6pxm7Wi5xD0f1ftiPK uR8Awn1S0WXSckhwHGICARM2DDEGh7hqlxTlCqgddP0G5OHQKdO30iZWd+y77qoD+8fh ywcoTW6s6TBgEHFUjzPKp3E1wIGmHXN5RdBIMBayJjQGNFFycFCeWEayhgd+BhBa2DfZ omKx0lDjUcZgXTI0pZtG8/kmHQgxQ8CS41k3eQQ02YiAWighFwWA2CiFWamL6ywPJ6DK eCNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Eqva5FFchVbzIF1ieA6tBCEpXZEitRgGsNKYqRFVUPU=; b=HoEAkv5w+ShgsHVQ8AlRzoNtZ3NbTeA8deZmecwU4sjXDXD79OixwrAD65Uee2vz5D uXRtdDMdV5+rL4wkrQKXTO8E0cpdshx3zE0xH5UvsrHvRwVf1pVHDu/BHlxGNVQCjs2f aXyVEWUT6DBRyddLx9OTbdcFKdx2ceevZps/W427QUqQIRJBSRyQC2yxufPZ7YS8WVNG b0brx5aXLSF9y2+XJZBi/zuCjTw9LvVFnD25OtA2uE9WWcFa4WY2kbX52VLof6b5ThkB bpDXkLnl1jlqr2f7gl7iUAGaI62gzA3K6cz2+KDYV13VnSMjtzS10Aeokz0z/3AFIPv9 OwAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EAPLvbUp; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h93si11400440edd.584.2021.05.03.13.17.28; Mon, 03 May 2021 13:17:29 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EAPLvbUp; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 198C1680BA5; Mon, 3 May 2021 23:17:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B984A680273 for ; Mon, 3 May 2021 23:17:17 +0300 (EEST) Received: by mail-ed1-f43.google.com with SMTP id u13so5140884edd.3 for ; Mon, 03 May 2021 13:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/XTsRMkFS99YBxfwySTFTYguyS97y3gWCbMC+WWmcN8=; b=EAPLvbUpGAxzcloJ5dCtxqYef5kXqio18bgXICXCYTX2ZQt2MZ0mqgr+gGZgv1CUDP mEblqxN/yKO+OJNRTTNfmKK7gQJf6tx8+9OfU64wBldgk0vykfS2dkpoixkaz5pI8+XL x8yE39Ki3OWTq0l4SAx8lE3873DnrEnyvt6uBmwYkhkcN56LnWF7E0lzfTPRX+RjWFc5 3dZGxXO8zaNKAqykgKIOnuqxK2Kl6jK+DjVbIYpmGOzckOL5Jrl0ba2VWeEg8pci7h6Q hcqJubbLhhqLKWLCpisudPYZuR8fgj8uEuEwV9xazmczQiZpKalsR6Bve39HJvjQMtdw 87fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/XTsRMkFS99YBxfwySTFTYguyS97y3gWCbMC+WWmcN8=; b=B37T3GGw8cubErb4QGLZ8dykH6qKNhYTVdC2IR42gAQVgfAP/2KqxFaYAm17RzKC8p DbrGvzE5nQ0tPtWOtj08QvMg19Y7zo117KTafGWT01PY1S5wN8e/CXsx1QHBAgoHH6Nm 3Cl7vKt4GIMJz0/05E0SKbR9NnfeBo4wc5vRhz9ZXg3GzczM28HYZ5oqR/Z6LJ2q8eYi k1MUQoqEdoT3I2GQVkn54iQB5mxZFp2OfYjYjjsUTBB8mKL465imJwJTRXPPkSumio3G Sbgu2yGeNK3WGRixoLU/QtjeLChVuIZpEQMgg5xgDVQ3tcEuyx46hXTYn/fR4ELbOSQp efWw== X-Gm-Message-State: AOAM532QhmYBeHNh4N1S9Y5MgmCASrfo3ZRuEmhXTTBLAtCv+x1nHWkQ AB7Qzt5wJYmA/iiF/9uN82SjgiAnirU= X-Received: by 2002:adf:dcc5:: with SMTP id x5mr27341195wrm.1.1620072675323; Mon, 03 May 2021 13:11:15 -0700 (PDT) Received: from localhost.localdomain ([146.66.56.6]) by smtp.gmail.com with ESMTPSA id l5sm591580wmh.0.2021.05.03.13.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 13:11:14 -0700 (PDT) From: Cameron Cawley To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 21:09:59 +0100 Message-Id: <20210503201000.22816-1-ccawley2011@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: Implement Acorn Replay IMA ADPCM decoder 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: Cameron Cawley Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: W+ySO7GJ6kYG --- Changelog | 1 + doc/general_contents.texi | 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 19 +++++++++++++++++++ libavcodec/allcodecs.c | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/codec_id.h | 1 + libavcodec/utils.c | 1 + libavcodec/version.h | 2 +- 9 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index ad950354d0..c38c5d63a0 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ releases are sorted from youngest to oldest. version : - ADPCM IMA Westwood encoder - Westwood AUD muxer +- ADPCM IMA Acorn Replay decoder version 4.4: diff --git a/doc/general_contents.texi b/doc/general_contents.texi index e01347f8d4..354899ad17 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -1126,6 +1126,7 @@ following image formats are supported: @item ADPCM Electronic Arts XAS @tab @tab X @item ADPCM G.722 @tab X @tab X @item ADPCM G.726 @tab X @tab X +@item ADPCM IMA Acorn Replay @tab @tab X @item ADPCM IMA AMV @tab X @tab X @tab Used in AMV files @item ADPCM IMA Cunning Developments @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 075b0ad7a3..4fa8d7ab10 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -868,6 +868,7 @@ OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o +OBJS-$(CONFIG_ADPCM_IMA_ACORN_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_ALP_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_ALP_ENCODER) += adpcmenc.o adpcm_data.o diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 3da6b734cf..8fe43b5720 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -747,6 +747,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, switch (avctx->codec->id) { case AV_CODEC_ID_ADPCM_4XM: case AV_CODEC_ID_ADPCM_AGM: + case AV_CODEC_ID_ADPCM_IMA_ACORN: case AV_CODEC_ID_ADPCM_IMA_DAT4: case AV_CODEC_ID_ADPCM_IMA_MOFLEX: case AV_CODEC_ID_ADPCM_IMA_ISS: header_size = 4 * ch; break; @@ -1665,6 +1666,23 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } } break; + case AV_CODEC_ID_ADPCM_IMA_ACORN: + for (channel = 0; channel < avctx->channels; channel++) { + cs = &c->status[channel]; + cs->predictor = sign_extend(bytestream2_get_le16u(&gb), 16); + cs->step_index = bytestream2_get_le16u(&gb) & 0xFF; + if (cs->step_index > 88u){ + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index[%d] = %i\n", + channel, cs->step_index); + return AVERROR_INVALIDDATA; + } + } + for (n = nb_samples >> (1 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_expand_nibble(&c->status[0], byte & 0x0F, 3); + *samples++ = adpcm_ima_expand_nibble(&c->status[st], byte >> 4, 3); + } + break; case AV_CODEC_ID_ADPCM_IMA_AMV: av_assert0(avctx->channels == 1); @@ -2160,6 +2178,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R1, sample_fmts_s16p, adpcm_ea_r1, ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R2, sample_fmts_s16p, adpcm_ea_r2, "ADPCM Electronic Arts R2"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R3, sample_fmts_s16p, adpcm_ea_r3, "ADPCM Electronic Arts R3"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_XAS, sample_fmts_s16p, adpcm_ea_xas, "ADPCM Electronic Arts XAS"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ACORN, sample_fmts_s16, adpcm_ima_acorn, "ADPCM IMA Acorn Replay"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_AMV, sample_fmts_s16, adpcm_ima_amv, "ADPCM IMA AMV"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_APC, sample_fmts_s16, adpcm_ima_apc, "ADPCM IMA CRYO APC"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_APM, sample_fmts_s16, adpcm_ima_apm, "ADPCM IMA Ubisoft APM"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 73dd3d0695..0b15b59364 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -619,6 +619,7 @@ extern const AVCodec ff_adpcm_g726_encoder; extern const AVCodec ff_adpcm_g726_decoder; extern const AVCodec ff_adpcm_g726le_encoder; extern const AVCodec ff_adpcm_g726le_decoder; +extern const AVCodec ff_adpcm_ima_acorn_decoder; extern const AVCodec ff_adpcm_ima_amv_decoder; extern const AVCodec ff_adpcm_ima_amv_encoder; extern const AVCodec ff_adpcm_ima_alp_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 17f8a14044..35527dcc37 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2462,6 +2462,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA MobiClip MOFLEX"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_IMA_ACORN, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_acorn", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Acorn Replay"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* AMR */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index ab7bc68ee2..7cc9c8dc83 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -401,6 +401,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_IMA_MTF, AV_CODEC_ID_ADPCM_IMA_CUNNING, AV_CODEC_ID_ADPCM_IMA_MOFLEX, + AV_CODEC_ID_ADPCM_IMA_ACORN, /* AMR */ AV_CODEC_ID_AMR_NB = 0x12000, diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 9cee989098..24b102738c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -689,6 +689,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, return 0; return frame_bytes * 28; case AV_CODEC_ID_ADPCM_4XM: + case AV_CODEC_ID_ADPCM_IMA_ACORN: case AV_CODEC_ID_ADPCM_IMA_DAT4: case AV_CODEC_ID_ADPCM_IMA_ISS: return (frame_bytes - 4 * ch) * 2 / ch; diff --git a/libavcodec/version.h b/libavcodec/version.h index 8d37666d5e..48165b9ac4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 59 -#define LIBAVCODEC_VERSION_MINOR 0 +#define LIBAVCODEC_VERSION_MINOR 1 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \