From 5b834e1666ab632df5e2828bc460acb79cd21fea Mon Sep 17 00:00:00 2001 From: "Pohsiang (John) Hsu" Date: Tue, 7 Jan 2025 17:22:54 -0800 Subject: [PATCH] d3d12: use log2_max_pic_order_cnt_lsb_minus from upper layer Reviewed-by: Jesse Natalie Reviewed by: Pohsiang (John) Hsu Reviewed-by: Jesse Natalie Part-of: --- src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp index 266fde38a33..5dd3659e3e5 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp @@ -656,16 +656,12 @@ d3d12_video_encoder_update_hevc_gop_configuration(struct d3d12_video_encoder *pD uint32_t GOPLength = picture->seq.intra_period; uint32_t PPicturePeriod = picture->seq.ip_period; - const uint32_t max_pic_order_cnt_lsb = MAX2(16, util_next_power_of_two(GOPLength)); - double log2_max_pic_order_cnt_lsb_minus4 = std::max(0.0, std::ceil(std::log2(max_pic_order_cnt_lsb)) - 4); - assert(log2_max_pic_order_cnt_lsb_minus4 < UCHAR_MAX); - // Set dirty flag if m_HEVCGroupOfPictures changed auto previousGOPConfig = pD3D12Enc->m_currentEncodeConfig.m_encoderGOPConfigDesc.m_HEVCGroupOfPictures; pD3D12Enc->m_currentEncodeConfig.m_encoderGOPConfigDesc.m_HEVCGroupOfPictures = { GOPLength, PPicturePeriod, - static_cast(log2_max_pic_order_cnt_lsb_minus4) + picture->seq.log2_max_pic_order_cnt_lsb_minus4 }; if (memcmp(&previousGOPConfig,