From patchwork Thu Jan 4 07:19:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 45478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp7687357pzh; Wed, 3 Jan 2024 23:20:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgP7228klubJKKPIEEgjk3VFOOGEu4Uk14FPqRwnrNo2yfxIcz1FsqeGwsUxOrj/BJlrIx X-Received: by 2002:a50:d48a:0:b0:554:c83e:58bc with SMTP id s10-20020a50d48a000000b00554c83e58bcmr68625edi.59.1704352855276; Wed, 03 Jan 2024 23:20:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704352855; cv=none; d=google.com; s=arc-20160816; b=c3/f7TBDKQ6Lw+jHMELgb29E3PTt9JRfAsma96CuYSXav90yAautFHXwvcj441h8Gk IixGf6IidlP4pc35LS1V6hmcHCE9oXYjRNnSbp0chPQ9qER9KZFJgyMPSGl//ivZyha7 nG1ORLkXSN14Ai0FI00fnJOyCpBP7duoC52JxS1zR88fDBBzDqOmI3Sg04b85pBTvLA5 oWhfUtWqW0X7+rj7rOQPopFB6IfPxJymOVhw5pCm5wDYLfu/dKV8jA98ijzQPB8Hk4xu 2AaxHmZnV7WXiU/KN0wdYTd2i5Nie0CeNE8ooTkOs99LGSr7Bc+T3/mMU2UAupcDwaoW HiPg== 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=D/Y9W1wF1us5+Ytwuh636CeUKkAZ40Fme0k8mDmJ4zE=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=vF9AiqzVr2N0EcN+1hAPgMLn1xVT2LcisosmubP01CpIh9waDT+bTRJxt/He7eoe7U fAx1KXS0ys3Xr91VsXVF3ZxKiFJq43IOrZSgLgyyPEqZSc7zFTClvCefvDfvB0Zyl6Pq GfztukLPQgtV38QCNOT0ycYkB8Jnz5O6KcCKuGa55D2PlHdc3JaNdT49OLrYpaJYVRXi t/0UFW7lFGxiIl5ySGN1+AQUeT1+kEkOFgCC3oFchResTI31gO8refq6znpTUhwuDRRm C614iBBimfcxr9Cn2u95SpPpJZdhItStTG7IUVyp91KSix01ApElHlBwwpK42K0fV6Yj IZWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=f+8NC6Yj; 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 y35-20020a50bb26000000b0055307e61a66si13141079ede.39.2024.01.03.23.20.54; Wed, 03 Jan 2024 23:20:55 -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=f+8NC6Yj; 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 8C3AE68CD4E; Thu, 4 Jan 2024 09:20:45 +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.8]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A0C368CD2D for ; Thu, 4 Jan 2024 09:20:38 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704352844; x=1735888844; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TCKzOfLuXh7LDy3I0hAngvYaEJKigA762LWq499mm2M=; b=f+8NC6YjdFVdx6lJUh+JiQE3JHaVz9vUiuBGR32KddyTG6yxyauP+JFr Y92zcvWeBEvRZlzW1R21imcZLYaUZXynhpi4DRraaLS2hU8NPjsiwv6RM dC9OntL0pQGWygncDP3fDd2UbYi91zGyAFA8resumtbPn2uQ2wnmIGDLO O9b89PHQfU6RvBptUA2rJkee9NXkOTQxP8KgJCNRb/ySwXujIsySTjoP2 1cQh0SuGh+V2zPkuQ2diNAvSmpYMu43FNJKCeo+bnkviE+IG77ogJTG1+ 5zf8eDIxOVQk+Y1AQEK5Mtxps8FQY/mkOx/CW10shSxKJc2ZmLSaZKfCg g==; X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="10724018" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="10724018" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2024 23:20:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="1111623572" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="1111623572" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmsmga005.fm.intel.com with ESMTP; 03 Jan 2024 23:20:16 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jan 2024 15:19:05 +0800 Message-ID: <20240104071905.1262-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240104071905.1262-1-tong1.wu@intel.com> References: <20240104071905.1262-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] d3d12va_av1|h264|hevc|vc1|vp9: input void** for ID3D12Resource_Map 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: s/wyzNxMxAdF Fixes -Wincompatible-pointer-types warnings. Signed-off-by: Tong Wu --- libavcodec/d3d12va_av1.c | 2 +- libavcodec/d3d12va_h264.c | 2 +- libavcodec/d3d12va_hevc.c | 2 +- libavcodec/d3d12va_vc1.c | 2 +- libavcodec/d3d12va_vp9.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/d3d12va_av1.c b/libavcodec/d3d12va_av1.c index 5f96f7da04..05cebc3148 100644 --- a/libavcodec/d3d12va_av1.c +++ b/libavcodec/d3d12va_av1.c @@ -110,7 +110,7 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU { const AV1DecContext *h = avctx->priv_data; AV1DecodePictureContext *ctx_pic = h->cur_frame.hwaccel_picture_private; - uint8_t *mapped_data; + void *mapped_data; D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args = &input_args->FrameArguments[input_args->NumFrameArguments++]; args->Type = D3D12_VIDEO_DECODE_ARGUMENT_TYPE_SLICE_CONTROL; diff --git a/libavcodec/d3d12va_h264.c b/libavcodec/d3d12va_h264.c index be5cf0d527..cd02f3621e 100644 --- a/libavcodec/d3d12va_h264.c +++ b/libavcodec/d3d12va_h264.c @@ -113,7 +113,7 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU DXVA_Slice_H264_Short *slice; D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args; - if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, &mapped_data))) { + if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, (void **)&mapped_data))) { av_log(avctx, AV_LOG_ERROR, "Failed to map D3D12 Buffer resource!\n"); return AVERROR(EINVAL); } diff --git a/libavcodec/d3d12va_hevc.c b/libavcodec/d3d12va_hevc.c index a6a3b802f9..ca345c845f 100644 --- a/libavcodec/d3d12va_hevc.c +++ b/libavcodec/d3d12va_hevc.c @@ -107,7 +107,7 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU DXVA_Slice_HEVC_Short *slice; D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args; - if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, &mapped_data))) { + if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, (void **)&mapped_data))) { av_log(avctx, AV_LOG_ERROR, "Failed to map D3D12 Buffer resource!\n"); return AVERROR(EINVAL); } diff --git a/libavcodec/d3d12va_vc1.c b/libavcodec/d3d12va_vc1.c index b39b03ab45..8d8834b1cc 100644 --- a/libavcodec/d3d12va_vc1.c +++ b/libavcodec/d3d12va_vc1.c @@ -105,7 +105,7 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU static const uint8_t start_code[] = { 0, 0, 1, 0x0d }; - if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, &mapped_data))) { + if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, (void **)&mapped_data))) { av_log(avctx, AV_LOG_ERROR, "Failed to map D3D12 Buffer resource!\n"); return AVERROR(EINVAL); } diff --git a/libavcodec/d3d12va_vp9.c b/libavcodec/d3d12va_vp9.c index 3d8f3a4466..8b8692f68d 100644 --- a/libavcodec/d3d12va_vp9.c +++ b/libavcodec/d3d12va_vp9.c @@ -88,7 +88,7 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU const VP9SharedContext *h = avctx->priv_data; VP9DecodePictureContext *ctx_pic = h->frames[CUR_FRAME].hwaccel_picture_private; - uint8_t *mapped_data; + void *mapped_data; D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args; if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, &mapped_data))) {