generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1738 from huili2/init_EC_modify

Browse Source 
modify EC init position
This commit is contained in:
sijchen 2015-01-19 16:36:29 +08:00
commit 8bef6bc942
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/decoder/core/src/decoder.cpp
View File

@ -459,7 +459,6 @@ int32_t WelsOpenDecoder (PWelsDecoderContext pCtx) {
//initial MC function pointer--
int iRet = ERR_NONE;
InitMcFunc (& (pCtx->sMcFunc), pCtx->uiCpuFlag);
InitErrorCon (pCtx);
InitExpandPictureFunc (& (pCtx->sExpandPicFunc), pCtx->uiCpuFlag);
AssignFuncPointerForRec (pCtx);
@ -525,6 +524,7 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa
if (pCtx->bParseOnly) //parse only, disable EC method
pCtx->eErrorConMethod = ERROR_CON_DISABLE;
InitErrorCon (pCtx);
if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType ||
VIDEO_BITSTREAM_AVC == pCtx->pParam->sVideoProperty.eVideoBsType) {

30
test/decoder/DecUT_DecExt.cpp
View File

@ -81,7 +81,7 @@ void DecoderInterfaceTest::Init() {
m_sDecParam.eOutputColorFormat = (EVideoFormatType) (rand() % 100);
m_sDecParam.uiCpuLoad = rand() % 100;
m_sDecParam.uiTargetDqLayer = rand() % 100;
m_sDecParam.eEcActiveIdc = (ERROR_CON_IDC) (rand() & 3);
m_sDecParam.eEcActiveIdc = (ERROR_CON_IDC) (rand() & 7);
m_sDecParam.sVideoProperty.size = sizeof (SVideoProperty);
m_sDecParam.sVideoProperty.eVideoBsType = (VIDEO_BITSTREAM_TYPE) (rand() % 3);
@ -379,7 +379,33 @@ void DecoderInterfaceTest::TestLtrMarkedFrameNum() {
//DECODER_OPTION_ERROR_CON_IDC
void DecoderInterfaceTest::TestErrorConIdc() {
//TODO
int iTmp, iOut;
CM_RETURN eRet;
Init();
//Test GetOption
//invalid input
eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_ERROR_CON_IDC, NULL);
EXPECT_EQ (eRet, cmInitParaError);
//Test GetOption
//valid input
eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_ERROR_CON_IDC, &iOut);
EXPECT_EQ (eRet, cmResultSuccess);
//Test SetOption
iTmp = rand() & 7;
eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_ERROR_CON_IDC, &iTmp);
EXPECT_EQ (eRet, cmResultSuccess);
//Test GetOption
eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_ERROR_CON_IDC, &iOut);
EXPECT_EQ (eRet, cmResultSuccess);
EXPECT_EQ (iTmp, iOut);
Uninit();
}
//DECODER_OPTION_TRACE_LEVEL