From patchwork Mon Oct 19 22:44:20 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: 23095 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 3D94944A381 for ; Tue, 20 Oct 2020 01:44:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F27A68B6F8; Tue, 20 Oct 2020 01:44:39 +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 7B1B468B6D0 for ; Tue, 20 Oct 2020 01:44:33 +0300 (EEST) Date: Mon, 19 Oct 2020 22:44:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147472; bh=cWizECEinNbSqn4TsxyZdmWoDJ5gzABzlBivSyFzHS4=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=dCUR6qq43mLvkKHDOE9qfZOeUbO0mQFoN/7F5rJMT+ZwGrAknW06/0Enixamn6f2R a9ICDbtxo3XXYMzsGZRHM8WyUJmxR0eX3GNpNDww8nz4Ljo895MQV11lqCfOeQOxIW lQXjww9zyBP5WryAMYQPbOCRNnGqJkE8N1BWv5bpaTGRba2P44uuaeP9rEJZxqxsDV oiix+KvWPBeoFKFyU/JqU1sSdfHktUirUo+PfU6AWyy9W54JVTvunVnlLQuKbSHJZM BFnKIhYFHZiQiasMkqUiFCWnEypJbIrdWw/R7U8tXK+vDStu69WIsACXds9xbeVKwC xSGtLmoWjd3DQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201019224335.11874-3-zane@zanevaniperen.com> In-Reply-To: <20201019224335.11874-1-zane@zanevaniperen.com> References: <20201019224335.11874-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 v2 2/6] avcodec/adpcm_swf: support decoding multiple fixed-sized blocks at once 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" For incoming packets from WAV. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f7da3dcf89..fef1e6714c 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -880,7 +880,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, } case AV_CODEC_ID_ADPCM_SWF: { - int buf_bits = buf_size * 8 - 2; + int buf_bits = (avctx->block_align ? avctx->block_align : buf_size) * 8 - 2; int nbits = (bytestream2_get_byte(gb) >> 6) + 2; int block_hdr_size = 22 * ch; int block_size = block_hdr_size + nbits * ch * 4095; @@ -889,6 +889,9 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, nb_samples = nblocks * 4096; if (bits_left >= block_hdr_size) nb_samples += 1 + (bits_left - block_hdr_size) / (nbits * ch); + + if (avctx->block_align) + nb_samples *= buf_size / avctx->block_align; break; } case AV_CODEC_ID_ADPCM_THP: @@ -1767,9 +1770,17 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case AV_CODEC_ID_ADPCM_SWF: - adpcm_swf_decode(avctx, buf, buf_size, samples); + { + const int nb_blocks = avctx->block_align ? avpkt->size / avctx->block_align : 1; + const int block_size = avctx->block_align ? avctx->block_align : avpkt->size; + + for (int block = 0; block < nb_blocks; block++) { + adpcm_swf_decode(avctx, buf + block * block_size, block_size, samples); + samples += nb_samples / nb_blocks; + } bytestream2_seek(&gb, 0, SEEK_END); break; + } case AV_CODEC_ID_ADPCM_YAMAHA: for (n = nb_samples >> (1 - st); n > 0; n--) { int v = bytestream2_get_byteu(&gb);