TRUE/FALSE has intentionally been left in use for the few platform specific APIs that define these constants themselves and expect them to be used, for consistency.
Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 22 files). Show all
Unified · Split
| @@ -68,7 +68,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 67 unmodified lines | |||
| 68 | m_iMaxPicWidth (0), | 68 | m_iMaxPicWidth (0), |
| 69 | m_iMaxPicHeight (0), | 69 | m_iMaxPicHeight (0), |
| 70 | m_iCspInternal (0), | 70 | m_iCspInternal (0), |
| 71 | m_bInitialFlag (FALSE) { | 71 | m_bInitialFlag (false) { |
| 72 | #ifdef REC_FRAME_COUNT | 72 | #ifdef REC_FRAME_COUNT |
| 73 | int32_t m_uiCountFrameNum = 0; | 73 | int32_t m_uiCountFrameNum = 0; |
| 74 | #endif//REC_FRAME_COUNT | 74 | #endif//REC_FRAME_COUNT |
| @@ -135,7 +135,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 60 unmodified lines | |||
| 135 | m_pFileBs = WelsFopen (strStreamFileName, "wb"); | 135 | m_pFileBs = WelsFopen (strStreamFileName, "wb"); |
| 136 | m_pFileBsSize = WelsFopen (strLenFileName, "wb"); | 136 | m_pFileBsSize = WelsFopen (strLenFileName, "wb"); |
| 137 | 137 | ||
| 138 | m_bSwitch = FALSE; | 138 | m_bSwitch = false; |
| 139 | m_iSwitchTimes = 0; | 139 | m_iSwitchTimes = 0; |
| 140 | #endif//OUTPUT_BIT_STREAM | 140 | #endif//OUTPUT_BIT_STREAM |
| 141 | 141 | ||
| @@ -171,7 +171,7 @@ CWelsH264SVCEncoder::~CWelsH264SVCEncoder() { · 29 unmodified lines | |||
| 171 | WelsFclose (m_pFileBsSize); | 171 | WelsFclose (m_pFileBsSize); |
| 172 | m_pFileBsSize = NULL; | 172 | m_pFileBsSize = NULL; |
| 173 | } | 173 | } |
| 174 | m_bSwitch = FALSE; | 174 | m_bSwitch = false; |
| 175 | m_iSwitchTimes = 0; | 175 | m_iSwitchTimes = 0; |
| 176 | #endif//OUTPUT_BIT_STREAM | 176 | #endif//OUTPUT_BIT_STREAM |
| 177 | 177 | ||
| @@ -414,7 +414,7 @@ int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) { · 236 unmodified lines | |||
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | m_iCspInternal = iColorspace; | 416 | m_iCspInternal = iColorspace; |
| 417 | m_bInitialFlag = TRUE; | 417 | m_bInitialFlag = true; |
| 418 | 418 | ||
| 419 | return cmResultSuccess; | 419 | return cmResultSuccess; |
| 420 | } | 420 | } |
| @@ -458,7 +458,7 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { · 37 unmodified lines | |||
| 458 | m_pEncContext = NULL; | 458 | m_pEncContext = NULL; |
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | m_bInitialFlag = FALSE; | 461 | m_bInitialFlag = false; |
| 462 | 462 | ||
| 463 | return 0; | 463 | return 0; |
| 464 | } | 464 | } |
| @@ -587,7 +587,7 @@ int CWelsH264SVCEncoder::EncodeFrame2 (const SSourcePicture** pSrcPicList, int · 122 unmodified lines | |||
| 587 | m_pFileBsSize = WelsFopen (strStreamFileName, "wb"); | 587 | m_pFileBsSize = WelsFopen (strStreamFileName, "wb"); |
| 588 | 588 | ||
| 589 | 589 | ||
| 590 | m_bSwitch = FALSE; | 590 | m_bSwitch = false; |
| 591 | } | 591 | } |
| 592 | 592 | ||
| 593 | for (i = 0; i < pBsInfo->iLayerNum; i++) { | 593 | for (i = 0; i < pBsInfo->iLayerNum; i++) { |
| @@ -665,7 +665,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 71 unmodified lines | |||
| 665 | return cmInitParaError; | 665 | return cmInitParaError; |
| 666 | } | 666 | } |
| 667 | 667 | ||
| 668 | if (NULL == m_pEncContext || FALSE == m_bInitialFlag) { | 668 | if (NULL == m_pEncContext || false == m_bInitialFlag) { |
| 669 | return cmInitExpected; | 669 | return cmInitExpected; |
| 670 | } | 670 | } |
| 671 | 671 | ||
| @@ -783,7 +783,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 111 unmodified lines | |||
| 783 | if (sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoWidth != | 783 | if (sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoWidth != |
| 784 | m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iNumDependencyLayer - 1].iFrameWidth) { | 784 | m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iNumDependencyLayer - 1].iFrameWidth) { |
| 785 | ++ m_iSwitchTimes; | 785 | ++ m_iSwitchTimes; |
| 786 | m_bSwitch = TRUE; | 786 | m_bSwitch = true; |
| 787 | } | 787 | } |
| 788 | #endif//OUTPUT_BIT_STREAM | 788 | #endif//OUTPUT_BIT_STREAM |
| 789 | if (sEncodingParam.iSpatialLayerNum < 1 | 789 | if (sEncodingParam.iSpatialLayerNum < 1 |
| @@ -926,7 +926,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 136 unmodified lines | |||
| 926 | if (NULL == pOption) { | 926 | if (NULL == pOption) { |
| 927 | return cmInitParaError; | 927 | return cmInitParaError; |
| 928 | } | 928 | } |
| 929 | if (NULL == m_pEncContext || FALSE == m_bInitialFlag) { | 929 | if (NULL == m_pEncContext || false == m_bInitialFlag) { |
| 930 | return cmInitExpected; | 930 | return cmInitExpected; |
| 931 | } | 931 | } |
| 932 | 932 | ||