From patchwork Mon Dec 13 10:47:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 32415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5255067iog; Mon, 13 Dec 2021 02:49:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDKO+ElH4x6blpsbaUPZRCwDkGKcNnS5AXU7fyO470IqVrqf8g1zAvpM4e+dnlxqMY7t8B X-Received: by 2002:a17:907:2da3:: with SMTP id gt35mr43773604ejc.314.1639392540590; Mon, 13 Dec 2021 02:49:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639392540; cv=none; d=google.com; s=arc-20160816; b=s+A5Oq/t6Mzf/EXqnM1Th2A0DGYqdDt9nLfnfVAnDU5tB8YkfkD10tvpg4GL/oRQfe N4vRvtATrHKFvQG27NS+EoYfMz/jEnk+wUVfHrTivQAhQKEB7GklJQjU1C2YQUXlHZFF W21rSqwqTRjmwxdi9SugLVLKDwiY667RuUXvcE6Y1E5OwGzXe1PLKStOJdBz7TcqGvIf qGCED9ku7FkFOIuFLHvc6Q5W8V5Tr6KNWRjyGb7Q6mtf8Y//CuzYdUDf64zcrRxZsK07 0cfchJ1kvoCCXM3atQrfiVPdpaRDktu+R8KOszdnVfuWbi1mFS64S8NyYu9wKJckpqKn S3sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=apg5G+CM+h08kNS7ixJJnlajxxpp5fpY2ZzynnhRTu8=; b=H9CLH/H4epsbRgH1056DcKK2Xd8uLoC34iQ0ymVZXquh+PQVVDC6+v6dB2/JlOpMnV q0imgI+6D0RJ44tqeVNaT/NfQ9vd/IUEGo0E+lQN9MejLcTuuIwgIOp1Wn/eE7y65qGR WGQKqSjRVrcbeSV+asNeJ+jXgXd9DbCjA3uw7rJjZP9k+S1DO3jGL2Eajp8sNn1ycMbM wie9lC5tI+5JpOcKFS2BWLCyg+RtGeCv6Av2hi4OQTXO7X+yxvgGgd7lYmF0+lmY4ivz w0f6J/S3+4JxZM6RIx6+ceKVuj7VvZMte2jTCzTY5EtQkFDjQ1igLuYUF7BFn6BGYWtr q7cA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i3si16817233edx.403.2021.12.13.02.49.00; Mon, 13 Dec 2021 02:49:00 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90D9E68A84E; Mon, 13 Dec 2021 12:48:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7184468AE13 for ; Mon, 13 Dec 2021 12:48:40 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 21FFB24017C for ; Mon, 13 Dec 2021 11:48:40 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id qj8nhKmT2RdR for ; Mon, 13 Dec 2021 11:48:39 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 26A9E240179 for ; Mon, 13 Dec 2021 11:48:39 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 7A53C3A00D9; Mon, 13 Dec 2021 11:48:34 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 11:47:26 +0100 Message-Id: <20211213104726.24998-2-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211213104726.24998-1-anton@khirnov.net> References: <20211213104726.24998-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/encode: set frame_number for encoders using receive_packet() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: q5GGScnDNIKo It is currently set in encode_simple_internal(), which is only called for encoders using the "simple" encoding API. --- libavcodec/encode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 5575cf23db..618be0573d 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -247,11 +247,8 @@ end: if (ret < 0 || !got_packet) av_packet_unref(avpkt); - if (frame) { - if (!ret) - avctx->frame_number++; + if (frame) av_frame_unref(frame); - } if (got_packet) // Encoders must always return ref-counted buffers. @@ -383,6 +380,8 @@ int attribute_align_arg avcodec_send_frame(AVCodecContext *avctx, const AVFrame return ret; } + avctx->frame_number++; + return 0; }