AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d3d12: AV1 encode - Configure CQP using qp and new qp_inter parameters

Browse Source 
Fixes: 8c9445896f ("frontends/va: Separate QP for I/P/B frames")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28018>
This commit is contained in:
Sil Vilerino
2024-03-06 08:45:08 -05:00
committed by Marge Bot
parent 4762d03391
commit e3e593d721
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/d3d12/d3d12_video_enc_av1.cpp
+34 -8
View File
@@ -34,6 +34,7 @@ void
d3d12_video_encoder_update_current_rate_control_av1(struct d3d12_video_encoder *pD3D12Enc,
pipe_av1_enc_picture_desc *picture)
{
struct D3D12EncodeRateControlState m_prevRCState = pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc;
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc = {};
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_FrameRate.Numerator = picture->rc[0].frame_rate_num;
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_FrameRate.Denominator = picture->rc[0].frame_rate_den;
@@ -293,15 +294,40 @@ d3d12_video_encoder_update_current_rate_control_av1(struct d3d12_video_encoder *
} break;
case PIPE_H2645_ENC_RATE_CONTROL_METHOD_DISABLE:
{
// We need to initialize the QP value for all frame types on the first frame
// otherwise some drivers crash.
// frontends currently only send the QP values for the specific frame type of
// the current frame, so give a default value for all types until all frame
// types are configured on subsequent encode frame calls
if (pD3D12Enc->m_fenceValue == 1)
{
m_prevRCState.m_Config.m_Configuration_CQP
.ConstantQP_FullIntracodedFrame = 30 /* initial_qp_default */;
m_prevRCState.m_Config.m_Configuration_CQP
.ConstantQP_InterPredictedFrame_PrevRefOnly = 30 /* initial_qp_default */;
m_prevRCState.m_Config.m_Configuration_CQP
.ConstantQP_InterPredictedFrame_BiDirectionalRef = 30 /* initial_qp_default */;
}
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Mode = D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP;
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Config.m_Configuration_CQP
.ConstantQP_FullIntracodedFrame = picture->rc[0].app_requested_initial_qp ? picture->rc[0].qp : 0;
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Config.m_Configuration_CQP
.ConstantQP_InterPredictedFrame_PrevRefOnly =
picture->rc[0].app_requested_initial_qp ? picture->rc[0].qp : 0;
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Config.m_Configuration_CQP
.ConstantQP_InterPredictedFrame_BiDirectionalRef =
picture->rc[0].app_requested_initial_qp ? picture->rc[0].qp : 0;
if (picture->rc[0].app_requested_initial_qp) {
// Load previous RC state for all frames and only update the current frame
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Config.m_Configuration_CQP =
m_prevRCState.m_Config.m_Configuration_CQP;
if ((picture->frame_type == PIPE_AV1_ENC_FRAME_TYPE_INTRA_ONLY) ||
(picture->frame_type == PIPE_AV1_ENC_FRAME_TYPE_KEY)) {
// Update intra frame qp
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Config.m_Configuration_CQP
.ConstantQP_FullIntracodedFrame = picture->rc[0].qp;
} else {
// Update inter frame QP config
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Config.m_Configuration_CQP
.ConstantQP_InterPredictedFrame_PrevRefOnly = picture->rc[0].qp_inter;
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Config.m_Configuration_CQP
.ConstantQP_InterPredictedFrame_BiDirectionalRef = picture->rc[0].qp_inter;
}
}
if (picture->quality_modes.level > 0) {
pD3D12Enc->m_currentEncodeConfig.m_encoderRateControlDesc.m_Flags |=