From patchwork Fri Mar 19 14:47:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26489 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 A854144B924 for ; Fri, 19 Mar 2021 16:54:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77E6E6881BB; Fri, 19 Mar 2021 16:54:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4879568029C for ; Fri, 19 Mar 2021 16:53:54 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id p19so5623940wmq.1 for ; Fri, 19 Mar 2021 07:53:54 -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:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=URd1mXinwbiKd8xVIXnk2J9k6BPjUAMnvTyPjkfXqw8=; b=HLyIPJzLFc7FNbvQJh+Ar9SOgZHDgCXWgdcngLODhI2tkL1usnk/d+tJSwiZwvSoa0 0fzxIgizETip7O/7iykgp0gRyqMr3qsiqAFXiJ4S4lf/hzcRs4ZyWnJi5BWVsN8wTGEn Cd1b4HE5eUFbpklBSNkyuhh/PUim1u5kLWegK6/9zUmLS0mvS5JLhM7D0PxLfdOJUbCP ZjXmdBwX4cZl1QHhj+2uhS3eRdOrst/Y5ceGhOygto6996z43mZuxXB3TCh2BafthHlq bfhe2hEegTN0AINdyJ91Kc1WU0PwQbqN2B2fSTcdCCuIK5Ze3vfjM87mjUJJPevx9yed 83tA== 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:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=URd1mXinwbiKd8xVIXnk2J9k6BPjUAMnvTyPjkfXqw8=; b=sVGsnroosWX4wj2frYmNOTPBs1E+LU8KytD2bH5IHbtaJQFjKLis06Wmx4lfxxrKkY 6r8DXmzjDB6mcCVu+6HmTVlycYAWOjmRFQEpThlcpatxqG4QkSb8E7ileYsrB3o+4S4s Bx1Bxqd01uPj4VGpYgtQHYn4Q6H8LdPDXRC8vt5NJNWDHzw2P+Jta3Jq8bC2MPbq7XfH ioli+eEuIMRfsopcFqdZhgVPq+S7MG1K/xVosS+0mtPWGvuD9RIc/daQlTvuCa8HXx6d DKWejt1Tv9fgOnUzSzg+HCFIZYbKmVpkmKRMFxZwOEWQsxOqOO7t0wya5iALT8cj6krw Vj0g== X-Gm-Message-State: AOAM531GXnE3NpZHvOrS7VcMJtThoDfBn6L0/JFl89AnAmJhrLXUHtMa n7Sb1T5lgufdcCJUcXq7z1tSZxmTlQTsMw== X-Google-Smtp-Source: ABdhPJwL2whk9vPZDtkBctxnci3e/Rt0G9mZY+fPpwMJtPdsxNSe7yeyqW3z3ERWGCXurdIfXtirbw== X-Received: by 2002:a1c:2203:: with SMTP id i3mr4028455wmi.163.1616165283577; Fri, 19 Mar 2021 07:48:03 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id m17sm8399951wrx.92.2021.03.19.07.48.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 07:48:03 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 15:47:54 +0100 Message-Id: <20210319144754.2322451-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <1d095ab4-6b8b-f1d6-1991-9ba39d6d5772@gmail.com> References: <1d095ab4-6b8b-f1d6-1991-9ba39d6d5772@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 02/18] avformat/utils: Always leave parse_pkt in blank state, avoid resetting 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: James Almer , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Always leaving said packet in a blank state after having used it allows to avoid having to reset it before one uses it; and it also allows to use it in more places than just in parse_packets() here. Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- Indeed an improvement. Thanks. libavformat/utils.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d9a08c9ccd..2bd6f45f1e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1427,9 +1427,7 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, int size = pkt->size; int ret = 0, got_output = flush; - if (size || flush) { - av_packet_unref(out_pkt); - } else if (st->parser->flags & PARSER_FLAG_COMPLETE_FRAMES) { + if (!size && !flush && st->parser->flags & PARSER_FLAG_COMPLETE_FRAMES) { // preserve 0-size sync packets compute_pkt_fields(s, st, st->parser, pkt, AV_NOPTS_VALUE, AV_NOPTS_VALUE); } @@ -1512,10 +1510,8 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, ret = avpriv_packet_list_put(&s->internal->parse_queue, &s->internal->parse_queue_end, out_pkt, NULL, 0); - if (ret < 0) { - av_packet_unref(out_pkt); + if (ret < 0) goto fail; - } } /* end of the stream => close and free the parser */ @@ -1525,6 +1521,8 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, } fail: + if (ret < 0) + av_packet_unref(out_pkt); av_packet_unref(pkt); return ret; }