From patchwork Tue Jul 16 17:11:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp470142vqb; Tue, 16 Jul 2024 11:21:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdPPJksMDilgKwUTo5gu/xY4Kh/g5Di9gXc7v5KYQsPHtIzLRHgZmLA5wcpImva7RBeFQO7taYtpyZyrP9wEXGS0UFuEGeXd7XTQ== X-Google-Smtp-Source: AGHT+IHWkVq9WKoeXCXgRm2ETnjP80SGHYOWiUDt0AZn+FLh1wnaPmXOH2VmPrEd8UuBsexJe5NI X-Received: by 2002:a2e:92cb:0:b0:2ec:4deb:482f with SMTP id 38308e7fff4ca-2eef56c6302mr8740451fa.8.1721154111877; Tue, 16 Jul 2024 11:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721154111; cv=none; d=google.com; s=arc-20160816; b=RJN2jZptcwyLST2gsoBMvmyQPTPJxg0P4qmKFpMMvLDwXC5YLI660Hhk8Xl8N9eqGy 9Cm9b0bdyt6RubdLnfPg10OpsPg1FUcYz2Ko1NEUalZMFYy1FXzVg29/s2zr6GAJ0JE1 dHZh/4E7PcAbVElX8G1j4OmJXVyg0DAKQYWTxFcX+HBEBf5rRZxlEzc4q4GHD0A8s3Rs rGIUwfKTmZs+06HSe1reqynFrL2zrAKseM/FYfstgPCWoxHGHgZKD5fYvGmOKomt/9pE OybCkL7iZATazk58k0tPsHsylOypKN81RXtoigKd81vWAcI7/PLmjzwaCPEvRWT5LvnO SjaA== 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:dkim-signature:delivered-to; bh=TPw7v9wXHMtL3RoCkj8tlVw24ClFQtFt5WZCWbNf72g=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=FitvP0lgJGbeH5Z8oCwh/amL7WtjBB46jTJp3SdQUIzOXu5BOdF1nG17Qjjhdtd+YB Ay50FlJrMUoRDNAol3tE3c2pqhM894+RT8h9CK8P0Luv6DC8DoXfamTYGCMGDVxrbmva gbPQfv2U/APesu9atPqvBJhRzc01cgdKzy8SXimhn2TH63Jfq2fh5YL2RO513iBx/rek W/IK+UJ9k/uQqIlYBZawDQGlmQZbCiklk07xAIxcKRkQxeiWI2VXBYcV2Xkur8Dc+jLn YfdBSJBBC52hUAk3JIm+49wojc6Ry4aprKAWQfUM9TaknNgkW8U80cO1SSRhiI1EG61j g2rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=P++5IPOD; 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 38308e7fff4ca-2eee179ce43si20056721fa.38.2024.07.16.11.21.51; Tue, 16 Jul 2024 11:21:51 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=P++5IPOD; 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 1557C68D504; Tue, 16 Jul 2024 21:14:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8503E68DA6E for ; Tue, 16 Jul 2024 21:14:04 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=P++5IPOD; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 28B994E08 for ; Tue, 16 Jul 2024 19:16:35 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 3pGJaxPViwmv for ; Tue, 16 Jul 2024 19:16:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1721150188; bh=9eQCjMMRjJ96MuKQP3MZfPaUaH8SscxNArllW77p49A=; h=From:To:Subject:Date:In-Reply-To:References:From; b=P++5IPODK8ICT6pAk2h2jtNECMoy8uFM78e11bS30uNej9c3dP/AnsajpOXVkit2s xkTxIzgI6g7MAdlGn4XGfGo90sEvXHN7QXnKTXfuyDL9CGDXT6ZXnz4WQeyI1CI9VK G21Wb5BeLOMJI3sloHI+fZhnxCJnzRgskn6QHE/OQDxqoMQS1uvTI/xK49ZP+MCE6e NvxZgbDbKXDh1wyKANPeEgL8Uncmtvd7Iqd2htSijAaToGnNNuELCess4rU75+FwMw uJwidNJbJU7i7WgD/O/aBh52awxrLlvouMcso/BAgh+gQ7RZV213joIN8pwUcfj08t 2A0OnYX7xcLIg== 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 mail1.khirnov.net (Postfix) with ESMTPS id BFCFA4E0B for ; Tue, 16 Jul 2024 19:16:28 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8FEB43A2E98 for ; Tue, 16 Jul 2024 19:16:21 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 19:11:45 +0200 Message-ID: <20240716171155.31838-30-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716171155.31838-1-anton@khirnov.net> References: <20240716171155.31838-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/39] lavc/internal: document the precise meaning of AVCodecInternal.draining 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: OFVr96t+p66i Also, set draining=1 in case a bitstream filter returns an internally-triggered EOF. While no bitstream filters currently inserted by decoders will do that, that may change in the future and it is better to cover this case. --- libavcodec/decode.c | 12 +++++------- libavcodec/internal.h | 6 +++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 791940648d..6ad74bd94b 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -213,8 +213,6 @@ static int decode_get_packet(AVCodecContext *avctx, AVPacket *pkt) int ret; ret = av_bsf_receive_packet(avci->bsf, pkt); - if (ret == AVERROR_EOF) - avci->draining = 1; if (ret < 0) return ret; @@ -247,14 +245,14 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt) if (ret == AVERROR(EAGAIN) && (!AVPACKET_IS_EMPTY(avci->buffer_pkt) || dc->draining_started)) { ret = av_bsf_send_packet(avci->bsf, avci->buffer_pkt); - if (ret < 0) { - av_packet_unref(avci->buffer_pkt); - return ret; - } + if (ret >= 0) + continue; - continue; + av_packet_unref(avci->buffer_pkt); } + if (ret == AVERROR_EOF) + avci->draining = 1; return ret; } } diff --git a/libavcodec/internal.h b/libavcodec/internal.h index bc20a797ae..d7b0b9f880 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -123,7 +123,11 @@ typedef struct AVCodecInternal { void *hwaccel_priv_data; /** - * checks API usage: after codec draining, flush is required to resume operation + * decoding: AVERROR_EOF has been returned from ff_decode_get_packet(); must + * not be used by decoders that use the decode() callback, as they + * do not call ff_decode_get_packet() directly. + * + * encoding: a flush frame has been submitted to avcodec_send_frame(). */ int draining;