From patchwork Wed Sep 16 07:38:59 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: 22435 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 886B4449E1E for ; Wed, 16 Sep 2020 10:39:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AA5468B9E1; Wed, 16 Sep 2020 10:39:11 +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 E168368B970 for ; Wed, 16 Sep 2020 10:39:04 +0300 (EEST) Date: Wed, 16 Sep 2020 07:38:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600241943; bh=HT880qD7N1Zbw4qW3W0tqT3xgcybxOFI8wqe0TrTjYk=; h=Date:To:From:Cc:Reply-To:Subject:From; b=Gq1N9DjGqoB603uxE3PGg71L3hcG4SjYP981TEUNuMDiYi6u8Ogu+amaGHsJ6zK4e oTvLquQauP08oVK7jISJqoxWWKZ9mO6h5HYCBAB+pG2S5lq+03YygF84Ih4ee901J4 uRi+DMytYr+gqUidPZL9LoPBjQxaj1kgCGe6svczMo1JA9G9g7yQ8OOr1kRaDALSvy yDT9XixYqINQgut4BKMCgZU0lX2GD48P44QIJ2rHx4BSBdxojUsZ/05z0eri5rvCYK PuIJp6vgkoYbTXSN7y03DdyFl4g0wTQhu1LjBEsssX9Rxo8DI4mwMSF/Vkpebnt6u9 hT4jXAoRcGznQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200916073836.27644-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/5] avcodec/adpcm_argo: support decoding multiple frames 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" Increases decode speed significantly. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index e409a3aa6a..14be1f4f88 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -181,7 +181,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) c->vqa_version = AV_RL16(avctx->extradata); break; case AV_CODEC_ID_ADPCM_ARGO: - if (avctx->bits_per_coded_sample != 4) + if (avctx->bits_per_coded_sample != 4 || avctx->block_align != 17 * avctx->channels) return AVERROR_INVALIDDATA; break; case AV_CODEC_ID_ADPCM_ZORK: @@ -745,11 +745,6 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, return 0; nb_samples = 64; break; - case AV_CODEC_ID_ADPCM_ARGO: - if (buf_size < 17 * ch) - return 0; - nb_samples = 32; - break; /* simple 4-bit adpcm */ case AV_CODEC_ID_ADPCM_CT: case AV_CODEC_ID_ADPCM_IMA_APC: @@ -922,6 +917,9 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, case AV_CODEC_ID_ADPCM_PSX: nb_samples = buf_size / (16 * ch) * 28; break; + case AV_CODEC_ID_ADPCM_ARGO: + nb_samples = buf_size / avctx->block_align * 32; + break; case AV_CODEC_ID_ADPCM_ZORK: nb_samples = buf_size / ch; break; @@ -2023,22 +2021,24 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, * Each block relies on the previous two samples of each channel. * They should be 0 initially. */ + for (int block = 0; block < avpkt->size / avctx->block_align; block++) { for (channel = 0; channel < avctx->channels; channel++) { int control, shift; - samples = samples_p[channel]; + samples = samples_p[channel] + block * 32; cs = c->status + channel; /* Get the control byte and decode the samples, 2 at a time. */ control = bytestream2_get_byteu(&gb); shift = (control >> 4) + 2; - for (n = 0; n < nb_samples / 2; n++) { + for (n = 0; n < 16; n++) { int sample = bytestream2_get_byteu(&gb); *samples++ = ff_adpcm_argo_expand_nibble(cs, sample >> 4, shift, control & 0x04); *samples++ = ff_adpcm_argo_expand_nibble(cs, sample >> 0, shift, control & 0x04); } } + } break; case AV_CODEC_ID_ADPCM_ZORK: if (!c->has_status) { From patchwork Wed Sep 16 07:39:06 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: 22436 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 B31B0449E1E for ; Wed, 16 Sep 2020 10:39:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B9D268BB5C; Wed, 16 Sep 2020 10:39:17 +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 8A5CD68BA0C for ; Wed, 16 Sep 2020 10:39:11 +0300 (EEST) Date: Wed, 16 Sep 2020 07:39:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600241950; bh=xoZvNiElvyFmIvij5rBqbV4nhsJGRhxFyJy/uU320+0=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Vf6wkxLMNoYjJNUmYMCXhYcdZy269p6gxaz9AdRS23rW2CPndrNUobolfkiF4Acwp KvwZaUF6Di5uay/mvXgyjl/FnHTRkQpv90MSG8SdjeA0osbIH6So46QIVdSwWFpcES dy/7+rYDq1Q8gKiV5Xks9OFn4VOf7l5MEdnVpM2uH+O8PQrlqBAg84Ox89keCcgmB0 MSTLoHaT7HrU6/AHDgEauab/Dc9kbjWPwdW8BlgVETrj8U2qhfonz0y1RiRweJkk3W /j7OEIYTw09J5k14GmtdOVnk8ZUAOqgDVtd+P2jtsCD0FpVekm6884607l2yWegS9N tqR5v3IZrkryw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200916073836.27644-2-zane@zanevaniperen.com> In-Reply-To: <20200916073836.27644-1-zane@zanevaniperen.com> References: <20200916073836.27644-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/5] avcodec/adpcm_{psx, argo}: add missing indent 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.c | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 14be1f4f88..4755308824 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1966,42 +1966,42 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, case AV_CODEC_ID_ADPCM_PSX: for (int block = 0; block < avpkt->size / FFMAX(avctx->block_align, 16 * avctx->channels); block++) { int nb_samples_per_block = 28 * FFMAX(avctx->block_align, 16 * avctx->channels) / (16 * avctx->channels); - for (channel = 0; channel < avctx->channels; channel++) { - samples = samples_p[channel] + block * nb_samples_per_block; - - /* Read in every sample for this channel. */ - for (i = 0; i < nb_samples_per_block / 28; i++) { - int filter, shift, flag, byte; - - filter = bytestream2_get_byteu(&gb); - shift = filter & 0xf; - filter = filter >> 4; - if (filter >= FF_ARRAY_ELEMS(xa_adpcm_table)) - return AVERROR_INVALIDDATA; - flag = bytestream2_get_byteu(&gb); - - /* Decode 28 samples. */ - for (n = 0; n < 28; n++) { - int sample = 0, scale; - - if (flag < 0x07) { - if (n & 1) { - scale = sign_extend(byte >> 4, 4); - } else { - byte = bytestream2_get_byteu(&gb); - scale = sign_extend(byte, 4); + for (channel = 0; channel < avctx->channels; channel++) { + samples = samples_p[channel] + block * nb_samples_per_block; + + /* Read in every sample for this channel. */ + for (i = 0; i < nb_samples_per_block / 28; i++) { + int filter, shift, flag, byte; + + filter = bytestream2_get_byteu(&gb); + shift = filter & 0xf; + filter = filter >> 4; + if (filter >= FF_ARRAY_ELEMS(xa_adpcm_table)) + return AVERROR_INVALIDDATA; + flag = bytestream2_get_byteu(&gb); + + /* Decode 28 samples. */ + for (n = 0; n < 28; n++) { + int sample = 0, scale; + + if (flag < 0x07) { + if (n & 1) { + scale = sign_extend(byte >> 4, 4); + } else { + byte = bytestream2_get_byteu(&gb); + scale = sign_extend(byte, 4); + } + + scale = scale * (1 << 12); + sample = (int)((scale >> shift) + (c->status[channel].sample1 * xa_adpcm_table[filter][0] + c->status[channel].sample2 * xa_adpcm_table[filter][1]) / 64); } - - scale = scale * (1 << 12); - sample = (int)((scale >> shift) + (c->status[channel].sample1 * xa_adpcm_table[filter][0] + c->status[channel].sample2 * xa_adpcm_table[filter][1]) / 64); + *samples++ = av_clip_int16(sample); + c->status[channel].sample2 = c->status[channel].sample1; + c->status[channel].sample1 = sample; } - *samples++ = av_clip_int16(sample); - c->status[channel].sample2 = c->status[channel].sample1; - c->status[channel].sample1 = sample; } } } - } break; case AV_CODEC_ID_ADPCM_ARGO: /* @@ -2022,23 +2022,23 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, * They should be 0 initially. */ for (int block = 0; block < avpkt->size / avctx->block_align; block++) { - for (channel = 0; channel < avctx->channels; channel++) { - int control, shift; + for (channel = 0; channel < avctx->channels; channel++) { + int control, shift; - samples = samples_p[channel] + block * 32; - cs = c->status + channel; + samples = samples_p[channel] + block * 32; + cs = c->status + channel; - /* Get the control byte and decode the samples, 2 at a time. */ - control = bytestream2_get_byteu(&gb); - shift = (control >> 4) + 2; + /* Get the control byte and decode the samples, 2 at a time. */ + control = bytestream2_get_byteu(&gb); + shift = (control >> 4) + 2; - for (n = 0; n < 16; n++) { - int sample = bytestream2_get_byteu(&gb); - *samples++ = ff_adpcm_argo_expand_nibble(cs, sample >> 4, shift, control & 0x04); - *samples++ = ff_adpcm_argo_expand_nibble(cs, sample >> 0, shift, control & 0x04); + for (n = 0; n < 16; n++) { + int sample = bytestream2_get_byteu(&gb); + *samples++ = ff_adpcm_argo_expand_nibble(cs, sample >> 4, shift, control & 0x04); + *samples++ = ff_adpcm_argo_expand_nibble(cs, sample >> 0, shift, control & 0x04); + } } } - } break; case AV_CODEC_ID_ADPCM_ZORK: if (!c->has_status) { From patchwork Wed Sep 16 07:39: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: 22437 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 ED2D7449E1E for ; Wed, 16 Sep 2020 10:39:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6BFE68BC6E; Wed, 16 Sep 2020 10:39:25 +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 8733D68BBF6 for ; Wed, 16 Sep 2020 10:39:19 +0300 (EEST) Date: Wed, 16 Sep 2020 07:39:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600241958; bh=uao+XC9JSDT3fKINfzCwEUR7CzHeG4w7lVRT1i2H0pk=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=0PC82UrwbpMBEQqqYajIh+fBjR0M/4BoEP473QBEYQnaf8P65q63EncHHnoJgLKst LYUpsFGYOWmPTfih5mpMzWn0FjaHu99ErAVDHFMtgDCioQI3dBEgaaK3jAaQzhmE9y 3c5mUuvI3GI1MnT9r8IWxrUItPgFTPsG56cNUfZ/CkAEkVyXhX8UidT/vLE5MTAhex P6oiOKVu/pBTfHVtiDL6UZTbzhH0MNPMV1GXeK7RZKzyv/zrMujgpcueX5KT+3Bpie OnPPLeJjNFxKMsU7dFnqa97lVd/mMxf9N7R9b+L6rAv6EMPDF2Ozgxn6UcCbstuZTa XpFOqIwhBTxhg== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200916073836.27644-3-zane@zanevaniperen.com> In-Reply-To: <20200916073836.27644-1-zane@zanevaniperen.com> References: <20200916073836.27644-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/5] avformat/argo_asf: read multiple 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" Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index b1632f3ba5..deb64f7b1c 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -26,6 +26,9 @@ #include "libavutil/opt.h" #include "argo_asf.h" +/* Maximum number of blocks to read at once. */ +#define ASF_NB_BLOCKS 32 + typedef struct ArgoASFDemuxContext { ArgoASFFileHeader fhdr; ArgoASFChunkHeader ckhdr; @@ -125,12 +128,10 @@ int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFFileHeader *fhdr, * (nchannel control bytes) + ((bytes_per_channel) * nchannel) * For mono, this is 17. For stereo, this is 34. */ - st->codecpar->frame_size = st->codecpar->channels + + st->codecpar->block_align = st->codecpar->channels + (ckhdr->num_samples / 2) * st->codecpar->channels; - st->codecpar->block_align = st->codecpar->frame_size; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; @@ -221,15 +222,21 @@ static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt) if (asf->blocks_read >= asf->ckhdr.num_blocks) return AVERROR_EOF; - if ((ret = av_get_packet(pb, pkt, st->codecpar->frame_size)) < 0) + ret = av_get_packet(pb, pkt, st->codecpar->block_align * + FFMIN(ASF_NB_BLOCKS, asf->ckhdr.num_blocks - asf->blocks_read)); + if (ret < 0) return ret; - else if (ret != st->codecpar->frame_size) + + /* Something real screwy is going on. */ + if (ret % st->codecpar->block_align != 0) return AVERROR_INVALIDDATA; + pkt->stream_index = st->index; - pkt->duration = asf->ckhdr.num_samples; + pkt->duration = asf->ckhdr.num_samples * (ret / st->codecpar->block_align); + asf->blocks_read += (ret / st->codecpar->block_align); - ++asf->blocks_read; + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; return 0; } From patchwork Wed Sep 16 07:39:21 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: 22438 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 16281449E1E for ; Wed, 16 Sep 2020 10:39:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC29568BC53; Wed, 16 Sep 2020 10:39:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD36D68BBF6 for ; Wed, 16 Sep 2020 10:39:30 +0300 (EEST) Date: Wed, 16 Sep 2020 07:39:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600241969; bh=oCa8tL1TmNR1TvsFPK48H/x7FfFQgSgq4guCOHpty38=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Vf0eJf9UdlEogOH2XWN/WpotaxQUStM6edOJ8fhg+XAIzk+EjZBFuKlYe708hHWx4 VK7OzdhinP5O/Cs1CNc/up65f9aegjX1NSyuE4foZ0L/DdphzEFaPWvEvxxWnEKof1 jXXSzlZ+UKVtWLP2OkHiHWycZUAenR2FEmrHl4nTYyuL57f6M9Iq1N0NT/Qj/QmDGq 0ThN1/LCNa5mVhG4R/1wStrxmeXlk2z8CJy0J2H+w+KJ3+O+Y68X5fOTRaEbXMvmX7 ShL4ckG/gy4RtucX8JIOXYEtkSGpqgXvv1daz0UveAo0NIKcmJilJuv2YkTOIKsFSd BnDpUrpWJgzGg== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200916073836.27644-4-zane@zanevaniperen.com> In-Reply-To: <20200916073836.27644-1-zane@zanevaniperen.com> References: <20200916073836.27644-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 4/5] avformat/argo_asf: add ff_argo_asf_read() 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 the argo_brp demuxer. Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 50 ++++++++++++++++++++++-------------------- libavformat/argo_asf.h | 2 ++ 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index deb64f7b1c..58d0c4fd23 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -143,6 +143,31 @@ int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFFileHeader *fhdr, return 0; } +int ff_argo_asf_read(AVIOContext *pb, AVStream *st, AVPacket *pkt, + const ArgoASFChunkHeader *ckhdr, uint32_t *blocks_read) +{ + int64_t ret; + + if (*blocks_read >= ckhdr->num_blocks) + return AVERROR_EOF; + + ret = av_get_packet(pb, pkt, st->codecpar->block_align * + FFMIN(ASF_NB_BLOCKS, ckhdr->num_blocks - *blocks_read)); + if (ret < 0) + return ret; + + /* Something real screwy is going on. */ + if (ret % st->codecpar->block_align != 0) + return AVERROR_INVALIDDATA; + + pkt->stream_index = st->index; + pkt->duration = ckhdr->num_samples * (ret / st->codecpar->block_align); + *blocks_read += (ret / st->codecpar->block_align); + + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; + return 0; +} + #if CONFIG_ARGO_ASF_DEMUXER /* * Known versions: @@ -214,30 +239,7 @@ static int argo_asf_read_header(AVFormatContext *s) static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt) { ArgoASFDemuxContext *asf = s->priv_data; - - AVStream *st = s->streams[0]; - AVIOContext *pb = s->pb; - int ret; - - if (asf->blocks_read >= asf->ckhdr.num_blocks) - return AVERROR_EOF; - - ret = av_get_packet(pb, pkt, st->codecpar->block_align * - FFMIN(ASF_NB_BLOCKS, asf->ckhdr.num_blocks - asf->blocks_read)); - if (ret < 0) - return ret; - - /* Something real screwy is going on. */ - if (ret % st->codecpar->block_align != 0) - return AVERROR_INVALIDDATA; - - - pkt->stream_index = st->index; - pkt->duration = asf->ckhdr.num_samples * (ret / st->codecpar->block_align); - asf->blocks_read += (ret / st->codecpar->block_align); - - pkt->flags &= ~AV_PKT_FLAG_CORRUPT; - return 0; + return ff_argo_asf_read(s->pb, s->streams[0], pkt, &asf->ckhdr, &asf->blocks_read); } /* diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index eb2669a63f..0fd6aced58 100644 --- a/libavformat/argo_asf.h +++ b/libavformat/argo_asf.h @@ -67,5 +67,7 @@ int ff_argo_asf_validate_file_header(AVFormatContext *s, const ArgoASFFileHeade void ff_argo_asf_parse_chunk_header(ArgoASFChunkHeader *hdr, const uint8_t *buf); int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFFileHeader *fhdr, const ArgoASFChunkHeader *ckhdr); +int ff_argo_asf_read(AVIOContext *pb, AVStream *st, AVPacket *pkt, + const ArgoASFChunkHeader *ckhdr, uint32_t *blocks_read); #endif /* AVFORMAT_ARGO_ASF_H */ From patchwork Wed Sep 16 07:39:28 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: 22439 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 1A632449E1E for ; Wed, 16 Sep 2020 10:39:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06A7168BCA3; Wed, 16 Sep 2020 10:39:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDD1768BC99 for ; Wed, 16 Sep 2020 10:39:32 +0300 (EEST) Date: Wed, 16 Sep 2020 07:39:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600241972; bh=W1CDU+sX4K3XV+SpiYain2WhC7rVLe3NYjWsRZ8iW5Q=; h=Date:To:From:Cc:Reply-To:Subject:From; b=1xbtyZ+lRm36t9Ty+WifURebmtsS54s0a/iBI78PihO+ux64f1BEPpnX14Pmi7bgM FM702U38a7D5vc9piosVXGFERqKmQXe+4cPjb3kzl+3Qn0kH5CiTF1vEp9xicpZEYF 6ciEM3WhN16ciYrUMvV08TQU317yMj0sUxVZQexKJgpjYQRr+QdSuPHYDwiUzkwInG jNQMMQkgAQHnsGJhyDxo2dxg60oFe6ExAsCgJx9yeQaflKpDfOwlkv6aYWTM/qY1ct XhAeGwB9RqYlfT1lbDwefL0cHWh3p+haZr0tEygbJIEEpHHEzN1egvhrDQAgDIAjiI g+3/q/flz0U2Q== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200916073836.27644-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/5] avformat/argo_brp: support reading multiple ASF 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" Signed-off-by: Zane van Iperen --- libavformat/argo_brp.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c index 122f616ecc..4716ad85eb 100644 --- a/libavformat/argo_brp.c +++ b/libavformat/argo_brp.c @@ -86,7 +86,7 @@ typedef struct ArgoBRPDemuxContext { struct { int index; ArgoASFChunkHeader ckhdr; - int64_t blocks_read; + uint32_t blocks_read; int64_t offset; /* ms, not samples. */ int64_t lastpts; @@ -340,13 +340,14 @@ static int argo_brp_read_basf(AVFormatContext *s, AVPacket *pkt, ArgoBRPDemuxContext *brp, int ignorepts) { ArgoASFChunkHeader *ckhdr = &brp->basf.ckhdr; - AVCodecParameters *par; + AVStream *st; int64_t ret, old; + uint32_t blocks_read; if (brp->basf.index < 0) return 0; - par = s->streams[brp->basf.index]->codecpar; + st = s->streams[brp->basf.index]; if (brp->basf.blocks_read >= ckhdr->num_blocks) return 0; @@ -364,7 +365,8 @@ static int argo_brp_read_basf(AVFormatContext *s, AVPacket *pkt, else if (ret != brp->basf.offset) return AVERROR(EIO); - if ((ret = av_get_packet(s->pb, pkt, par->frame_size)) < 0) + blocks_read = brp->basf.blocks_read; + if ((ret = ff_argo_asf_read(s->pb, st, pkt, ckhdr, &blocks_read)) < 0) return ret; if ((ret = avio_seek(s->pb, old, SEEK_SET)) < 0) @@ -372,11 +374,8 @@ static int argo_brp_read_basf(AVFormatContext *s, AVPacket *pkt, else if (ret != old) return AVERROR(EIO); - pkt->stream_index = brp->basf.index; - pkt->duration = ckhdr->num_samples; - brp->basf.offset += pkt->size; - brp->basf.blocks_read += 1; + brp->basf.blocks_read = blocks_read; /* Need the ceil() because ((32 * 1000) / 44100) < 1 */ brp->basf.lastpts += ceilf((ckhdr->num_samples * 1000.0f) / ckhdr->sample_rate); return 1;