Skip to content

Fix VP8 CQP encoding. #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2019
Merged

Fix VP8 CQP encoding. #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion media_driver/agnostic/common/codec/hal/codechal_encode_vp8.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ CodechalEncodeVp8::CodechalEncodeVp8(
m_verticalLineStrideOffset = CODECHAL_VLINESTRIDEOFFSET_TOP_FIELD;

m_codecGetStatusReportDefined = true;

m_mbEncCurbeSetInBrcUpdate = false;
m_mpuCurbeSetInBrcUpdate = false;
m_tpuCurbeSetInBrcUpdate = false;
}

CodechalEncodeVp8::~CodechalEncodeVp8()
Expand Down Expand Up @@ -1276,7 +1280,7 @@ MOS_STATUS CodechalEncodeVp8::SetPictureStructs()
else
{
m_averagePFrameQp = averageQp;
m_pFramePositionInGop = (m_storeData - 1) % m_vp8SeqParams->GopPicSize;
m_pFramePositionInGop = m_vp8SeqParams->RateControlMethod == RATECONTROL_CQP ? 0 : (m_storeData - 1) % m_vp8SeqParams->GopPicSize;
}

numRef = 0;
Expand Down
6 changes: 3 additions & 3 deletions media_driver/linux/common/codec/ddi/media_ddi_encode_vp8.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ VAStatus DdiEncodeVp8::EncodeInCodecHal(uint32_t numSlices)

if (VA_RC_CQP == m_encodeCtx->uiRCMethod)
{
seqParams->RateControlMethod = 0;
seqParams->RateControlMethod = RATECONTROL_CQP;
seqParams->TargetBitRate[0] = 0;
seqParams->MaxBitRate = 0;
seqParams->MinBitRate = 0;
Expand All @@ -613,13 +613,13 @@ VAStatus DdiEncodeVp8::EncodeInCodecHal(uint32_t numSlices)
}
else if (VA_RC_CBR == m_encodeCtx->uiRCMethod)
{
seqParams->RateControlMethod = 1;
seqParams->RateControlMethod = RATECONTROL_CBR;
seqParams->MaxBitRate = seqParams->TargetBitRate[0];
seqParams->MinBitRate = seqParams->TargetBitRate[0];
}
else if (VA_RC_VBR == m_encodeCtx->uiRCMethod)
{
seqParams->RateControlMethod = 2;
seqParams->RateControlMethod = RATECONTROL_VBR;
}
if((m_encodeCtx->uiTargetBitRate != seqParams->TargetBitRate[0]) || (m_encodeCtx->uiMaxBitRate != seqParams-> MaxBitRate))
{
Expand Down