From patchwork Wed Oct 14 13:09:33 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: 22939 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 9CFAB44ADAD for ; Wed, 14 Oct 2020 16:09:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7601068BAEB; Wed, 14 Oct 2020 16:09:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail2.protonmail.ch (mail2.protonmail.ch [185.70.40.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 520A068B964 for ; Wed, 14 Oct 2020 16:09:45 +0300 (EEST) Date: Wed, 14 Oct 2020 13:09:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602680983; bh=pOxNmD3vuzXLEDBqcohpq7DkfOBAB/yNCqbsAZ1Y3OQ=; h=Date:To:From:Cc:Reply-To:Subject:From; b=jyfDhZYhutG2RN6BPvGiJHnj+dGnDykEGWX5aMmoUVIw2K25OtDj42ZZMON+SbfYg JBfgkZZVmYOLRVKt4O3nCOZZgNHnM8zrn1HZeQPhuVOFIuAPE32zD3wcIwdUKOYgKm DmCY5fmTDffgOTlIe9lcrOe1xF9VFUExyBZ71+L/8K3P7YqF+l8eVRKvVAwBQ/Pyme 2oAHKILn1R9j174ng1rEsZfCHZ/p2ZHe1tH3nYX2dDl/GfOBaFmuU2iJcTEr6pXhHv jRdXfWRvFD+ISJ9quSrZwtVE2bffPoFzeZyi0WDd6yfIivU19lFPKAJ8VUQ8oDrmQP V608ZwLojATpA== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/adpcmenc: add "block_size" option 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 --- libavcodec/adpcmenc.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 24bd31c4a9..0038a10830 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/opt.h" + #include "avcodec.h" #include "put_bits.h" #include "bytestream.h" @@ -49,6 +51,9 @@ typedef struct TrellisNode { } TrellisNode; typedef struct ADPCMEncodeContext { + AVClass *class; + int block_size; + ADPCMChannelStatus status[6]; TrellisPath *paths; TrellisNode *node_buf; @@ -69,6 +74,11 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } + if (s->block_size & (s->block_size - 1)) { + av_log(avctx, AV_LOG_ERROR, "block size must be power of 2\n"); + return AVERROR(EINVAL); + } + if (avctx->trellis) { int frontier, max_paths; @@ -841,6 +851,27 @@ static const enum AVSampleFormat sample_fmts_p[] = { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }; +static const AVOption options[] = { + { + .name = "block_size", + .help = "set the block size", + .offset = offsetof(ADPCMEncodeContext, block_size), + .type = AV_OPT_TYPE_INT, + .default_val = {.i64 = BLKSIZE}, + .min = 32, + .max = 8192, /* FIXME: Reasonable upper limit? */ + .flags = AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM + }, + { NULL } +}; + +static const AVClass adpcm_encoder_class = { + .class_name = "ADPCM Encoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + #define ADPCM_ENCODER(id_, name_, sample_fmts_, capabilities_, long_name_) \ AVCodec ff_ ## name_ ## _encoder = { \ .name = #name_, \ @@ -854,6 +885,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ .sample_fmts = sample_fmts_, \ .capabilities = capabilities_, \ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ + .priv_class = &adpcm_encoder_class, \ } ADPCM_ENCODER(AV_CODEC_ID_ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games");