From patchwork Fri Sep 18 12:04:57 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: 22471 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 5ABD044A787 for ; Fri, 18 Sep 2020 15:05:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48BC768B921; Fri, 18 Sep 2020 15:05:07 +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 7342268B878 for ; Fri, 18 Sep 2020 15:05:00 +0300 (EEST) Date: Fri, 18 Sep 2020 12:04:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600430699; bh=V9DNeHd69AeP0IxOA5glxK6L+i1BqS3nI3xeKNN7eFI=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=JtI58wB0aQ2p5U5WYiZP9h13FVxGs9O69veMlkhsbcaTiZWIubXobT2rc3SASxdIh OUzprB9KlexWWpOr+SPjHFjyCdIC0Ggl1EyWElCwsPqnFy1VN2P/KxCc+7ffI6lmkL 3h/a2JJdJxpAFTtq512Q8CY/aELaIePfAm8ejlv9mTnu4dkr6lLSSdXCNUxfa+AAhd OKxuQYDBGqJYNQAqnKe/Geq7O7uZVlzX7CN5jDcg7S6Mjd6AjAeVV1B3z7MpX00him bU49feJ6uPo175sfLZppFhd7G8by8KTYlEvwc0s8uQZ5yb54WQG98LvjISgtVphrVx t54ViV7v4jXbg== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200918120416.7319-5-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 4/7] 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 | 45 ++++++++++++++++++++++++------------------ libavformat/argo_asf.h | 2 ++ 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 048e5441d6..0e9ccbd02f 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -144,6 +144,30 @@ 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); + + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; + return ret / st->codecpar->block_align; +} + #if CONFIG_ARGO_ASF_DEMUXER /* * Known versions: @@ -215,29 +239,12 @@ 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) + if ((ret = ff_argo_asf_read(s->pb, s->streams[0], pkt, &asf->ckhdr, asf->blocks_read)) < 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; + asf->blocks_read += ret; return 0; } diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index eb2669a63f..e676dfb882 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 */