From patchwork Fri Sep 18 12:05:01 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: 22473 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 635DD44A787 for ; Fri, 18 Sep 2020 15:05:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5209968B9A3; Fri, 18 Sep 2020 15:05: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 A265668B920 for ; Fri, 18 Sep 2020 15:05:09 +0300 (EEST) Date: Fri, 18 Sep 2020 12:05:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600430708; bh=FJ8i+/MVupiFAgt4lO/ZFK5P+Wt9XYU0bQgMZjxom4Y=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=JxmSf5lVvacI0nlKSTSl9Hs5061XbK3QOryFkeegs69nVmJ1q6Z3S7CEdVoNJXU1p 1ZqGEXoUSZECriqmlSNiEo0MRcwc3vv1vmxv8srK4IndBqNoA6Wy5zVbBDOSkBYhYg bWxux4L7/9W2ZN8DeyWg7ABk007nyS+XY/NgP9PybPamIJcbRp6TChx/mMDbTsofy+ auqYWLpfhWOUbz66PzdnFZz4cVFBwb6k2HJNNXhMGCxQvui6Oigqn7KWHyRiibYv9x udhN/qgcTezFpcHOPY3dRgDr0yRvM8a+DTfwB5rA8kKHoX65RIboVBXurHaIdzWux4 NTMncdvSy33Bg== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200918120416.7319-6-zane@zanevaniperen.com> In-Reply-To: <20200918120416.7319-1-zane@zanevaniperen.com> References: <20200918120416.7319-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 5/7] 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 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c index 122f616ecc..a3e9846c74 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,21 +365,20 @@ 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) + if ((ret = ff_argo_asf_read(s->pb, st, pkt, ckhdr, brp->basf.blocks_read)) < 0) return ret; + blocks_read = ret; + if ((ret = avio_seek(s->pb, old, SEEK_SET)) < 0) return ret; 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; - /* Need the ceil() because ((32 * 1000) / 44100) < 1 */ - brp->basf.lastpts += ceilf((ckhdr->num_samples * 1000.0f) / ckhdr->sample_rate); + brp->basf.blocks_read += blocks_read; + /* Need the ceil() because ((1 * 32 * 1000) / 44100) < 1 */ + brp->basf.lastpts += ceilf((blocks_read * ckhdr->num_samples * 1000.0f) / ckhdr->sample_rate); return 1; }