From patchwork Tue Apr 23 04:32:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 48234 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:2d06:b0:1a9:af23:56c1 with SMTP id tw6csp192532pzb; Mon, 22 Apr 2024 21:33:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZo4Qd8zRB2avIkZOvufScJLptBipG7u9Hmv883voSPdA310MOxxVPdCOSrDX60mpDG5RtcjcxWQ/6ZQnlK0s9H9xdH6kKdcbenw== X-Google-Smtp-Source: AGHT+IGGBEnBJp//JXqaAvhxcV7fJEEFgzjIvsNbnxHj7y2wbIQVPxHWm16XL7c+11hbqgCo/ggq X-Received: by 2002:a50:cd1d:0:b0:56e:d54:6d63 with SMTP id z29-20020a50cd1d000000b0056e0d546d63mr9686625edi.15.1713846809554; Mon, 22 Apr 2024 21:33:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713846809; cv=none; d=google.com; s=arc-20160816; b=wVZoRx9HI76SfFKt/fYcxV/+yjUSZtz27d2t3lUv0zwwwlAF9oo6TO6y0isqUajMj/ ScnhkL43TQ2QY/ZFXNwZCCrEFfvyog8ItxjNzbfOQ75Bem61E5DoOVvduQqPMVLBTHPa 2/3Pb1fTXT41gCMu7EKikvyv8XZ+W+WN06WtsroncYO9g1vKpQf9xvZIcd5nbEfrUZI5 bpEOA2F9/TkZtOeChmj6wv2FCmfOXx+kMwcQDhOk5MLgPP8xaXwruYqgVnHZdW1s1j0G NqBxpIxTxD8ymhwlCB3/LhKRy2aLsItXLcSnR0vm4oWL5DXc3j19Hp8rhUZZD/b5G+5P vTzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=UuC1TsLkHcCyllsnkSUz0eU4QucbB45o/h09j/YAEHg=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=QMdfku8e8/Iud36z5x/qbyoe+ZFoDvQFMxAHcN+SRfZmvso5wLtJ7i9UdmEIYUsU+0 vmm3P4YgJJ/PvQuNTh09NCLE3ME34S2JXb3FYRlhpFnLoq77r3+RhaUILd6PCl7oKBvE AOSzDFQPa1eCJSjl6/5JJXiuqA69RKjPSoQ2BdOSI5UVd2v0UQPjy0GhNq+VTctpWkqD 2PxRZW5d25Vsg8MtsW+nNi47fc5vr3tZJ/1kEvfBIIpygH9eqwjqIV0az7zCbqvLt8L/ u/Oy+5fWgDJRk8ZCOMVFnSzvYPSt0GsMP5Kwmtb43l9mvyP1vf8kCPmq2yq/HLaAvglQ 6kKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=e1lycMoF; 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 t22-20020a50ab56000000b0056c2be5c715si6949065edc.434.2024.04.22.21.33.28; Mon, 22 Apr 2024 21:33:29 -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=@intel.com header.s=Intel header.b=e1lycMoF; 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 B950A68D388; Tue, 23 Apr 2024 07:33:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BD6668D2A9 for ; Tue, 23 Apr 2024 07:33:16 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713846803; x=1745382803; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Jzu9iI/USQbiwgkd5I/oF51soEbuG7tajH03KjQVukc=; b=e1lycMoFNtLqJ/0rRZr1AoN5eICymFdhydXo2X1vex4JOMNrK+foYyuQ OR7vwHpLOt6s+5Id66tUj5qtzwjFjiqGzcL4FUuyfgPLm5fjLRpSHWCQv /BckZ9NRwAa6wM+4DEw8uBAwgt2gnOxxNGPhOFhRaB4byk/bVM9B7FrgS 4N5JPHK2psoMGVPo94TC+sCcwWzHqr9hG8VTqiVkQFdcri+nWWZElz0tU sJkgMOSsQCzKovr8TjJzz7M/DZDUB72zULFAZPeX+SlmcKzM3vyI1uHQf WangbE+CVgHCyEKuFtHmKZYfSUTAJtvTJlSVPHEbdyErEtt1pldC7oe3n w==; X-CSE-ConnectionGUID: 74L0gVUSRd+dFCH9K+rbcg== X-CSE-MsgGUID: CezoqZryTl+Pv6Ac8z4uoA== X-IronPort-AV: E=McAfee;i="6600,9927,11052"; a="26871883" X-IronPort-AV: E=Sophos;i="6.07,222,1708416000"; d="scan'208";a="26871883" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 21:33:14 -0700 X-CSE-ConnectionGUID: 9MzYmMORRDWEOEB71eQheQ== X-CSE-MsgGUID: jZgN0lreSHKSREfXNpeDNg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,222,1708416000"; d="scan'208";a="61689345" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 21:33:12 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Apr 2024 12:32:58 +0800 Message-Id: <20240423043258.30883-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/vp9: Fix regression introduced in 0ba05857 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8Yku6XS5mXNs From: Haihao Xiang It is possible that ff_progress_frame_await() is called but ff_progress_frame_report() isn't called when a hardware acceleration method is used, so a thread for vp9 decoding might get stuck. Signed-off-by: Haihao Xiang --- libavcodec/vp9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 3adfb98f2d..6e2d18bf95 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1735,9 +1735,9 @@ static int vp9_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (ret < 0) goto fail; } - ff_progress_frame_report(&s->s.frames[CUR_FRAME].tf, INT_MAX); finish: + ff_progress_frame_report(&s->s.frames[CUR_FRAME].tf, INT_MAX); // ref frame setup for (int i = 0; i < 8; i++) ff_progress_frame_replace(&s->s.refs[i], &s->next_refs[i]);