Skip to content
This repository has been archived by the owner on May 17, 2023. It is now read-only.

18.4.2 #1164

Closed
wants to merge 13 commits into from
Closed

18.4.2 #1164

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b3996e4
h264e: Rework check MaxFrameSize
Jan 12, 2019
1e17bd6
[AVCe] Fix for slice header packing
ogolikov Jan 11, 2019
04486e8
[AVCe] Fix for SW BRC Reset, LA Bpyr is on
ogolikov Jan 10, 2019
5cc6296
build: do not install gtest
dvrogozh Feb 5, 2019
f2a62f6
h264e: fix check MaxFrameSize
Feb 8, 2019
1954a6d
h264e: fix check LowDelayBRC
Feb 22, 2019
f17aeda
h264e: fix possible dereferencing nullptr
Jan 18, 2019
66a1a87
h264e: restore check adaptive max frame size
Feb 21, 2019
8eb5ec6
Restore 32-bit build
Feb 26, 2019
5f3d82b
build: don't install unittests
dvrogozh Feb 14, 2019
d40d97d
build: enable tests earlier
dvrogozh Mar 21, 2019
fb6b095
gtest: force loading built gtest, gmock libraries
dvrogozh Mar 21, 2019
f3fe4ba
build: allow build against system installed gtest with USE_SYSTEM_GTEST
dvrogozh Mar 21, 2019
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
95 changes: 74 additions & 21 deletions _studio/mfx_lib/encode_hw/h264/src/mfx_h264_encode_hw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,65 @@ void ImplementationAvc::DestroyDanglingCmResources()
}
}
}
/*Class for modifying and restoring VideoParams.
Needed for initialization some components */
class ModifiedVideoParams
{
public:
ModifiedVideoParams() :
m_bInit(false),
m_RateControlMethod(0),
m_LookAheadDepth(0),
m_MaxKbps(0)
{}
void ModifyForDDI(MfxVideoParam & par, bool bSWBRC)
{
if (!bSWBRC)
return;
if (!m_bInit)
SaveParams(par);
// in the case of SWBRC driver works in CQP mode
par.mfx.RateControlMethod = MFX_RATECONTROL_CQP;
}
void ModifyForBRC(MfxVideoParam & par, bool bSWBRC)
{
mfxExtCodingOption2 & extOpt2 = GetExtBufferRef(par);
if (!(bSWBRC && extOpt2.MaxSliceSize))
return;
if (!m_bInit)
SaveParams(par);
// int the case of MaxSliceSize BRC works in VBR mode (instead LA)
lakulako marked this conversation as resolved.
Show resolved Hide resolved
par.mfx.RateControlMethod = MFX_RATECONTROL_VBR;
par.mfx.MaxKbps = par.mfx.TargetKbps * 2;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VBR is define with single bitrate. Now it is based on mfx.MaxKbps. Better use par.mfx.MaxKbps = par.mfx.TargetKbps

extOpt2.LookAheadDepth = 0;
}
void Restore(MfxVideoParam & par)
{
if (!m_bInit)
return;
mfxExtCodingOption2 & extOpt2 = GetExtBufferRef(par);
par.mfx.RateControlMethod = m_RateControlMethod;
par.mfx.MaxKbps = m_MaxKbps;
extOpt2.LookAheadDepth = m_LookAheadDepth;
m_bInit = false;
}

private:
bool m_bInit;
mfxU16 m_RateControlMethod;
mfxU16 m_LookAheadDepth;
mfxU16 m_MaxKbps;

protected:
void SaveParams(MfxVideoParam & par)
{
mfxExtCodingOption2 & extOpt2 = GetExtBufferRef(par);
m_RateControlMethod = par.mfx.RateControlMethod;
m_LookAheadDepth= extOpt2.LookAheadDepth;
m_MaxKbps = par.mfx.MaxKbps;
m_bInit = true;
}
};

mfxStatus ImplementationAvc::Init(mfxVideoParam * par)
{
Expand Down Expand Up @@ -812,28 +871,16 @@ mfxStatus ImplementationAvc::Init(mfxVideoParam * par)
if (m_enabledSwBrc)
{
m_brc.SetImpl(CreateBrc(m_video));
mfxU16 storedRateControlMethod = m_video.mfx.RateControlMethod;
mfxU16 storedLookAheadDepth = extOpt2.LookAheadDepth;
mfxU16 storedMaxKbps = m_video.mfx.MaxKbps;

if (extOpt2.MaxSliceSize)
{
m_video.mfx.RateControlMethod = MFX_RATECONTROL_VBR;
m_video.mfx.MaxKbps = m_video.mfx.TargetKbps*2;
extOpt2.LookAheadDepth = 0;
}
// to change m_video before BRC Init and DDI init
ModifiedVideoParams mod_params;
mod_params.ModifyForBRC(m_video, true);
m_brc.Init(m_video);
if (extOpt2.MaxSliceSize)
{
m_video.mfx.RateControlMethod = MFX_RATECONTROL_VBR;
m_video.mfx.MaxKbps = storedMaxKbps;
extOpt2.LookAheadDepth = storedLookAheadDepth;
}
m_video.mfx.RateControlMethod = MFX_RATECONTROL_CQP;
mod_params.Restore(m_video);
mod_params.ModifyForDDI(m_video, true);
sts = m_ddi->CreateAccelerationService(m_video);
if (sts != MFX_ERR_NONE)
return MFX_WRN_PARTIAL_ACCELERATION;
m_video.mfx.RateControlMethod = storedRateControlMethod;
mod_params.Restore(m_video);
}
else
{
Expand Down Expand Up @@ -1402,7 +1449,11 @@ mfxStatus ImplementationAvc::Reset(mfxVideoParam *par)
m_emulatorForAsyncPart = m_emulatorForSyncPart;

m_hrd.Reset(newPar);
// to change m_video before DDI Reset
ModifiedVideoParams mod_par;
mod_par.ModifyForDDI(newPar, m_enabledSwBrc);
m_ddi->Reset(newPar);
mod_par.Restore(newPar);

m_1stFieldStatus = MFX_ERR_NONE;
m_fieldCounter = 0;
Expand Down Expand Up @@ -1507,15 +1558,17 @@ mfxStatus ImplementationAvc::Reset(mfxVideoParam *par)
}
m_video = newPar;

if (IsOn(extOpt2New.ExtBRC))
if (m_enabledSwBrc)
{
mfxExtEncoderResetOption & resetOption = GetExtBufferRef(newPar);
if (isIdrRequired)
{
resetOption.StartNewSequence = true;
mfxExtEncoderResetOption & resetOption = GetExtBufferRef(newPar);
resetOption.StartNewSequence = MFX_CODINGOPTION_ON;
}
mod_par.ModifyForBRC(newPar, true);
sts = m_brc.Reset(newPar);
MFX_CHECK_STS(sts);
mod_par.Restore(newPar);
}
return checkStatus;
}
Expand Down
12 changes: 5 additions & 7 deletions _studio/mfx_lib/encode_hw/h264/src/mfx_h264_encode_hw_utils_new.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,11 +2523,13 @@ mfxStatus MfxHwH264Encode::CodeAsSkipFrame( VideoCORE & core,
return MFX_ERR_UNDEFINED_BEHAVIOR;
}
}
if (task.GetFrameType() & MFX_FRAMETYPE_P)
else
{
DpbFrame& refFrame = task.m_dpb[0][task.m_list0[0][0] & 127];
mfxI32 fid = task.m_fid[0];
MFX_CHECK(task.m_list0[fid].Size(), MFX_ERR_UNDEFINED_BEHAVIOR);
DpbFrame& refFrame = task.m_dpb[0][task.m_list0[fid][0] & 127];
mfxFrameData curr = {};
mfxFrameData ref = {};
mfxFrameData ref = {};
curr.MemId = task.m_midRaw;
ref.MemId = refFrame.m_midRec;

Expand All @@ -2536,10 +2538,6 @@ mfxStatus MfxHwH264Encode::CodeAsSkipFrame( VideoCORE & core,
sts = core.DoFastCopyWrapper(&surfDst,MFX_MEMTYPE_INTERNAL_FRAME|MFX_MEMTYPE_DXVA2_DECODER_TARGET|MFX_MEMTYPE_FROM_ENCODE, &surfSrc, MFX_MEMTYPE_INTERNAL_FRAME|MFX_MEMTYPE_DXVA2_DECODER_TARGET|MFX_MEMTYPE_FROM_ENCODE);

}
if (task.GetFrameType() & MFX_FRAMETYPE_B)
{
task.m_ctrl.SkipFrame = 1;
}

return sts;
}
Expand Down
Loading