From patchwork Fri Mar 12 10:53:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26348 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 91B6E44AD06 for ; Fri, 12 Mar 2021 12:53:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73F9C68B0FC; Fri, 12 Mar 2021 12:53:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C451268AF87 for ; Fri, 12 Mar 2021 12:53:11 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id r15-20020a05600c35cfb029010e639ca09eso15520187wmq.1 for ; Fri, 12 Mar 2021 02:53:11 -0800 (PST) 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=gl8sBR1h2GT6u3Q0AopH6suiMVxpUUSLjeHGQeUJ2CY=; b=gQsxgg+OnCiKEvpHlvjJLT5PvipSw2v0zW1Bwtn1hIUoeppDKPXfLb65ZdcLRNMhNR +IkeUdXgfPBhDmWjv0GJ8w6bmR4bTDecFRwCDRzCv9z8dDDNAFuo1NX1R5DXk2qMrytU 1396RboX6uE1rkXbILKYh+WcS2Wr6QqqzBRqROXgcF5UDeotaGrv3fMrAt/FC4vnEGBz B26B7bwbbFlXbGMWGmzLJx6SvAJagDqoSjPpl8dDp653cXWF+nuREgxow9lAzWI0yjSy 2W44z+VOkyM8GobkpoSC7ZkRxCWko9F4wJxb7EtEnlOt0sG+mUpDDAXTtsCVgsaJrCai tu7w== 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=gl8sBR1h2GT6u3Q0AopH6suiMVxpUUSLjeHGQeUJ2CY=; b=umVZM5yU4POknC/liG7TluEjoWy9jbRmUpQn+tPWk2x8FvxEogI1tQAyYS+w3MnrBz b8l2lNmEfUTJQdSlQ4uyxCF90fO8L5Ux1S7CvuCtRwYTs82giU+2dKCTvYviXSEmTD8g CYUtrpU6jrNiVGXxcmd5LQgE0tMABJWetaHmpmRCPAFViZc9WQN21kIJhl7Yn2DfBWAR MmSjMjWyCm3NxUBxQAsvv56gSfTYxTA6hHTpwreHy2jj1GTmWDG7+VeP5cw51sppcey8 bsqyTpnfNEIPidv4uV3buWS6TbvYySvdYe/F/I4SWSmjxysK/e0YmQmKv4X5hQEkGn3v 1EOQ== X-Gm-Message-State: AOAM531/W76wHKh0w+ifjg92HX0OwVKMxs+Vsm7KIRGys9fiVgFWxukk ExWvOZ+GqsRKUtt9E++EQHjLmLa7INU= X-Google-Smtp-Source: ABdhPJx2z0L91kkCakJWpyr74D1XpJEJfXGJ/OMHhJJSnx+F9zy5NLoqKDzTRhwkoYsAhX+R+ibmsw== X-Received: by 2002:a05:600c:220d:: with SMTP id z13mr12548944wml.1.1615546391066; Fri, 12 Mar 2021 02:53:11 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id v18sm8242994wrf.41.2021.03.12.02.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 02:53:10 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 11:53:02 +0100 Message-Id: <20210312105303.1844599-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/adp, svs: Remove redundant av_shrink_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" av_get_packet() already makes sure that the packet size is accurate and that the packet data is zero-padded even when one could not read as much as desired. Signed-off-by: Andreas Rheinhardt --- libavformat/adp.c | 8 ++------ libavformat/svs.c | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libavformat/adp.c b/libavformat/adp.c index 8668c78fe4..b0ee09753e 100644 --- a/libavformat/adp.c +++ b/libavformat/adp.c @@ -75,13 +75,9 @@ static int adp_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; ret = av_get_packet(s->pb, pkt, size); + if (ret < 0) + return ret; - if (ret != size) { - if (ret < 0) { - return ret; - } - av_shrink_packet(pkt, ret); - } pkt->stream_index = 0; return ret; diff --git a/libavformat/svs.c b/libavformat/svs.c index d4285ed306..8be26c5bc3 100644 --- a/libavformat/svs.c +++ b/libavformat/svs.c @@ -79,7 +79,6 @@ static int svs_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret != 32 * 256) { if (ret < 0) return ret; - av_shrink_packet(pkt, ret); pkt->flags &= ~AV_PKT_FLAG_CORRUPT; } pkt->stream_index = 0;