Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 4 files). Show all
Unified · Split
| @@ -185,6 +185,7 @@ CWelsDecoder::~CWelsDecoder() { · 184 unmodified lines | ||
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | long CWelsDecoder::Initialize (const SDecodingParam* pParam) { |
| 188 | + int iRet = ERR_NONE; | |
| 188 | 189 | if (m_pWelsTrace == NULL) { |
| 189 | 190 | return cmMallocMemeError; |
| 190 | 191 | } |
| @@ -195,9 +196,13 @@ long CWelsDecoder::Initialize (const SDecodingParam* pParam) { · 4 unmodified lines | ||
| 195 | 196 | } |
| 196 | 197 | |
| 197 | 198 | // H.264 decoder initialization,including memory allocation,then open it ready to decode |
| 198 | − InitDecoder(); | |
| 199 | + iRet = InitDecoder(); | |
| 200 | + if (iRet) | |
| 201 | + return iRet; | |
| 199 | 202 | |
| 200 | − DecoderConfigParam (m_pDecContext, pParam); | |
| 203 | + iRet = DecoderConfigParam (m_pDecContext, pParam); | |
| 204 | + if (iRet) | |
| 205 | + return iRet; | |
| 201 | 206 | |
| 202 | 207 | return cmResultSuccess; |
| 203 | 208 | } |
| @@ -226,15 +231,16 @@ void CWelsDecoder::UninitDecoder (void) { · 22 unmodified lines | ||
| 226 | 231 | } |
| 227 | 232 | |
| 228 | 233 | // the return value of this function is not suitable, it need report failure info to upper layer. |
| 229 | −void CWelsDecoder::InitDecoder (void) { | |
| 234 | +int32_t CWelsDecoder::InitDecoder (void) { | |
| 230 | 235 | |
| 231 | 236 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::init_decoder(), openh264 codec version = %s", |
| 232 | 237 | VERSION_NUMBER); |
| 233 | 238 | |
| 234 | 239 | m_pDecContext = (PWelsDecoderContext)WelsMalloc (sizeof (SWelsDecoderContext), "m_pDecContext"); |
| 240 | + if (NULL == m_pDecContext) | |
| 241 | + return cmMallocMemeError; | |
| 235 | 242 | |
| 236 | − WelsInitDecoder (m_pDecContext, &m_pWelsTrace->m_sLogCtx); | |
| 237 | − | |
| 243 | + return WelsInitDecoder (m_pDecContext, &m_pWelsTrace->m_sLogCtx); | |
| 238 | 244 | } |
| 239 | 245 | |
| 240 | 246 | /* |