From patchwork Thu Jun 27 19:56:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Cawley X-Patchwork-Id: 13733 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 A429D449185 for ; Thu, 27 Jun 2019 22:58:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8447468AAEE; Thu, 27 Jun 2019 22:58:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C38D668AAE8 for ; Thu, 27 Jun 2019 22:58:31 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id c6so6834672wml.0 for ; Thu, 27 Jun 2019 12:58:31 -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=qlsprN55P7HkticXW8thY432vAoDuTXR6boVcxB8zuU=; b=CxMBQbmq73Mx/z++4WGZgR42HGE1+W38X5jcCRXZDRppB4LoRspp3u7un2DEyyuhLL EWBUzofEGznp4VQIDJBp+E6tvxVhBSSEvgavl9YVNLbQjhanYAGAMpJAE49xG0iD1fqC iF5iDJyJ4EoEKMVj3dKTNB8hHX28n6T7XsC89J9MicKs+3FuaTPTtChaEnzRBcVbAFuP BvnSrWqRBcFTyn4dWj7fkIC3QUquIzmf7DW+8erEE23WB+lJ5vKEsocWcC15vR8zEvuu ZrK1wxFBor+ziSe30G/C8UrekWzg+OJpm3bJ5jh+ouw77nu/Ubi3Y1Baj+XiCfqnqFZT imLg== 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=qlsprN55P7HkticXW8thY432vAoDuTXR6boVcxB8zuU=; b=n3cNCf6cVObpFH8W4NO5l7MOLkV0kHat7VMhTZYlOM4L5KHoaIvXlSV1dCX0ES2OuM EcLh6/4047wjO9szORj4fVbdqeSv3eMl8I/2nPzhIGsnHO8xBtvpLtI5bNoXcmGLbSnJ jeSqV7UU4TGgGm2hc+EjfJ6BQz4Bx989w6yH9z6SmkHjKzKp5rJLLDBQCJmbueV6lJ5z 4fv5fdhjYBdblqwdO/FmyXIBHdi3pm3UwUhXIDYD67cRD+r1Ecr9+YPGG7AZ/A/H4iGu ePY7ALq/y9Z+U+4a7jCcANtGHHoZa19AKNihkGRPYTSFHVOFbe6iCHcLA2relmVkz2tt z5YA== X-Gm-Message-State: APjAAAUGCyNsO0BE0Pvb8Z7VKrqVUrDO3n/WNzWSJUCQEZz5HwaXzD4a eJn79MqHvhvAefTp9KyYCwaEtiKW X-Google-Smtp-Source: APXvYqwJTcM3KhfkDsWQs8gMbtE89gsIyN6+//w2Rj5gPjfi6AuYXHzTcFnKQF1/uCZw9BfSxQWRTQ== X-Received: by 2002:a1c:9ecd:: with SMTP id h196mr4510817wme.98.1561665510812; Thu, 27 Jun 2019 12:58:30 -0700 (PDT) Received: from localhost.localdomain (host109-150-111-125.range109-150.btcentralplus.com. [109.150.111.125]) by smtp.gmail.com with ESMTPSA id x83sm5865590wmb.42.2019.06.27.12.58.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jun 2019 12:58:30 -0700 (PDT) From: Cameron Cawley To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jun 2019 20:56:01 +0100 Message-Id: <20190627195602.10889-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 ed3cdfcf99..fbbbc24753 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1070,6 +1070,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 edccd73037..9c0dd5d189 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 ede0130bf1..1d4b4d2c22 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -594,6 +594,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; @@ -1412,6 +1413,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); @@ -1796,6 +1809,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 586bbbca4e..f2e8f27c75 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 cc04b73471..6ad7ead502 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1613,6 +1613,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;