From e0d77f925ec48be20ae6f1e8548ec357de80a0b3 Mon Sep 17 00:00:00 2001 From: "Pohsiang (John) Hsu" Date: Wed, 25 Sep 2024 11:16:21 -0700 Subject: [PATCH] d3d12: fix incorrect memset in d3d12_video_encoder_references_manager_hevc Fixes: 92d6989fdc9 ("d3d12: Add support for HEVC 4:4:4 video encode using AYUV format") Signed-Off-by: Pohsiang (John) Hsu Reviewed-By: Sil Vilerino Part-of: --- .../d3d12/d3d12_video_encoder_references_manager_hevc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_hevc.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_hevc.cpp index 33a5b020e93..c2adb3676c7 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_hevc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_hevc.cpp @@ -37,7 +37,7 @@ d3d12_video_encoder_references_manager_hevc::get_current_frame_picture_control_d assert((codecAllocation.DataSize == sizeof(D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC)) || (codecAllocation.DataSize == sizeof(D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC1))); memcpy(codecAllocation.pHEVCPicData1, &m_curFrameState, codecAllocation.DataSize); - memset(codecAllocation.pHEVCPicData1 + codecAllocation.DataSize, 0, sizeof(m_curFrameState) - codecAllocation.DataSize); + memset((uint8_t *)(& codecAllocation.pHEVCPicData1) + codecAllocation.DataSize, 0, sizeof(m_curFrameState) - codecAllocation.DataSize); return true; } @@ -254,7 +254,7 @@ d3d12_video_encoder_references_manager_hevc::begin_frame(D3D12_VIDEO_ENCODER_PIC assert((curFrameData.DataSize == sizeof(D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC)) || (curFrameData.DataSize == sizeof(D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC1))); memcpy(&m_curFrameState, curFrameData.pHEVCPicData1, curFrameData.DataSize); - memset(&m_curFrameState + curFrameData.DataSize, 0, sizeof(m_curFrameState) - curFrameData.DataSize); + memset(((uint8_t*)(&m_curFrameState) + curFrameData.DataSize), 0, sizeof(m_curFrameState) - curFrameData.DataSize); m_isCurrentFrameUsedAsReference = bUsedAsReference;