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"); From patchwork Wed Oct 14 13:09:48 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: 22940 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 C34AA44ADAD for ; Wed, 14 Oct 2020 16:10:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB3F168BAA3; Wed, 14 Oct 2020 16:10:00 +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 5BEE468B964 for ; Wed, 14 Oct 2020 16:09:54 +0300 (EEST) Date: Wed, 14 Oct 2020 13:09:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602680993; bh=3h9VA0XTPpu+BE729uYHZpCwS7bFTiuJsDOeHpQM4Bo=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=yhE985w0Z03/3ieOJJrPI82lZziWDg93RRc9Sk9ueW5AgcMACIUDEkNr3CCopGXyX AP5XM5PbuURnIYw6zYgCKSbtJepL2kvqflEPK2+S3fLYrxkmPcC12qj8A9/spEn8/a wLKV98qZZ0hV/2NCDUruv52kHmvZht0MGqwEvd9t0JoYt3dvoWD7iIB1ekJjYrYRqb 7BxtAGwW42tRAJWYH+PdFI+xd1lU8GLwvIx/Dzj/7WtoIVOM82pk57o7k2D/fIUfr/ UW/Avo0ctP0udz40poSw+Imach3FHU3UZOYQRQFS2EDKRGwchkNgLJ6iMT3lBTp9Ik IuTaUI9JTwQLw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-2-zane@zanevaniperen.com> In-Reply-To: <20201014130915.25948-1-zane@zanevaniperen.com> References: <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 2/7] avcodec/adpcm_ms: support variable block size for encoding 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" Fixes tickets #6585 and #7109 Signed-off-by: Zane van Iperen --- libavcodec/adpcmenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 0038a10830..fc29bf8571 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -127,9 +127,9 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) case AV_CODEC_ID_ADPCM_MS: /* each 16 bits sample gives one nibble and we have 7 bytes per channel overhead */ - avctx->frame_size = (BLKSIZE - 7 * avctx->channels) * 2 / avctx->channels + 2; + avctx->frame_size = (s->block_size - 7 * avctx->channels) * 2 / avctx->channels + 2; avctx->bits_per_coded_sample = 4; - avctx->block_align = BLKSIZE; + avctx->block_align = s->block_size; if (!(avctx->extradata = av_malloc(32 + AV_INPUT_BUFFER_PADDING_SIZE))) return AVERROR(ENOMEM); avctx->extradata_size = 32; From patchwork Wed Oct 14 13:09:58 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: 22941 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 DB2F1447730 for ; Wed, 14 Oct 2020 16:10:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C027468BB7A; Wed, 14 Oct 2020 16:10:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE3D768BA69 for ; Wed, 14 Oct 2020 16:10:08 +0300 (EEST) Date: Wed, 14 Oct 2020 13:09:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602681008; bh=UOTzuzhNoHQLE3mTix3k2EU1Nn184Uuge4q2yv+3zxQ=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=UsIyzyWAozuXSrxJPlv0PMOji+gN4/VC32u1mwThLI7Q7vRoOTB08fT0kIHCRGW35 SzOgUZbv75+rqNrVtv/TwllSQLiBf9DjhNdsTblKvcCqeBxqJnp049WxselG4ens2Q tP8o7p2LxM3LVDVEolV437Cid67nJNV6zTSbqwOrn7R0e8QbHyd71is0tIENPx7SX/ iINMCMWXdJ29jXR0sCApnPnV+CYqfPB/I37xFY+8nPJj3Jeny1EA+VbfMIx4Tq/4/G /7vCidJdjVJLPSFc7NaSxxExm/nWKsytb83H793ry8KrG2wdix9rhg8yK+JI+6kFy/ KbyaAdSbZuoLQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-3-zane@zanevaniperen.com> In-Reply-To: <20201014130915.25948-1-zane@zanevaniperen.com> References: <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 3/7] avcodec/adpcm_ima_ssi: support variable block size for encoding 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index fc29bf8571..2907ac8d77 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -156,8 +156,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->frame_size = 512 * (avctx->sample_rate / 11025); break; case AV_CODEC_ID_ADPCM_IMA_SSI: - avctx->frame_size = BLKSIZE * 2 / avctx->channels; - avctx->block_align = BLKSIZE; + avctx->frame_size = s->block_size * 2 / avctx->channels; + avctx->block_align = s->block_size; break; case AV_CODEC_ID_ADPCM_IMA_APM: avctx->frame_size = BLKSIZE * 2 / avctx->channels; From patchwork Wed Oct 14 13:10:14 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: 22942 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 E129644988A for ; Wed, 14 Oct 2020 16:10:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C090568BBBD; Wed, 14 Oct 2020 16:10:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F59B68B839 for ; Wed, 14 Oct 2020 16:10:27 +0300 (EEST) Date: Wed, 14 Oct 2020 13:10:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602681026; bh=FqXGh2bQvqC8a44fCajGQ2uXKhgR/J0Kjx3UawNeZ0Q=; h=Date:To:From:Cc:Reply-To:Subject:From; b=vTCJdLh1ouYHmCwtOiJQ+XwJCFHLSAIFwgJesjE+ayZ6/bKpZmp/TpetMI3f7iGmk HAilvWyleC9zANwAefBg82nsn8N0Qrs994T0iGyw01oyhkMo70AXw96MAorkByupxz QD6LilEbdw/emDCl6bmLB9nmVot1+H7MhiBkmvaG9kHWbT7Q8HvgU3x7SiQgnB6paG xbSfbiCXqBkgrkn5ZbySqV/4Pn9u70HUqnZ0PDd6/rrynMV+Oup13H1HtrtGWlZXnT UMRCafjST1748ZzVgKHTLrhjQJ2jLUDemmZ6B3sQI53PSEgwjHTo5jRl9Pw/DeEWRn RY6BH7ImenXjg== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-4-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 4/7] avcodec/adpcm_ima_apm: support variable block size for encoding 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 2907ac8d77..d234d3dbf2 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -160,8 +160,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->block_align = s->block_size; break; case AV_CODEC_ID_ADPCM_IMA_APM: - avctx->frame_size = BLKSIZE * 2 / avctx->channels; - avctx->block_align = BLKSIZE; + avctx->frame_size = s->block_size * 2 / avctx->channels; + avctx->block_align = s->block_size; if (!(avctx->extradata = av_mallocz(28 + AV_INPUT_BUFFER_PADDING_SIZE))) return AVERROR(ENOMEM); From patchwork Wed Oct 14 13:10:23 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: 22943 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 E10CA44988A for ; Wed, 14 Oct 2020 16:10:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C823868BBEA; Wed, 14 Oct 2020 16:10:35 +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 80D2768B839 for ; Wed, 14 Oct 2020 16:10:29 +0300 (EEST) Date: Wed, 14 Oct 2020 13:10:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602681028; bh=HAyeRG56w2zbpKRu4aaddnC9fZW2Mx0kp8E8f/hPxjk=; h=Date:To:From:Cc:Reply-To:Subject:From; b=lEFjGCDBtU5jSz2U/TpI86UMoQr/0s3UxlAA/5wCzuH7E2IMLvWJcJpAtzMzCEtbc zjq444nWTkd1rHkkTfdU4XKknxGyT38yWhckeisCz1P3kOGWa1mDdUwGop0fTDWkio qdc73Tmy2bdG2OqAqBZwqwvYOJl3jUo4b3jUbzUhbVET6dqiFIUAbUOKudE2yEXUkP 1OY3nU4oH7dndP6/c0kicBOWylnW8Sz1fkG5TGt5+gotuob4ZJ5OJ724mB6H+ItM/u hNPrubKnmjVF+9n9HRhsKIQofC1E6MLeQ7BEEh0yBM/jvHzuj7hY0RtJSu7USvmRth RmgnT1BZm6Iaw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-5-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 5/7] avcodec/adpcm_yamaha: support variable block size for encoding 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index d234d3dbf2..800a9b0b00 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -142,8 +142,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) } break; case AV_CODEC_ID_ADPCM_YAMAHA: - avctx->frame_size = BLKSIZE * 2 / avctx->channels; - avctx->block_align = BLKSIZE; + avctx->frame_size = s->block_size * 2 / avctx->channels; + avctx->block_align = s->block_size; break; case AV_CODEC_ID_ADPCM_SWF: if (avctx->sample_rate != 11025 && From patchwork Wed Oct 14 13:10:40 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: 22944 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 C811044988A for ; Wed, 14 Oct 2020 16:11:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4C5A68BBFF; Wed, 14 Oct 2020 16:11:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D35DB68BAAD for ; Wed, 14 Oct 2020 16:10:53 +0300 (EEST) Date: Wed, 14 Oct 2020 13:10:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602681053; bh=lwjczuOdTvVpAj4XY9LVDW90dD5JKiMlqWk+IN95Gck=; h=Date:To:From:Cc:Reply-To:Subject:From; b=ELQu+/DbjKxXTs/CXSDt7TXh1eVzHQSyCYpS0OMdqVpy4Zfk8DG2RkVuquvglmUMV xcDx4IW5inCuCl89+6k8uRM0jLPDXTsXfOhqUKGmGA9n7hl0cA8jJOpi4HFKvPKOy3 pjt6it38X9JL6Sx8QnSt1qTZkkwCAi0xLtVhuW7eyl5Rlw93iDvuX8EHqIWdg2X2Kl Q2R2rd75zIGIEVnaFoBxEGTgDrSqBAykT5H35GHYM7/utHrWwEluuoXdOb2IFIWOfb JorQKUQsTuZUsYMqqgipNZAzm8VDdkb9VE5N4/tSg06ex5mE15/UO9YP8n4mzJKpXV C9mStRHt6x9uw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-6-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 6/7] avcodec/adpcm_ima_wav: support variable block size for encoding 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 800a9b0b00..83c7e7ee05 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -113,11 +113,11 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) case AV_CODEC_ID_ADPCM_IMA_WAV: /* each 16 bits sample gives one nibble and we have 4 bytes per channel overhead */ - avctx->frame_size = (BLKSIZE - 4 * avctx->channels) * 8 / + avctx->frame_size = (s->block_size - 4 * avctx->channels) * 8 / (4 * avctx->channels) + 1; /* seems frame_size isn't taken into account... have to buffer the samples :-( */ - avctx->block_align = BLKSIZE; + avctx->block_align = s->block_size; avctx->bits_per_coded_sample = 4; break; case AV_CODEC_ID_ADPCM_IMA_QT: From patchwork Wed Oct 14 13:10:50 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: 22945 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 D29FB449A01 for ; Wed, 14 Oct 2020 16:11:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B991868BBFE; Wed, 14 Oct 2020 16:11:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC38E68BBFD for ; Wed, 14 Oct 2020 16:11:01 +0300 (EEST) Date: Wed, 14 Oct 2020 13:10:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602681061; bh=jIwnCCvlGO+1oJh0og/U4T2zmdRwpdOFyo0CDjcToq4=; h=Date:To:From:Cc:Reply-To:Subject:From; b=lyW1fYhQPBKvjG5t4kBtWmp7iJdrEH0elUBi0ZwvTz8vWnCgFMTJmpwVSgTOVbA8Y CyvEO3EsUXLzZ5uiDVPdGa4StFdhG5z2ub6I3lSOZM++LeeGNL7vPHDV0gw990+NkG eEQ71Wepp0IP1x25lvnAh8WSMr6GSy9FJUhOAX9xNckXay30pKUZz/AZ6jizzD4/D1 Il3uKOClA4SAZ05Rpgv0Ia5Ud8s2QpuQW51YdbigAAQ+A7ncQQi+OYo9K+oj7EoQZl NiaSkmKggQsBJohTR5qgmJU9BUPp/MNPkQa75u8urRlrTLWuzN+hrLFjIba5cSQ8EJ sPNv/UMK5k8mw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-7-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 7/7] avcodec/adpcmenc: remove BLKSIZE #define 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/adpcm.h | 2 -- libavcodec/adpcmenc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/adpcm.h b/libavcodec/adpcm.h index dc0d49ac61..0ffc3da1d0 100644 --- a/libavcodec/adpcm.h +++ b/libavcodec/adpcm.h @@ -28,8 +28,6 @@ #include -#define BLKSIZE 1024 - typedef struct ADPCMChannelStatus { int predictor; int16_t step_index; diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 83c7e7ee05..bb59cb9849 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -857,7 +857,7 @@ static const AVOption options[] = { .help = "set the block size", .offset = offsetof(ADPCMEncodeContext, block_size), .type = AV_OPT_TYPE_INT, - .default_val = {.i64 = BLKSIZE}, + .default_val = {.i64 = 1024}, .min = 32, .max = 8192, /* FIXME: Reasonable upper limit? */ .flags = AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM