From patchwork Tue Jun 9 00:19:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20227 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 1E3F344AA97 for ; Tue, 9 Jun 2020 03:19:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08FC268B38E; Tue, 9 Jun 2020 03:19:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFC4F68B2AB for ; Tue, 9 Jun 2020 03:19:47 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591661987; bh=gjJ6/KNcVcZ+jSY5bqdevGM4iaL1/WLx6Tylr0hYrv4=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=apuKMV7VzJUwiX8FpPqn5/IrW0TX9MTik2IW+K/BEk9RxICFCpWqRbjqcQF+FIBYW z4d1P+4sGb2JTVz2xfpvbQa7B5Lk4fBBB5z8iNI/CfYmW/6qeVhUPT33ChoTWOT7dx vS6wg6OlLRJQFvMJNbrq+nQj7KkmAXs9CnMrWuek= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-4-zane@zanevaniperen.com> In-Reply-To: <20200609001730.961175-1-zane@zanevaniperen.com> References: <20200609001730.961175-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 3/7] avcodec: add adpcm_ima_apm encoder 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/adpcmenc.c | 34 ++++++++++++++++++++++++++++++++-- libavcodec/allcodecs.c | 1 + libavcodec/utils.c | 1 + 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/doc/general.texi b/doc/general.texi index 9b0ee96752..8df7445c36 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1109,7 +1109,7 @@ following image formats are supported: @item ADPCM IMA High Voltage Software ALP @tab @tab X @item ADPCM IMA QuickTime @tab X @tab X @item ADPCM IMA Simon & Schuster Interactive @tab X @tab X -@item ADPCM IMA Ubisoft APM @tab @tab X +@item ADPCM IMA Ubisoft APM @tab X @tab X @item ADPCM IMA Loki SDL MJPEG @tab @tab X @item ADPCM IMA WAV @tab X @tab X @item ADPCM IMA Westwood @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a6ea59715..4ee0bf2d4c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -853,6 +853,7 @@ 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_APC_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_APM_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_IMA_APM_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_CUNNING_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index d5fbc0b9a7..242c92e61a 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -77,7 +77,9 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (avctx->trellis && avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI) { + if (avctx->trellis && + (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI || + avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM)) { /* * The current trellis implementation doesn't work for extended * runs of samples without periodic resets. Disallow it. @@ -152,6 +154,14 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->frame_size = BLKSIZE * 2 / avctx->channels; avctx->block_align = BLKSIZE; break; + case AV_CODEC_ID_ADPCM_IMA_APM: + avctx->frame_size = BLKSIZE * 2 / avctx->channels; + avctx->block_align = BLKSIZE; + + if(!(avctx->extradata = av_mallocz(28))) + goto error; + avctx->extradata_size = 28; + break; default: ret = AVERROR(EINVAL); goto error; @@ -496,7 +506,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->codec_id == AV_CODEC_ID_ADPCM_SWF) pkt_size = (2 + avctx->channels * (22 + 4 * (frame->nb_samples - 1)) + 7) / 8; - else if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI) + else if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI || + avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM) pkt_size = (frame->nb_samples * avctx->channels) / 2; else pkt_size = avctx->block_align; @@ -717,6 +728,24 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, *dst++ = nibble; } break; + case AV_CODEC_ID_ADPCM_IMA_APM: + { + PutBitContext pb; + init_put_bits(&pb, dst, pkt_size); + + av_assert0(avctx->trellis == 0); + + for (n = frame->nb_samples / 2; n > 0; n--) { + for (ch = 0; ch < avctx->channels; ch++) { + put_bits(&pb, 4, adpcm_ima_qt_compress_sample(c->status + ch, *samples++)); + put_bits(&pb, 4, adpcm_ima_qt_compress_sample(c->status + ch, samples[st])); + } + samples += avctx->channels; + } + + flush_put_bits(&pb); + break; + } default: return AVERROR(EINVAL); } @@ -751,6 +780,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ } +ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_APM, adpcm_ima_apm, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Ubisoft APM"); 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"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 80f128cade..f7d560052e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -607,6 +607,7 @@ extern AVCodec ff_adpcm_ima_amv_decoder; extern AVCodec ff_adpcm_ima_alp_decoder; extern AVCodec ff_adpcm_ima_apc_decoder; extern AVCodec ff_adpcm_ima_apm_decoder; +extern AVCodec ff_adpcm_ima_apm_encoder; extern AVCodec ff_adpcm_ima_cunning_decoder; extern AVCodec ff_adpcm_ima_dat4_decoder; extern AVCodec ff_adpcm_ima_dk3_decoder; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a9c69e30dd..b47c98a9b2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1472,6 +1472,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id) case AV_CODEC_ID_8SVX_FIB: case AV_CODEC_ID_ADPCM_CT: case AV_CODEC_ID_ADPCM_IMA_APC: + case AV_CODEC_ID_ADPCM_IMA_APM: case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: case AV_CODEC_ID_ADPCM_IMA_OKI: case AV_CODEC_ID_ADPCM_IMA_WS: