From patchwork Sat Mar 20 03:43:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26499 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 8CD1044B183 for ; Sat, 20 Mar 2021 05:43:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4871E68A817; Sat, 20 Mar 2021 05:43:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62E1868A7FC for ; Sat, 20 Mar 2021 05:43:08 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id d8-20020a1c1d080000b029010f15546281so5939565wmd.4 for ; Fri, 19 Mar 2021 20:43:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=/i8J5cFXJl/edCnISvo5DmTWPiYG4y+jmaaybDxDveA=; b=V03bOZYPjfpcpNgxM5RLa2smnetD5ah8dPrR7RWyTWGte2J2L8G3PAHEFkpXxpDaX6 i+5WyHuPNts/etq2ZUJMXBrVSvpWG3yCg52T60G/r6dMaddGonRHgjb1/bcuhlPk0Kqs Ixpt34+CifijWWDcowulryzlfJMbDlEXA5+1OfS1GC+UChpzY5hREkqclpQWy/tYK/vI 5V+DIhb2LrRm8TXlQzEHsmNtkH3+HO73ZptxRbdM2zmHnRCiz3lgWXU8PbP+aUNSK1I6 6gwdNXN03v9aXhprYxkNuXcDesgaf1J6j50at1CqhG5aLyzvXxSnaaFwLAC1iBi7Wxh3 9plQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=/i8J5cFXJl/edCnISvo5DmTWPiYG4y+jmaaybDxDveA=; b=fZZsCtJTByRjiD8gD03yx8GxE2tqZCxsr/ZVzWX2VLy7UvPMuGgIvDYKScuCM1scvs /Mv0Y/qc2p75v+RRyzG4KeTFh68xu3TuCcXJ5tcujxaYffIpVcmfDBc0qonn/cCCJ/cR jKIKOLWmhV/74qNNOdm3Rrq9byyT8JRa+7Jeb8r4lssvsEKiIZ+N57FyHoL64dGV9mkD w5w1vxnGMEzkypb9ANt5Lw6SIJwuLBWxuOVoAaUgvgbugr/zGivt6DuHZAjlqneDgBrq rUm/2tL6xJLZ0IJlk8o2MNdBHbRVULKQtg48iQaWeDY7Y/Bn5bBnH3GmzzYlIJOf6UA4 8XVg== X-Gm-Message-State: AOAM5310hiz044ZmDII3HUnyGwpwRQJJaJlsnIkH6l4ZrMBpsOfUX+EX hSW7wrg0g6gZ5NDrAA2xOzbvjvYrgpSm6g== X-Google-Smtp-Source: ABdhPJyqUN7sMCixgnfN2Amms8kXZIfFDiNr2rr5cS67jOrgQ6V5OHsy+e9zyBnZlnQH7KdpISWQdA== X-Received: by 2002:a7b:c209:: with SMTP id x9mr6166806wmi.92.1616211787576; Fri, 19 Mar 2021 20:43:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id j30sm11318894wrj.62.2021.03.19.20.43.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 20:43:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Mar 2021 04:43:01 +0100 Message-Id: <20210320034301.2818115-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/s337m: Use av_get_packet() to read packet 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/s337m.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavformat/s337m.c b/libavformat/s337m.c index 9e3c8ed1ba..9d1b52eb61 100644 --- a/libavformat/s337m.c +++ b/libavformat/s337m.c @@ -147,7 +147,6 @@ static int s337m_read_packet(AVFormatContext *s, AVPacket *pkt) uint64_t state = 0; int ret, data_type, data_size, offset; enum AVCodecID codec; - int64_t pos; while (!IS_LE_MARKER(state)) { state = (state << 8) | avio_r8(pb); @@ -163,19 +162,11 @@ static int s337m_read_packet(AVFormatContext *s, AVPacket *pkt) data_size = avio_rl24(pb); } - pos = avio_tell(pb); - if ((ret = s337m_get_offset_and_codec(s, state, data_type, data_size, &offset, &codec)) < 0) return ret; - if ((ret = av_new_packet(pkt, offset)) < 0) - return ret; - - pkt->pos = pos; - - if (avio_read(pb, pkt->data, pkt->size) < pkt->size) { - return AVERROR_EOF; - } + if ((ret = av_get_packet(pb, pkt, offset)) != offset) + return ret < 0 ? ret : AVERROR_EOF; if (IS_16LE_MARKER(state)) ff_spdif_bswap_buf16((uint16_t *)pkt->data, (uint16_t *)pkt->data, pkt->size >> 1);