Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 5 files). Show all
Unified · Split
| @@ -403,6 +403,12 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void* pOption) { · 402 unmodified lines | |||
| 403 | iVal = m_pDecContext->iFeedbackTidInAu; | 403 | iVal = m_pDecContext->iFeedbackTidInAu; |
| 404 | * ((int*)pOption) = iVal; | 404 | * ((int*)pOption) = iVal; |
| 405 | return cmResultSuccess; | 405 | return cmResultSuccess; |
| 406 | } else if (DECODER_OPTION_IS_REF_PIC == eOptID) { | ||
| 407 | iVal = m_pDecContext->iFeedbackNalRefIdc; | ||
| 408 | if (iVal > 0) | ||
| 409 | iVal = 1; | ||
| 410 | * ((int*)pOption) = iVal; | ||
| 411 | return cmResultSuccess; | ||
| 406 | } else if (DECODER_OPTION_ERROR_CON_IDC == eOptID) { | 412 | } else if (DECODER_OPTION_ERROR_CON_IDC == eOptID) { |
| 407 | iVal = (int) m_pDecContext->pParam->eEcActiveIdc; | 413 | iVal = (int) m_pDecContext->pParam->eEcActiveIdc; |
| 408 | * ((int*)pOption) = iVal; | 414 | * ((int*)pOption) = iVal; |
| @@ -537,6 +543,7 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 128 unmodified lines | |||
| 537 | #endif | 543 | #endif |
| 538 | 544 | ||
| 539 | m_pDecContext->iFeedbackTidInAu = -1; //initialize | 545 | m_pDecContext->iFeedbackTidInAu = -1; //initialize |
| 546 | m_pDecContext->iFeedbackNalRefIdc = -1; //initialize | ||
| 540 | if (pDstInfo) { | 547 | if (pDstInfo) { |
| 541 | pDstInfo->uiOutYuvTimeStamp = 0; | 548 | pDstInfo->uiOutYuvTimeStamp = 0; |
| 542 | m_pDecContext->uiTimeStamp = pDstInfo->uiInBsTimeStamp; | 549 | m_pDecContext->uiTimeStamp = pDstInfo->uiInBsTimeStamp; |
| @@ -716,6 +723,7 @@ DECODING_STATE CWelsDecoder::DecodeParser (const unsigned char* kpSrc, · 173 unmodified lines | |||
| 716 | 723 | ||
| 717 | m_pDecContext->iErrorCode = dsErrorFree; //initialize at the starting of AU decoding. | 724 | m_pDecContext->iErrorCode = dsErrorFree; //initialize at the starting of AU decoding. |
| 718 | m_pDecContext->pParam->eEcActiveIdc = ERROR_CON_DISABLE; //add protection to disable EC here. | 725 | m_pDecContext->pParam->eEcActiveIdc = ERROR_CON_DISABLE; //add protection to disable EC here. |
| 726 | m_pDecContext->iFeedbackNalRefIdc = -1; //initialize | ||
| 719 | if (!m_pDecContext->bFramePending) { //frame complete | 727 | if (!m_pDecContext->bFramePending) { //frame complete |
| 720 | m_pDecContext->pParserBsInfo->iNalNum = 0; | 728 | m_pDecContext->pParserBsInfo->iNalNum = 0; |
| 721 | memset (m_pDecContext->pParserBsInfo->pNalLenInByte, 0, MAX_NAL_UNITS_IN_LAYER); | 729 | memset (m_pDecContext->pParserBsInfo->pNalLenInByte, 0, MAX_NAL_UNITS_IN_LAYER); |