From patchwork Mon Sep 16 09:28:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp1167492vqy; Mon, 16 Sep 2024 02:49:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW29AoKBDEEcoDPqV+bD11wsvCwIdVK7VCjPdov2PbeQA0dmEDTGuEAmXl5S36D7ouugk/IewjrSOzJB3jKW7Qi@gmail.com X-Google-Smtp-Source: AGHT+IGfbMfqwsFM57kEMD74bid6TAu15ou4JkJy3pTIGC5DpEwAe2uaE1LCO6g266Bh771NtjSg X-Received: by 2002:a05:6512:eaa:b0:52e:be50:9c66 with SMTP id 2adb3069b0e04-5367ff295b1mr4931404e87.53.1726480151736; Mon, 16 Sep 2024 02:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726480151; cv=none; d=google.com; s=arc-20240605; b=aH00JRxXdCNcZ0k7XyKIqJSRwHDsSSAz6Sme8GPUvrVIRbENYm4Eb6p4glzpTGbFHh 3TJZtUGfxPLbBZXEg6OOcmYdCR4LotHWXn/j1ayT7Tf0TKeaZprutWyE3uTSAzoDvbeP qOXFhHHmLygs5wPRYKQHlEnizDYtSZhWTAb1aZLSRSQ1iA7e+iFJJOn5Q1v/qlwzQ2Y6 J6/4wNkuW0FSHAMqjdjdZi4+7XerCbgBBqAGHsSDEMw731KQusCsD1Q0e/mrOsh17R2i nVnR5D5XCAQ97H2x6VHZRcj29lgCMIXSKZ9PiIY7kg2ofti8lW/TD+fEQkSa2Csz9J+0 uuZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=FFpWLkczwC/5Vfnnb7iixxtzr4SuzG5jvBblQqSuIFc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=iyOPOq5NpqFblVcd30Yv+eQCKNsT//OL8U1We5Gp7+BNU22b8jv8AxQqwTC6vPimeh lXTEmv05ts8h7CW7ximl4YftnLo1vcAqqCGWsCoQsClyC1FSIJHHYOzP5C5NhlQMDrtM CvtM6yR40mbcAdzBz2y2g74nPO6fmIJuftdicfWL62UKB8j53lRCFobfc+1M9Ye+Svm+ 1AgqltndrD5/vt+lzTqhAHPHc9VPn/tcLU2t8DpD+jb8wxGlYlEzEPlN6iHD8Bkvgz+I uo3yIQI4d4sxPnHbrMv3lsw+WrQ5iBLfr7W+Ub8qstv9Uc33eKmwNDSHOvotM8fslnRq 5ZXA==; 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=FozkJyY1; 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 2adb3069b0e04-536870bc88bsi1674806e87.636.2024.09.16.02.49.11; Mon, 16 Sep 2024 02:49:11 -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=FozkJyY1; 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 67AA168DC72; Mon, 16 Sep 2024 12:32:24 +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 5ABCC68D221 for ; Mon, 16 Sep 2024 12:32:17 +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=FozkJyY1; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 817074E06 for ; Mon, 16 Sep 2024 11:32:16 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id XhQW4tyIRcJE for ; Mon, 16 Sep 2024 11:32:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1726479135; bh=SQz9ocpBST94daWDNJidMLUkB1DWIax8KBaFiz0UcS0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=FozkJyY15PW4VCeaOZDpEt5RUJAalLvLOjo//A93bd49vBlSLFCJbEuJeTYJdTvWm FZddTxcyit5LPsr99ab37JHqU1qH1CeFzZjJ46jqrdn6C9UPM8g4IoAfBsLQ8b2Qt9 QiD/qtPGAT+TV/hjnHjaP6YwCpiLlhReWJ72D5cQo8ZQn7t0Z9+g7Q3ILgEwBpe1gU JsButBPmftPifHzubjwrsvsi0e6tT8mwtfp2qZtER4ejuv/LoYUfjjHJKUmfhGouyu UDmYvlvQiJx6S8VgdRAxncm764qJ8L1twI4Pqz+96ZFpUy2l2xGcZk86h59WIhq8FP 7I6U7BMRMNMYA== 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 4DC3E4DE2 for ; Mon, 16 Sep 2024 11:32:15 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 124173A036E for ; Mon, 16 Sep 2024 11:32:15 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2024 11:28:05 +0200 Message-ID: <20240916093211.10441-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/decode: do not clear the frame discard flag in ff_decode_frame_props_from_pkt() 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: irz2PuspwMss Only do it in reget_buffer(). The purpose of this clearing this flag is to prevent it for unintentionally persisting across multiple invocations of this function on one frame, however that is only a problem if the frame is not unreffed between uses, which is only the case with reget_buffer(). In other cases the caller may legitimately want to set the discard flag and should have the option of doing so. --- Either this, or the v2 of 15/23 fixes the issue, but I think both changes should be done. --- libavcodec/decode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 5f6646ea4d..1f2fbda6ad 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1474,8 +1474,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (pkt->flags & AV_PKT_FLAG_DISCARD) { frame->flags |= AV_FRAME_FLAG_DISCARD; - } else { - frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); } if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { @@ -1675,6 +1673,9 @@ static int reget_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flag av_assert0(avctx->codec_type == AVMEDIA_TYPE_VIDEO); + // make sure the discard flag does not persist + frame->flags &= ~AV_FRAME_FLAG_DISCARD; + if (frame->data[0] && (frame->width != avctx->width || frame->height != avctx->height || frame->format != avctx->pix_fmt)) { av_log(avctx, AV_LOG_WARNING, "Picture changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s in reget buffer()\n", frame->width, frame->height, av_get_pix_fmt_name(frame->format), avctx->width, avctx->height, av_get_pix_fmt_name(avctx->pix_fmt));