From patchwork Tue Jun 20 14:16:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42244 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1427718pzb; Tue, 20 Jun 2023 07:17:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5uQm/zDFsxuwzdkGYD9ZsP0HiEtV2CWpdGNn7Y3HvxxtjHdetMPJGFHTERlFKsIT/oGrKC X-Received: by 2002:aa7:d6c3:0:b0:518:79d2:208f with SMTP id x3-20020aa7d6c3000000b0051879d2208fmr8379796edr.35.1687270677672; Tue, 20 Jun 2023 07:17:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687270677; cv=none; d=google.com; s=arc-20160816; b=tV6tktRg8HJOue1Oim5ja/tmqF2ZTlOr2+bHbiOtv+MFGENwSrqRPTQLHBKz1zLiiX SUwc2Xzetqpru6XIY2UIUUC2sc8RZka+/OdcIBeWtMNsSjplyrEyczmiJQfUjF1+GuCg qXnrQ9wy+PHz4Q9bZZCVXOfovz09ex/JiQAkE+8LN9RSLUYl30LCvYD9X3GA7AG2Yz6I CDN2SSQFDX5qMTMzb36N/7+IDHADdH+UIGsc/G2pOR5i1ccVvEc5n1LoTVBWh51uPLYl R9WzZNkKR9R08NRP157dmi9ndoxC5ZqDKxKHizW7GhD44wFYtgJAB4CRf6Dig/r7LMoo CwRw== 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=E77U01VVkB3iHqqkmK7PGi1u7utjktFVa2XPkeW/6e4=; b=PnsP7A7Wx5mwvueUV6CXxHDWkUNEO5CUBmdc+gPsjt9l8tYyRy2Ue7keRpPp8Wt41N 43aQjTyUuGyV4NRbNOgp1fFX1oZgFNw5AjamTlx7tN6ufZp3dw9OP1axy1Sf3fNThPEZ Cr+vtT6JOM8lUPBeSMsr/onizSI1eIdp9sg6Ri2NyAUZZGyTgdeQpk4uOXUs1ADw3b4D kOXUaOuUK4Z9UuVV/eNvCEi4kaEwKozEXwxjCTZlj8dGXkmBAnC+ARXTvFMD0P7wXIwr 42jbZBLFhCX/0SEPmzvzpUJ/vFsW2IMFZ2uRqbfCKrgr7qxHlsH5v+asgi7M31SUA1zv VLIQ== 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 i3-20020aa7c703000000b0051a3f4fe235si1146195edq.361.2023.06.20.07.17.57; Tue, 20 Jun 2023 07:17:57 -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; 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 8A56D68C17A; Tue, 20 Jun 2023 17:16:57 +0300 (EEST) 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 CA82768C186 for ; Tue, 20 Jun 2023 17:16:48 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 90228240591 for ; Tue, 20 Jun 2023 16:16:44 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id LtjNgUWkhsoI for ; Tue, 20 Jun 2023 16:16:44 +0200 (CEST) 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 CE4FB2405EC for ; Tue, 20 Jun 2023 16:16:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 16B453A1786 for ; Tue, 20 Jun 2023 16:16:37 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 16:16:08 +0200 Message-Id: <20230620141608.31759-9-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230620141608.31759-1-anton@khirnov.net> References: <20230620141608.31759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 9/9] lavc/decode: do not perform decoding when sending draining packets 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: A75ls13XDbqq This way decoding error will not be returned when the user starts draining the decoder, avoiding confusion over whether draining did or did not start. Fixes failures of fate-h264-attachment-631 for certain numbers of frame threads (e.g. 5). --- libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 8d892432be..67f2f052e5 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -665,7 +665,7 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke } else avci->d->draining_started = 1; - if (!avci->buffer_frame->buf[0]) { + if (!avci->buffer_frame->buf[0] && !avci->d->draining_started) { ret = decode_receive_frame_internal(avctx, avci->buffer_frame); if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) return ret;