Skip to content
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

[Decode] Allocate the slice record buffer dynamically for each frame #1745

Closed
wants to merge 1 commit into from
Closed

[Decode] Allocate the slice record buffer dynamically for each frame #1745

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
36 changes: 33 additions & 3 deletions media_driver/agnostic/common/codec/hal/codechal_decode_vc1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2918,9 +2918,6 @@ MOS_STATUS CodechalDecodeVc1::AllocateResources()
m_vc1RefList,
CODECHAL_NUM_UNCOMPRESSED_SURFACE_VC1));

m_vldSliceRecord =
(PCODECHAL_VC1_VLD_SLICE_RECORD)MOS_AllocAndZeroMemory(m_picHeightInMb * sizeof(CODECHAL_VC1_VLD_SLICE_RECORD));

// Second level batch buffer for IT mode
if (m_mode == CODECHAL_DECODE_MODE_VC1IT)
{
Expand Down Expand Up @@ -3041,6 +3038,7 @@ CodechalDecodeVc1::~CodechalDecodeVc1()
CodecHalFreeDataList(m_vc1RefList, CODECHAL_NUM_UNCOMPRESSED_SURFACE_VC1);

MOS_FreeMemory(m_vldSliceRecord);
m_vldSliceRecord = nullptr;

Mhw_FreeBb(m_osInterface, &m_itObjectBatchBuffer, nullptr);

Expand Down Expand Up @@ -3122,6 +3120,38 @@ MOS_STATUS CodechalDecodeVc1::SetFrameStates()
if (CodecHalIsDecodeModeVLD(m_mode))
{
CODECHAL_DECODE_CHK_NULL_RETURN(m_vc1SliceParams);

uint32_t numSliceRecord = 0;
bool invalidSliceNum = false;

numSliceRecord = m_numMacroblocks;
if (m_numSlices > m_numMacroblocks)
{
numSliceRecord = m_numSlices;
invalidSliceNum = true;
}

if (numSliceRecord > m_numVldSliceRecord || m_vldSliceRecord == nullptr)
{
MOS_SafeFreeMemory(m_vldSliceRecord);
m_vldSliceRecord =
(PCODECHAL_VC1_VLD_SLICE_RECORD)MOS_AllocAndZeroMemory(numSliceRecord * sizeof(CODECHAL_VC1_VLD_SLICE_RECORD));
CODECHAL_DECODE_CHK_NULL_RETURN(m_vldSliceRecord);
m_numVldSliceRecord = numSliceRecord;
}
else
{
MOS_ZeroMemory(m_vldSliceRecord, m_numVldSliceRecord * sizeof(CODECHAL_VC1_VLD_SLICE_RECORD));
}

if (invalidSliceNum)
{
for (uint32_t i = 0; i < m_numVldSliceRecord; i++)
{
m_vldSliceRecord[i].dwSkip = true;
}
}

}
else if (CodecHalIsDecodeModeIT(m_mode))
{
Expand Down
1 change: 1 addition & 0 deletions media_driver/agnostic/common/codec/hal/codechal_decode_vc1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,7 @@ class CodechalDecodeVc1 : public CodechalDecode
MOS_RESOURCE m_resMfdDeblockingFilterRowStoreScratchBuffer; //!< Handle of MFD Deblocking Filter Row Store Scratch data surface
MOS_RESOURCE m_resBsdMpcRowStoreScratchBuffer; //!< Handle of BSD/MPC Row Store Scratch data surface
MOS_RESOURCE m_resVc1BsdMvData[CODECHAL_DECODE_VC1_DMV_MAX]; //!< Handle of VC1 BSD MV Data
uint32_t m_numVldSliceRecord = 0;
PCODECHAL_VC1_VLD_SLICE_RECORD m_vldSliceRecord = nullptr; //!< [VLD mode] Slice record
PCODEC_REF_LIST m_vc1RefList[CODECHAL_NUM_UNCOMPRESSED_SURFACE_VC1]; //!< VC1 Reference List
MOS_RESOURCE m_resSyncObject; //!< Handle of Sync Object
Expand Down
6 changes: 5 additions & 1 deletion media_softlet/agnostic/common/os/mos_utilities_next.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,10 @@ void MosUtilities::MosFreeMemory(void *ptr)
MT_MEMORY_PTR, (int64_t)(ptr),
functionName, filename, line);
free(ptr);
/**
* Note: this is bug, ptr from outside will never be set to nullptr here;
* So, it must set the ptr to nullptr in caller function to avoid foating pointer.
*/
ptr = nullptr;
}
}
Expand Down Expand Up @@ -958,4 +962,4 @@ std::string PerfUtility::getDashString(uint32_t num)
ss.fill('-');
ss << std::left << "" << std::endl;
return ss.str();
}
}
Loading