From patchwork Thu Dec 28 03:10:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 45359 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp3962883pzh; Wed, 27 Dec 2023 19:12:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFPK85ITlQ3mk4/eEGurH5l4Rr+DcNoTJgMVg48i0XJoPVDrjhGlBmwqI90TU+xJMyCspkX X-Received: by 2002:a50:d483:0:b0:555:5a24:7f21 with SMTP id s3-20020a50d483000000b005555a247f21mr484324edi.52.1703733151091; Wed, 27 Dec 2023 19:12:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703733151; cv=none; d=google.com; s=arc-20160816; b=G2yuS6KcXvzXXOrWomR9NDfL1aZ+tmY1y77WZyx+n3ctfrqp+9/bDGBbHUoqCfbuE3 nhCCuAyKNg248Rj0urhU6ZjWtl4OzU+/BamQoD2YxgeoblA/g50shZQPiY12GAhYfT1R pQok+wbI53jXtmWRyYfLnxBmzkHzNcP/x6OCX50QZ7N8v4ucUdxtM8Pqf7R+sYbqoWQO Gah4OaHcUEZ5LLcog0PORn54uhr0BrEeX+gfXeClyV7K+7J6v8dvNAIUNg/xe98OHkNE 5g2qgoQAKstODoj7+qAC+Be+1KkR04bpwa7uH5rlldfDy2nuq6JRNeXvNM2d8Ti8C2Nv 1tXg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=0/+Tte/VLO9IDiJTtgS9ks37NQ3OOJQHTqUiWASnvsg=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=leCH1j+8fy2Pg8ijAB7mWFTkbUunzdUdYUu6mhpAfW6DFeNHQL2OmCLLJWGmo8vs8W pMoRzxoE6kXwt9SD/S+C7DJhTw7MjNo0F0KGfjCvJOtlSbWhPk6/Go3uwqc/Jw2LwNq+ Vuw3/Vbf01cFRycDrNhFuumntEpvwrWJFQtCOK1JgUDdnT1Baythiymn/O5gWgFRo5mL j0dkf0eqAvQXaNTeYuUxcuLeVeRAK/IbhnekdoOCH1UkpC302uLpKRj9/RTgWgFdY+Q+ KvrAHt7IvfB12RuKzHBPz8VQz+S9nDO42I04GDUMdn5+WTpO7MpM4Ure1sl9gOkpra9o VBAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LLcIH6sI; 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 y8-20020a056402358800b0055490e36565si4376403edc.55.2023.12.27.19.12.30; Wed, 27 Dec 2023 19:12:31 -0800 (PST) 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=LLcIH6sI; 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 9D56568CB18; Thu, 28 Dec 2023 05:11:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oBaPejtVzs7K 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; }