History

Revert "Merge pull request #2217 from huili2/simply_dec_ctx"

This reverts commit 27172bafd7ff2cc80b08768a32a23470f3d6d3fd, reversing changes made to 24916a652ee5d3e36d931c222df20966f7c158fa.

Haibo Zhu committed 11 years ago

Commit 628befe1 parent 513a34011 files · +86 −133Browse files

Showing the changes to test/decoder/DecUT_ParseSyntax.cpp (1 of 11 files). Show all

Unified · Split

test/decoder/DecUT_ParseSyntax.cpp+2−5
@@ -86,16 +86,13 @@ int32_t InitDecoder (const SDecodingParam* pParam, PWelsDecoderContext pCtx, SLo · 85 unmodified lines
86 return cmMallocMemeError;86 return cmMallocMemeError;
87 }87 }
88 88
89 pCtx->sLogCtx = *pLogCtx;89 WELS_VERIFY_RETURN_PROC_IF (cmInitParaError, WelsInitDecoder (pCtx, pParam->bParseOnly, pLogCtx), UninitDecoder (pCtx));
90
91 //check param and update decoder context90 //check param and update decoder context
92 pCtx->pParam = (SDecodingParam*) pCtx->pMemAlign->WelsMallocz (sizeof (SDecodingParam), "SDecodingParam");91 pCtx->pParam = (SDecodingParam*) pCtx->pMemAlign->WelsMallocz (sizeof (SDecodingParam), "SDecodingParam");
93 WELS_VERIFY_RETURN_PROC_IF (cmMallocMemeError, (NULL == pCtx->pParam), UninitDecoder (pCtx));92 WELS_VERIFY_RETURN_PROC_IF (cmMallocMemeError, (NULL == pCtx->pParam), UninitDecoder (pCtx));
94 int32_t iRet = DecoderConfigParam (pCtx, pParam);93 int32_t iRet = DecoderConfigParam (pCtx, pCtx->pParam);
95 WELS_VERIFY_RETURN_IFNEQ (iRet, cmResultSuccess);94 WELS_VERIFY_RETURN_IFNEQ (iRet, cmResultSuccess);
96 95
97 WELS_VERIFY_RETURN_PROC_IF (cmInitParaError, WelsInitDecoder (pCtx, pLogCtx), UninitDecoder (pCtx));
98
99 return cmResultSuccess;96 return cmResultSuccess;
100}97}
101 98

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t