From patchwork Thu Aug 8 21:09:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Cawley X-Patchwork-Id: 14335 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7802F44A04A for ; Fri, 9 Aug 2019 00:20:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3FE5768A35D; Fri, 9 Aug 2019 00:20:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E62A6801B2 for ; Fri, 9 Aug 2019 00:20:35 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id v15so3701423wml.0 for ; Thu, 08 Aug 2019 14:20:35 -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; bh=jHOHuVOw6wfAzqE9KEkmzO9shA3GDzLT6fKiDZD/vhw=; b=HUC0YPo+IFORYDSBxlOSQ7NGPzefS+0qlhBh5tvTPLAbgBchc/bMENje/zDYTrltTP oY2Kddk+Tkjzg5Mvma6NwxJNNgHIciLDcfoWX3I7EFxegquMNEMqii1JPiNkKsZKJJl9 BOmEaAJJv9Cuhdh5HkpFgHlFUVwA5ueNfIUaNTk6Wlh38arHsXtlJFL6qLCsCMEVR2KH XaoZkIeU976IrRRJEQ9mC8/utbDmtbo3GPpXCVwgACPcPNEm21rqG3ahV9VokqjBp9kX ao55NNVirMehm1aYynAooiAJ3ZCt5/z72fsV3zGtaBhlGkThVTKTwDOTlVPXkM472OF/ 2+mA== 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; bh=jHOHuVOw6wfAzqE9KEkmzO9shA3GDzLT6fKiDZD/vhw=; b=JNKeLSc3Ooloepk7vKN4qYfsNZ7+5ZXAKNFg/WkYrB3zScQ4dv+jxpm+v4zWvwSzfA oPQo37VIQH290Zhcs8mT3d32dKmMiB821G+UYUOuNZ+eO86IjjnljhCV8JgfkdcXih/p QRb33ITfWeKYd9mKyyIyAFhaqocLr06g93zwzCe8lPGT5ZulMmcfdp6jql8BHgsixOY9 RYaGYRgxjDsDCtQNzqKV3a4/wkkydvWOeKlD4r2S5trAKkiuqpNo25BRYUIkrCGTmJMm 4gJLtPqgWi6wb5ZdpecI2JrMxdeRiQLC9rmWy0vtbVYyQTvfobCDw0eBkW/8DpquiyYJ wUPA== X-Gm-Message-State: APjAAAWIThhxlDylC6VxhrpMwSaKjkyNASHO4xS33p+axaZ4cijayerN Tew/TWaSolsm4KJ5rykJjh1aeJkn X-Google-Smtp-Source: APXvYqydNJKPzdAPEWd/HMc20CaQV8/L/WMgKhgyIbFuvYURSVHfMM3PXnGvjA+svCoayAiCF7JSKg== X-Received: by 2002:a05:600c:24a:: with SMTP id 10mr6811322wmj.7.1565298918346; Thu, 08 Aug 2019 14:15:18 -0700 (PDT) Received: from localhost.localdomain (host81-157-187-89.range81-157.btcentralplus.com. [81.157.187.89]) by smtp.gmail.com with ESMTPSA id z25sm2510682wmf.38.2019.08.08.14.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 14:15:15 -0700 (PDT) From: Cameron Cawley To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Aug 2019 22:09:04 +0100 Message-Id: <20190808210905.24456-1-ccawley2011@gmail.com> X-Mailer: git-send-email 2.11.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.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Cameron Cawley --- doc/general.texi | 1 + libavcodec/Makefile | 1 + libavcodec/adpcm.c | 14 ++++++++++++++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/utils.c | 1 + 7 files changed, 26 insertions(+) diff --git a/doc/general.texi b/doc/general.texi index 3c0c803449..db30738716 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1072,6 +1072,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 @tab X @tab Used in AMV files @item ADPCM IMA Electronic Arts EACS @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3cd73fbcc6..c0a038495f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -825,6 +825,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_APC_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index fb126503d6..70503fc0b1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -599,6 +599,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_ISS: header_size = 4 * ch; break; case AV_CODEC_ID_ADPCM_IMA_AMV: header_size = 8; break; @@ -1441,6 +1442,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } } break; + case AV_CODEC_ID_ADPCM_IMA_ACORN: + for (i=0; i<=st; i++) { + bytestream2_skip(&gb, 2); // TODO: What does this do? + c->status[i].step_index = bytestream2_get_le16u(&gb); + } + + 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, 6); + *samples++ = adpcm_ima_expand_nibble(&c->status[st], byte >> 4, 6); + } + break; case AV_CODEC_ID_ADPCM_IMA_AMV: c->status[0].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); c->status[0].step_index = bytestream2_get_byteu(&gb); @@ -1825,6 +1838,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_DAT4, sample_fmts_s16, adpcm_ima_dat4, "ADPCM IMA Eurocom DAT4"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d2f9a39ce5..78177a1255 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -592,6 +592,7 @@ extern AVCodec ff_adpcm_g726_encoder; extern AVCodec ff_adpcm_g726_decoder; extern AVCodec ff_adpcm_g726le_encoder; extern AVCodec ff_adpcm_g726le_decoder; +extern AVCodec ff_adpcm_ima_acorn_decoder; extern AVCodec ff_adpcm_ima_amv_decoder; extern AVCodec ff_adpcm_ima_apc_decoder; extern AVCodec ff_adpcm_ima_dat4_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d234271c5b..c8b6ec7f3c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -542,6 +542,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_IMA_DAT4, AV_CODEC_ID_ADPCM_MTAF, AV_CODEC_ID_ADPCM_AGM, + AV_CODEC_ID_ADPCM_IMA_ACORN, /* AMR */ AV_CODEC_ID_AMR_NB = 0x12000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 4d033c20ff..dc39b50e33 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2276,6 +2276,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM AmuseGraphics Movie AGM"), .props = 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_LOSSY, + }, /* AMR */ { diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a6a646636d..2bcc2065ef 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1621,6 +1621,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, case AV_CODEC_ID_ADPCM_DTK: return frame_bytes / (16 * ch) * 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;