diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp index 30f074fcdac..6c0c2500d5f 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp @@ -2701,7 +2701,7 @@ int d3d12_video_encoder_get_encode_headers([[maybe_unused]] struct pipe_video_co bool postEncodeHeadersNeeded = false; uint64_t preEncodeGeneratedHeadersByteSize = 0; std::vector pWrittenCodecUnitsSizes; - pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_info; + pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_header; d3d12_video_encoder_build_pre_encode_codec_headers(pD3D12Enc, postEncodeHeadersNeeded, preEncodeGeneratedHeadersByteSize, diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.h b/src/gallium/drivers/d3d12/d3d12_video_enc.h index 5a5018227b4..8b3198b08e6 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc.h +++ b/src/gallium/drivers/d3d12/d3d12_video_enc.h @@ -131,7 +131,7 @@ enum d3d12_video_encoder_config_dirty_flags d3d12_video_encoder_config_dirty_flag_slices = 0x80, d3d12_video_encoder_config_dirty_flag_gop = 0x100, d3d12_video_encoder_config_dirty_flag_motion_precision_limit = 0x200, - d3d12_video_encoder_config_dirty_flag_sequence_info = 0x400, + d3d12_video_encoder_config_dirty_flag_sequence_header = 0x400, d3d12_video_encoder_config_dirty_flag_intra_refresh = 0x800, d3d12_video_encoder_config_dirty_flag_video_header = 0x1000, }; diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp index 2b503d9d948..b9ba1843267 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp @@ -875,13 +875,13 @@ d3d12_video_encoder_update_current_encoder_config_state_h264(struct d3d12_video_ if (memcmp(&pD3D12Enc->m_currentEncodeConfig.m_encoderCodecSpecificSequenceStateDescH264, &h264Pic->seq, sizeof(h264Pic->seq)) != 0) { - pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_info; + pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_header; } pD3D12Enc->m_currentEncodeConfig.m_encoderCodecSpecificSequenceStateDescH264 = h264Pic->seq; if ((h264Pic->picture_type == PIPE_H2645_ENC_PICTURE_TYPE_IDR) && (h264Pic->renew_headers_on_idr)) - pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_info; + pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_header; // Set input format DXGI_FORMAT targetFmt = d3d12_convert_pipe_video_profile_to_dxgi_format(pD3D12Enc->base.profile); @@ -1133,7 +1133,7 @@ d3d12_video_encoder_build_codec_headers_h264(struct d3d12_video_encoder *pD3D12E || ((pD3D12Enc->m_currentEncodeConfig.m_seqFlags & // also on resolution change D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_RESOLUTION_CHANGE) != 0) // Also on input format dirty flag for new SPS, VUI etc - || (pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags & d3d12_video_encoder_config_dirty_flag_sequence_info); + || (pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags & d3d12_video_encoder_config_dirty_flag_sequence_header); uint32_t active_seq_parameter_set_id = pH264BitstreamBuilder->get_active_sps().seq_parameter_set_id; diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp index 375c1a54b5e..47f988ad290 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp @@ -791,13 +791,13 @@ d3d12_video_encoder_update_current_encoder_config_state_hevc(struct d3d12_video_ if (memcmp(&pD3D12Enc->m_currentEncodeConfig.m_encoderCodecSpecificSequenceStateDescH265, &hevcPic->seq, sizeof(hevcPic->seq)) != 0) { - pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_info; + pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_header; } pD3D12Enc->m_currentEncodeConfig.m_encoderCodecSpecificSequenceStateDescH265 = hevcPic->seq; if ((hevcPic->picture_type == PIPE_H2645_ENC_PICTURE_TYPE_IDR) && (hevcPic->renew_headers_on_idr)) - pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_info; + pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags |= d3d12_video_encoder_config_dirty_flag_sequence_header; // Set input format DXGI_FORMAT targetFmt = d3d12_convert_pipe_video_profile_to_dxgi_format(pD3D12Enc->base.profile); @@ -1072,7 +1072,7 @@ d3d12_video_encoder_build_codec_headers_hevc(struct d3d12_video_encoder *pD3D12E || ((pD3D12Enc->m_currentEncodeConfig.m_seqFlags & // also on resolution change D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_RESOLUTION_CHANGE) != 0) // Also on input format dirty flag for new SPS, VUI etc - || (pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags & d3d12_video_encoder_config_dirty_flag_sequence_info); + || (pD3D12Enc->m_currentEncodeConfig.m_ConfigDirtyFlags & d3d12_video_encoder_config_dirty_flag_sequence_header); size_t writtenSPSBytesCount = 0; if (writeNewSPS) {