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 B16B148B75 for ; Thu, 4 Jan 2024 07:20:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 51B1B68CD2D; Thu, 4 Jan 2024 09:20:45 +0200 (EET) 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 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: 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))) { -- 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".