Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 13 files). Show all
Unified · Split
| @@ -211,7 +211,8 @@ void CWelsDecoder::UninitDecoder (void) { · 210 unmodified lines | |||
| 211 | if (NULL == m_pDecContext) | 211 | if (NULL == m_pDecContext) |
| 212 | return; | 212 | return; |
| 213 | 213 | ||
| 214 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::uninit_decoder(), openh264 codec version = %s.", VERSION_NUMBER); | 214 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::uninit_decoder(), openh264 codec version = %s.", |
| 215 | VERSION_NUMBER); | ||
| 215 | 216 | ||
| 216 | WelsEndDecoder (m_pDecContext); | 217 | WelsEndDecoder (m_pDecContext); |
| 217 | 218 | ||
| @@ -265,7 +266,7 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) { · 47 unmodified lines | |||
| 265 | iVal = ERROR_CON_SLICE_COPY; | 266 | iVal = ERROR_CON_SLICE_COPY; |
| 266 | else | 267 | else |
| 267 | iVal = * ((int*)pOption); //EC method | 268 | iVal = * ((int*)pOption); //EC method |
| 268 | m_pDecContext->iErrorConMethod = iVal; | 269 | m_pDecContext->eErrorConMethod = (ERROR_CON_IDC) iVal; |
| 269 | return cmResultSuccess; | 270 | return cmResultSuccess; |
| 270 | } else if (eOptID == DECODER_OPTION_TRACE_LEVEL) { | 271 | } else if (eOptID == DECODER_OPTION_TRACE_LEVEL) { |
| 271 | if (m_pWelsTrace) { | 272 | if (m_pWelsTrace) { |
| @@ -339,7 +340,7 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void* pOption) { · 67 unmodified lines | |||
| 339 | * ((int*)pOption) = iVal; | 340 | * ((int*)pOption) = iVal; |
| 340 | return cmResultSuccess; | 341 | return cmResultSuccess; |
| 341 | } else if (DECODER_OPTION_ERROR_CON_IDC == eOptID) { | 342 | } else if (DECODER_OPTION_ERROR_CON_IDC == eOptID) { |
| 342 | iVal = m_pDecContext->iErrorConMethod; | 343 | iVal = (int) m_pDecContext->eErrorConMethod; |
| 343 | * ((int*)pOption) = iVal; | 344 | * ((int*)pOption) = iVal; |
| 344 | return cmResultSuccess; | 345 | return cmResultSuccess; |
| 345 | } | 346 | } |
| @@ -399,7 +400,7 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 53 unmodified lines | |||
| 399 | //for AVC bitstream (excluding AVC with temporal scalability, including TP), as long as error occur, SHOULD notify upper layer key frame loss. | 400 | //for AVC bitstream (excluding AVC with temporal scalability, including TP), as long as error occur, SHOULD notify upper layer key frame loss. |
| 400 | if ((IS_PARAM_SETS_NALS (eNalType) || NAL_UNIT_CODED_SLICE_IDR == eNalType) || | 401 | if ((IS_PARAM_SETS_NALS (eNalType) || NAL_UNIT_CODED_SLICE_IDR == eNalType) || |
| 401 | (VIDEO_BITSTREAM_AVC == m_pDecContext->eVideoType)) { | 402 | (VIDEO_BITSTREAM_AVC == m_pDecContext->eVideoType)) { |
| 402 | if (m_pDecContext->iErrorConMethod == ERROR_CON_DISABLE) { | 403 | if (m_pDecContext->eErrorConMethod == ERROR_CON_DISABLE) { |
| 403 | #ifdef LONG_TERM_REF | 404 | #ifdef LONG_TERM_REF |
| 404 | m_pDecContext->bParamSetsLostFlag = true; | 405 | m_pDecContext->bParamSetsLostFlag = true; |
| 405 | #else | 406 | #else |