Skip to content

Re-init decoder when REPOSITION error happen #210

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Re-init decoder when REPOSITION error happen #210

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
10 changes: 9 additions & 1 deletion c2_components/src/mfx_c2_decoder_component.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,8 +1129,16 @@ mfxStatus MfxC2DecoderComponent::InitDecoder(std::shared_ptr<C2BlockPool> c2_all
m_mfxVideoParams.NumExtParam = m_extBuffers.size();
m_mfxVideoParams.ExtParam = &m_extBuffers.front();

std::shared_ptr<mfxBitstream> bs = m_c2Bitstream->GetFrameConstructor()->GetMfxBitstream();
std::shared_ptr<mfxBitstream> header = m_c2Bitstream->GetFrameConstructor()->GetHeaderInfo();

if (nullptr != header && nullptr != bs && header->DataLength > bs->DataLength) {
m_c2Bitstream->GetFrameConstructor()->AppendSps(bs);
}

// decoding header
mfx_res = m_mfxDecoder->DecodeHeader(m_c2Bitstream->GetFrameConstructor()->GetMfxBitstream().get(), &m_mfxVideoParams);
mfx_res = m_mfxDecoder->DecodeHeader(bs.get(), &m_mfxVideoParams);

// MSDK will call the function av1_native_profile_to_mfx_profile to change CodecProfile in DecodeHeader while
// decoder type is av1. So after calling DecodeHeader, we have to revert this value to avoid unexpected behavior.
if (m_decoderType == DECODER_AV1)
Expand Down
18 changes: 18 additions & 0 deletions c2_utils/include/mfx_frame_constructor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ class IMfxC2FrameConstructor
virtual mfxPayload* GetSEI(mfxU32 /*type*/) = 0;
// save current SPS/PPS
virtual mfxStatus SaveHeaders(std::shared_ptr<mfxBitstream> sps, std::shared_ptr<mfxBitstream> pps, bool is_reset) = 0;

virtual std::shared_ptr<mfxBitstream> GetHeaderInfo() = 0;

virtual mfxStatus AppendSps(std::shared_ptr<mfxBitstream> bs) = 0;
// get whether in reset state
virtual bool IsInReset() = 0;

Expand Down Expand Up @@ -112,6 +116,15 @@ class MfxC2FrameConstructor : public IMfxC2FrameConstructor
(void)is_reset;
return MFX_ERR_NONE;
}

virtual std::shared_ptr<mfxBitstream> GetHeaderInfo() {
return nullptr;
}

virtual mfxStatus AppendSps(std::shared_ptr<mfxBitstream> bs) {
return MFX_ERR_NONE;
}

// get whether in reset state
virtual bool IsInReset();

Expand Down Expand Up @@ -168,6 +181,10 @@ class MfxC2AVCFrameConstructor : public MfxC2FrameConstructor
// save current SPS/PPS
virtual mfxStatus SaveHeaders(std::shared_ptr<mfxBitstream> sps, std::shared_ptr<mfxBitstream> pps, bool is_reset);

virtual std::shared_ptr<mfxBitstream> GetHeaderInfo();

virtual mfxStatus AppendSps(std::shared_ptr<mfxBitstream> bs);

protected: // functions
virtual mfxStatus Load(const mfxU8* data, mfxU32 size, mfxU64 pts, bool header, bool complete_frame);
virtual mfxStatus LoadHeader(const mfxU8* data, mfxU32 size, bool header);
Expand All @@ -189,6 +206,7 @@ class MfxC2AVCFrameConstructor : public MfxC2FrameConstructor

mfxBitstream m_sps;
mfxBitstream m_pps;
mfxU8* m_cache_data = nullptr;

private:
MFX_CLASS_NO_COPY(MfxC2AVCFrameConstructor)
Expand Down
49 changes: 48 additions & 1 deletion c2_utils/src/mfx_frame_constructor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ mfxStatus MfxC2FrameConstructor::LoadHeader(const mfxU8* data, mfxU32 size, bool
mfx_res = BstBufRealloc(m_bstHeader->DataLength);
if (MFX_ERR_NONE == mfx_res) {
mfxU8* buf = m_bstBuf->Data + m_bstBuf->DataOffset + m_bstBuf->DataLength;

std::copy(m_bstHeader->Data + m_bstHeader->DataOffset,
m_bstHeader->Data + m_bstHeader->DataOffset + m_bstHeader->DataLength, buf);
m_bstBuf->DataLength += m_bstHeader->DataLength;
Expand Down Expand Up @@ -369,6 +368,50 @@ MfxC2AVCFrameConstructor::~MfxC2AVCFrameConstructor()

MFX_FREE(m_sps.Data);
MFX_FREE(m_pps.Data);

if (m_cache_data) {
free(m_cache_data);
m_cache_data = nullptr;
}
}

mfxStatus MfxC2AVCFrameConstructor::AppendSps(std::shared_ptr<mfxBitstream> bs)
{
MFX_DEBUG_TRACE_FUNC;
if (m_sps.Data && m_sps.DataLength && bs->Data && bs->DataLength) {
mfxU8* data = (mfxU8*)calloc(0, m_sps.DataLength + bs->DataLength);
std::copy(m_sps.Data + m_sps.DataOffset, m_sps.Data + m_sps.DataOffset + m_sps.DataLength, data);
std::copy(bs->Data + bs->DataOffset, bs->Data + bs->DataOffset + bs->DataLength, data + m_sps.DataLength);

if (m_cache_data) free(m_cache_data);
m_cache_data = bs->Data;
bs->Data = data;
bs->DataLength = m_sps.DataLength + bs->DataLength;
bs->DataOffset = 0;
return MFX_ERR_NONE;
}
return MFX_ERR_MEMORY_ALLOC;
}

std::shared_ptr<mfxBitstream> MfxC2AVCFrameConstructor::GetHeaderInfo()
{
MFX_DEBUG_TRACE_FUNC;

std::shared_ptr<mfxBitstream> header = std::make_shared<mfxBitstream>();
MFX_ZERO_MEMORY((*header));

if ((m_sps.Data && m_sps.DataLength) &&
(m_pps.Data && m_pps.DataLength)){
header->DataOffset = 0;
header->DataLength = m_sps.DataLength + m_pps.DataLength;
header->TimeStamp = m_sps.TimeStamp;
header->MaxLength = m_sps.MaxLength + m_pps.MaxLength;
header->FrameType = m_sps.FrameType;
header->DataFlag = m_sps.DataFlag;
} else {
header = nullptr;
}
return header;
}

mfxStatus MfxC2AVCFrameConstructor::SaveHeaders(std::shared_ptr<mfxBitstream> sps, std::shared_ptr<mfxBitstream> pps, bool is_reset)
Expand All @@ -387,6 +430,8 @@ mfxStatus MfxC2AVCFrameConstructor::SaveHeaders(std::shared_ptr<mfxBitstream> sp
std::copy(sps->Data + sps->DataOffset,
sps->Data + sps->DataOffset + sps->DataLength, m_sps.Data);
m_sps.DataLength = sps->DataLength;
m_sps.FrameType = sps->FrameType;
m_sps.DataFlag = sps->DataFlag;
}
if (nullptr != pps) {
if (m_pps.MaxLength < pps->DataLength) {
Expand All @@ -397,6 +442,8 @@ mfxStatus MfxC2AVCFrameConstructor::SaveHeaders(std::shared_ptr<mfxBitstream> sp
}
std::copy(pps->Data + pps->DataOffset, pps->Data + pps->DataOffset + pps->DataLength, m_pps.Data);
m_pps.DataLength = pps->DataLength;
m_pps.FrameType = pps->FrameType;
m_pps.DataFlag = pps->DataFlag;
}
return MFX_ERR_NONE;
}
Expand Down
Loading