From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 976DC47E00 for ; Thu, 28 Dec 2023 03:12:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A5B768CB17; Thu, 28 Dec 2023 05:11:56 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CBF068CAA2 for ; Thu, 28 Dec 2023 05:11:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703733115; x=1735269115; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z8Iox+spLVbtXSugKfxg3mjNJWJAAgEOvfIEsXxCcfM=; b=LLcIH6sIV7ep5aI4n4goO18tqepIrUC+jNYNLl0n7NxnkgJQhTptOAWH OGLEv9EM/fNRaN9149uIgRFqoYuRT6ZoAcX7DpyJvmTbq4WH6QVEtJGdl GatamsTn+kc2PIyu1VVPtYvF2sMTaFNjSVXjd1iVzhGkk5CB9pz4JaI5s 8cC0PlfRszNuCSqND5LkKlW3gRz+9huWUWY62Ryhdbldzih8dySFWxxQH Xi1OCZcEDjmcQzSQXQqHxeI/ivuVokQQ1BYctgBXK62t8U8/G/hSScMjx jYgzrRFZUQMlOJVB3emCSGIw/wAYrOzOk2zn1hRwM0G0ykd00dFcZw4vZ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10936"; a="15170727" X-IronPort-AV: E=Sophos;i="6.04,310,1695711600"; d="scan'208";a="15170727" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2023 19:11:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10936"; a="921990425" X-IronPort-AV: E=Sophos;i="6.04,310,1695711600"; d="scan'208";a="921990425" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmsmga001.fm.intel.com with ESMTP; 27 Dec 2023 19:11:33 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Dec 2023 11:10:41 +0800 Message-ID: <20231228031042.1129-4-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20231228031042.1129-1-tong1.wu@intel.com> References: <20231228031042.1129-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/5] avcodec/d3d12va_decode|dxva2: add a warning to replace assertion 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: Tong Wu Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Previous assertion was not useful. Now a warning is added to replace it. For get_surface_index, we should return a zero index in case the index is not found. But a warning is necessary to notify. Signed-off-by: Tong Wu --- libavcodec/d3d12va_decode.c | 3 +-- libavcodec/dxva2.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/d3d12va_decode.c b/libavcodec/d3d12va_decode.c index 50d5b8d601..babb2aaa0f 100644 --- a/libavcodec/d3d12va_decode.c +++ b/libavcodec/d3d12va_decode.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include @@ -80,7 +79,7 @@ unsigned ff_d3d12va_get_surface_index(const AVCodecContext *avctx, } fail: - assert(0); + av_log(avctx, AV_LOG_WARNING, "Could not get surface index. Using 0 instead.\n"); return 0; } diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 7160a0008b..a6ad5e4dc7 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -795,7 +795,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, } #endif - assert(0); + av_log(avctx, AV_LOG_WARNING, "Could not get surface index. Using 0 instead.\n"); return 0; } -- 2.41.0.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".