diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp index c12d54d43d2..ab729f2b45b 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp @@ -1130,7 +1130,6 @@ d3d12_video_encoder_build_codec_headers_h264(struct d3d12_video_encoder *pD3D12E auto levelDesc = d3d12_video_encoder_get_current_level_desc(pD3D12Enc); auto codecConfigDesc = d3d12_video_encoder_get_current_codec_config_desc(pD3D12Enc); - auto MaxDPBCapacity = d3d12_video_encoder_get_current_max_dpb_capacity(pD3D12Enc); d3d12_video_bitstream_builder_h264 *pH264BitstreamBuilder = static_cast(pD3D12Enc->m_upBitstreamBuilder.get()); @@ -1164,7 +1163,6 @@ d3d12_video_encoder_build_codec_headers_h264(struct d3d12_video_encoder *pD3D12E *codecConfigDesc.pH264Config, pD3D12Enc->m_currentEncodeConfig.m_encoderGOPConfigDesc.m_H264GroupOfPictures, active_seq_parameter_set_id, - MaxDPBCapacity, // max_num_ref_frames pD3D12Enc->m_currentEncodeConfig.m_currentResolution, pD3D12Enc->m_currentEncodeConfig.m_FrameCroppingCodecConfig, pD3D12Enc->m_BitstreamHeadersBuffer, diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.cpp index 652461e790d..95e7da44fb6 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.cpp @@ -61,7 +61,6 @@ d3d12_video_bitstream_builder_h264::build_sps(const struct pipe_h264_enc_seq_par const D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264 & codecConfig, const D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 &gopConfig, uint32_t seq_parameter_set_id, - uint32_t max_num_ref_frames, D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC sequenceTargetResolution, D3D12_BOX frame_cropping_codec_config, std::vector & headerBitstream, @@ -110,7 +109,7 @@ d3d12_video_bitstream_builder_h264::build_sps(const struct pipe_h264_enc_seq_par gopConfig.log2_max_frame_num_minus4, gopConfig.pic_order_cnt_type, gopConfig.log2_max_pic_order_cnt_lsb_minus4, - max_num_ref_frames, + seqData.max_num_ref_frames, 0, // gaps_in_frame_num_value_allowed_flag pic_width_in_mbs_minus1, pic_height_in_map_units_minus1, diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.h b/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.h index a365639337d..62e3fb0f98d 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.h +++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_h264.h @@ -41,7 +41,6 @@ class d3d12_video_bitstream_builder_h264 : public d3d12_video_bitstream_builder_ const D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264 & codecConfig, const D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 &gopConfig, uint32_t seq_parameter_set_id, - uint32_t max_num_ref_frames, D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC sequenceTargetResolution, D3D12_BOX frame_cropping_codec_config, std::vector & headerBitstream,