From patchwork Mon Mar 11 04:37:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 46949 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1012243pzb; Sun, 10 Mar 2024 21:38:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzFOxxPJTza4EYkjCOwRX9BnzhgpveA5ES6CBgfD75iHBusMridyVCqEIjsXyIQmLwfKmu14wZUsQZDrILeNlFm62OlFk12Hz9PQ== X-Google-Smtp-Source: AGHT+IHnCoBzGlWZPwTaA/6/PQiti2BqT/cIfe+CRuC535kMzLhf9/a+v1v+nibDdt41VvTVAlIf X-Received: by 2002:a17:906:7fca:b0:a45:f609:3796 with SMTP id r10-20020a1709067fca00b00a45f6093796mr3355803ejs.75.1710131909205; Sun, 10 Mar 2024 21:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710131909; cv=none; d=google.com; s=arc-20160816; b=ACRZSBzLmKxWyT9zXK12ikvL6WofjzuSt0U5sned0Wz5WGuPx1UyuuJK6NVoiFAYts v5laWqphpICzXTBv7Il7217VGYmoMdWhRJ1AF3Sr2Rjy5WrphDV/AeP8Q69IaYCnVCM1 sqGq0CfaA69YnXoRxmYz6pw3jPViTtFxpB8vhSVXgk+FBYwMC1pcWfSNmN+2k7YHY2kv DMZMfcdwZFuJj56klxcFWSVnT+A25rdOPSp12raT2qnvjHFPdPt9aD0sVu07nsGiwyug SSHkjCFUlGNT+mjlKG9MwN6ycK0MvIsLm0Z4KkPqDdSwya0OwJLazjzbbbYKqU9cMZyh BO0Q== 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=VEnaT3yWyjam8/5cQ94+BsvzXHyIievs3yFYctN5eUY=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=L9ttsgGSFtnxP0TJspm5tusM5EBkEfnBGCdjLBy0cKSO35cV02zNx6aS072MKVGBKH OkpYc1AMdH1lGZOll1NMJ9s3h3n4dYuCHwJsCADjP666mISzpI8L13NIqPPOo02PT4GD KKa6OsMGZwiCwJxfNzjDZdETIXdcxwYzmvrzh37R2nW3o0/VmPtsQNZFeoZfDEuEMbtw 6qdd9zq4tEtS+PM0hyvZ5BDNTVO2LF8zziFTaqPmrTcNh8QifWWLFAu0jMAvu5l34szq y9l/hQnQ6VT0hJVmA5HiALF1lrDsCq7cB3w40JsRBxHJwfAZ2AP5eAkpBJPjRJDnx8qb XbhA==; 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=kaP1TK06; 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 n11-20020a1709061d0b00b00a44b3d10436si2044778ejh.948.2024.03.10.21.38.28; Sun, 10 Mar 2024 21:38: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=kaP1TK06; 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 5AD1568B43D; Mon, 11 Mar 2024 06:38:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 682B368B43D for ; Mon, 11 Mar 2024 06:38:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710131903; x=1741667903; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=CsuKvldSRZ1sKnILk8NjuVNegYb7fT+CSBVmgXGfUic=; b=kaP1TK06s3mGHRQ/RhGut+fDQm9I11aaWYaYnQOMy3RJJTY4A4cqCpwV XDrwAJ5jpLbtCvwr9LYlX7TyayOYGm3gbdAXgpVmQ+X4fMUUE6nmCV1K7 NhaLigsr7tPrkGiBg83T2SUTWtBDA42GSgXYM97zoREuMAbRE9gRkJ+c8 MjpQXhwFyygJWkOQ+9dC6bbN/Uq50xurTwda3PVY29pcwxULfnV7EXeGM OThlWCQ7CyNkQIE4H2Ifqed7vAvP20MXmqt6pGAbZo6UIEnCMyBZC1O+T OA0CJGGG1Dnnz/B7XE2Id69n7TL+lh/ff234/5YJy27AcJAKLcGnK8+2A w==; X-IronPort-AV: E=McAfee;i="6600,9927,11009"; a="4639454" X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="4639454" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2024 21:38:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="15538922" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2024 21:38:13 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 12:37:57 +0800 Message-Id: <20240311043757.3085005-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/qsvdec: Do not print warning when draining cached frames 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: IQuC/2qiIhUY From: Haihao Xiang When all cached frames are drained, the output mfxSyncPoint pointer is NULL and MFX_ERR_MORE_DATA is returned, hence needn't print warning for this expected behavior, otherwise the user might think the output from qsv decoders are wrong. Signed-off-by: Haihao Xiang --- libavcodec/qsvdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 4f39f6942a..fd9267c6f4 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -762,7 +762,9 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, if (!*sync && !bs.DataOffset) { bs.DataOffset = avpkt->size; ++q->zero_consume_run; - if (q->zero_consume_run > 1) + if (q->zero_consume_run > 1 && + (avpkt->size || + ret != MFX_ERR_MORE_DATA)) ff_qsv_print_warning(avctx, ret, "A decode call did not consume any data"); } else { q->zero_consume_run = 0;