From patchwork Wed Apr 10 11:45:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 12686 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 2C1734496EA for ; Wed, 10 Apr 2019 14:46:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C60368AF12; Wed, 10 Apr 2019 14:46:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 699DD68AF10 for ; Wed, 10 Apr 2019 14:46:04 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id y13so2580020wrd.3 for ; Wed, 10 Apr 2019 04:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=eG7nVAjKPTBAvWbNTpbNF5Yt5HGqoI6gm31XxAgus3I=; b=H1tg6jbXSL5ZLrJAmmGWK2EIKV29wAsauqUpdogHu58+GA36kQQLA+URIdlTdT9n0f zRPSked5IkZfbMyzyp7bgGO1QNnApVav9Kb08fnc8ULNo0GY5U/o/Xk2ejplt4KqXKq/ 9+DdkJyTFju6fKilKuCVaGOZrrOWvryhQmX+wJM/lpSFRehPYqXroyseNfUfJIVYWujk XMXnXNpAx+NnzrTtRt8gNeS/RMSvJSntDmkqqDiozNO0AYJTbJaLCWrH/EK1f3qDPcfM ZAiAex+6OyLBfJ6SKLMC7pfEydv2W5EF+d4A0wnMI9idpUqg87pTuX3ZDL9jkZWST9km oDHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=eG7nVAjKPTBAvWbNTpbNF5Yt5HGqoI6gm31XxAgus3I=; b=Yq9wM7YHJDXuyXCk4PPXnc65N4rZncQJNgt72IhiJKa5HXYEJEIpBMZj4aSgvVbwvn 6HUseKSsxFvNG+ZWVoTWaHU2A6Ng4jhjqFaskpydZ1vKXHxlK39L8wz48nuJpVby0oTA SJQ8qu4+cdBeDzTiczRnG/aCqiuPH48xTHTzat3tuGOqLhjuOSmM2SChJJ7oHgunFM1s D9U25nBeoM2aGrWzPI4KEwoswGi0FlYeJDNMGmzBfNN45VPAkCMKNyYdZaofD3oiAnLA O0LP02xvk5npZg/3201RpL1/QC+7JB9NPuwLxI0VsI+1CGypPjY4xf9NA9QrmegYdnRk ZHMw== X-Gm-Message-State: APjAAAXv50Zj3tpjjYYr0enA9GltoI9PgUpKtfT6Hyl4DiHBqRFC+yWP RAl5mdIuIs0SZSZIxoBUHliSmwjP X-Google-Smtp-Source: APXvYqyuxIGU4+Wqv4CmdDBWBP8syRcfFqgmLo/S/8MpjpiTpyiyKIjmodbw4/lphjTKtdAlCyQdQw== X-Received: by 2002:a05:6000:120c:: with SMTP id e12mr6130921wrx.187.1554896763722; Wed, 10 Apr 2019 04:46:03 -0700 (PDT) Received: from localhost.localdomain ([37.244.238.255]) by smtp.gmail.com with ESMTPSA id s2sm2293636wmc.7.2019.04.10.04.46.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 04:46:03 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Apr 2019 13:45:53 +0200 Message-Id: <20190410114553.16723-3-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190410114553.16723-1-onemda@gmail.com> References: <20190410114553.16723-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec: add ADPCM AGM 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 58 +++++++++++++++++++++++++++++++++++++++++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++ libavformat/riff.c | 1 + 6 files changed, 69 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index de873c1643..02849f91ec 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -808,6 +808,7 @@ OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adxdec.o adx.o OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adxenc.o adx.o OBJS-$(CONFIG_ADPCM_AFC_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_AGM_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_AICA_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_DTK_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index aa9c7c5c4f..a607b2cc70 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -177,6 +177,50 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) return 0; } +static inline int16_t adpcm_agm_expand_nibble(ADPCMChannelStatus *c, int8_t nibble) +{ + int delta, pred, step, add; + + pred = c->predictor; + delta = nibble & 7; + step = c->step; + add = (delta * 2 + 1) * step; + if (add < 0) + add = add + 7; + + if ((nibble & 8) == 0) + pred = av_clip(pred + (add >> 3), -32767, 32767); + else + pred = av_clip(pred - (add >> 3), -32767, 32767); + + switch (delta) { + case 7: + step *= 0x99; + break; + case 6: + c->step = av_clip(c->step * 2, 127, 24576); + c->predictor = pred; + return pred; + case 5: + step *= 0x66; + break; + case 4: + step *= 0x4d; + break; + default: + step *= 0x39; + break; + } + + if (step < 0) + step += 0x3f; + + c->step = step >> 6; + c->step = av_clip(c->step, 127, 24576); + c->predictor = pred; + return pred; +} + static inline int16_t adpcm_ima_expand_nibble(ADPCMChannelStatus *c, int8_t nibble, int shift) { int step_index; @@ -549,6 +593,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, header_size = 0; switch (avctx->codec->id) { case AV_CODEC_ID_ADPCM_4XM: + case AV_CODEC_ID_ADPCM_AGM: 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; @@ -863,6 +908,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } } break; + case AV_CODEC_ID_ADPCM_AGM: + for (i = 0; i < avctx->channels; i++) + c->status[i].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); + for (i = 0; i < avctx->channels; i++) + c->status[i].step = sign_extend(bytestream2_get_le16u(&gb), 16); + + for (n = 0; n < nb_samples; n++) { + int v = bytestream2_get_byteu(&gb); + *samples++ = adpcm_agm_expand_nibble(&c->status[0], v & 0xF); + *samples++ = adpcm_agm_expand_nibble(&c->status[avctx->channels > 1], v >> 4 ); + } + break; case AV_CODEC_ID_ADPCM_MS: { int block_predictor; @@ -1729,6 +1786,7 @@ AVCodec ff_ ## name_ ## _decoder = { \ /* Note: Do not forget to add new entries to the Makefile as well. */ ADPCM_DECODER(AV_CODEC_ID_ADPCM_4XM, sample_fmts_s16p, adpcm_4xm, "ADPCM 4X Movie"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_AFC, sample_fmts_s16p, adpcm_afc, "ADPCM Nintendo Gamecube AFC"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_AGM, sample_fmts_s16, adpcm_agm, "ADPCM AmuseGraphics Movie"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_AICA, sample_fmts_s16p, adpcm_aica, "ADPCM Yamaha AICA"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_CT, sample_fmts_s16, adpcm_ct, "ADPCM Creative Technology"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_DTK, sample_fmts_s16p, adpcm_dtk, "ADPCM Nintendo Gamecube DTK"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 71fd74a07e..9ae8a779b3 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -574,6 +574,7 @@ extern AVCodec ff_adpcm_4xm_decoder; extern AVCodec ff_adpcm_adx_encoder; extern AVCodec ff_adpcm_adx_decoder; extern AVCodec ff_adpcm_afc_decoder; +extern AVCodec ff_adpcm_agm_decoder; extern AVCodec ff_adpcm_aica_decoder; extern AVCodec ff_adpcm_ct_decoder; extern AVCodec ff_adpcm_dtk_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cafc65fce5..4218cff6c4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -539,6 +539,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_AICA, AV_CODEC_ID_ADPCM_IMA_DAT4, AV_CODEC_ID_ADPCM_MTAF, + AV_CODEC_ID_ADPCM_AGM, /* AMR */ AV_CODEC_ID_AMR_NB = 0x12000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 80c21a8c6c..8295221d15 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2255,6 +2255,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM MTAF"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_AGM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_agm", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM AmuseGraphics Movie AGM"), + .props = AV_CODEC_PROP_LOSSY, + }, /* AMR */ { diff --git a/libavformat/riff.c b/libavformat/riff.c index 394481becd..741a6515df 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -605,5 +605,6 @@ const AVCodecGuid ff_codec_wav_guids[] = { { AV_CODEC_ID_ATRAC9, { 0xD2, 0x42, 0xE1, 0x47, 0xBA, 0x36, 0x8D, 0x4D, 0x88, 0xFC, 0x61, 0x65, 0x4F, 0x8C, 0x83, 0x6C } }, { AV_CODEC_ID_EAC3, { 0xAF, 0x87, 0xFB, 0xA7, 0x02, 0x2D, 0xFB, 0x42, 0xA4, 0xD4, 0x05, 0xCD, 0x93, 0x84, 0x3B, 0xDD } }, { AV_CODEC_ID_MP2, { 0x2B, 0x80, 0x6D, 0xE0, 0x46, 0xDB, 0xCF, 0x11, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA } }, + { AV_CODEC_ID_ADPCM_AGM,{ 0x82, 0xEC, 0x1F, 0x6A, 0xCA, 0xDB, 0x19, 0x45, 0xBD, 0xE7, 0x56, 0xD3, 0xB3, 0xEF, 0x98, 0x1D } }, { AV_CODEC_ID_NONE } };