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;