History

Merge pull request #1482 from ruil2/cabac_refine

add setoption trace

sijchen committed 12 years ago

Commit dbd43302 parents 938f441 c19db251 file · +39 −0Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 1 file). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+39−0
@@ -771,6 +771,9 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 770 unmodified lines
771771 //adjust to valid range
772772 m_pEncContext->pSvcParam->fMaxFrameRate = WELS_CLIP3 (iValue, MIN_FRAME_RATE, MAX_FRAME_RATE);
773773 WelsEncoderApplyFrameRate (m_pEncContext->pSvcParam);
774+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
775+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_FRAME_RATE,m_pEncContext->pSvcParam->fMaxFrameRate= %f",
776+ m_pEncContext->pSvcParam->fMaxFrameRate);
774777 }
775778 break;
776779 case ENCODER_OPTION_BITRATE: { // Target bit-rate
@@ -813,6 +816,8 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 36 unmodified lines
813816 }
814817 //adjust to valid range
815818 WelsEncoderApplyBitRate (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam, pInfo->iLayer);
819+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
820+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE layerId= %d,iSpatialBitrate = %d", pInfo->iLayer, iBitrate);
816821 }
817822 break;
818823 case ENCODER_OPTION_MAX_BITRATE: { // Target bit-rate
@@ -856,16 +861,25 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 37 unmodified lines
856861 }
857862 //adjust to valid range
858863 WelsEncoderApplyBitRate (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam, pInfo->iLayer);
864+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
865+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE layerId= %d,iMaxSpatialBitrate = %d", pInfo->iLayer,
866+ iBitrate);
859867 }
860868 break;
861869 case ENCODER_OPTION_RC_MODE: { // 0:quality mode;1:bit-rate mode;2:bitrate limited mode
862870 int32_t iValue = * ((int32_t*)pOption);
863871 m_pEncContext->pSvcParam->iRCMode = (RC_MODES) iValue;
872+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
873+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_RC_MODE iRCMode= %d ",
874+ iValue);
864875 }
865876 break;
866877 case ENCODER_PADDING_PADDING: { // 0:disable padding;1:padding
867878 int32_t iValue = * ((int32_t*)pOption);
868879 m_pEncContext->pSvcParam->iPaddingFlag = iValue;
880+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
881+ "CWelsH264SVCEncoder::SetOption():ENCODER_PADDING_PADDING iPaddingFlag= %d ",
882+ iValue);
869883 }
870884 break;
871885 case ENCODER_LTR_RECOVERY_REQUEST: {
@@ -881,6 +895,9 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 9 unmodified lines
881895 case ENCODER_LTR_MARKING_PERIOD: {
882896 uint32_t iValue = * ((uint32_t*) (pOption));
883897 m_pEncContext->pSvcParam->iLtrMarkPeriod = iValue;
898+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
899+ "CWelsH264SVCEncoder::SetOption():ENCODER_LTR_MARKING_PERIOD iLtrMarkPeriod= %d ",
900+ iValue);
884901 }
885902 break;
886903 case ENCODER_OPTION_LTR: {
@@ -888,6 +905,10 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 1 unmodified line
888905 if (WelsEncoderApplyLTR (&m_pWelsTrace->m_sLogCtx, &m_pEncContext, pLTRValue)) {
889906 return cmInitParaError;
890907 }
908+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
909+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_LTR,expected bEnableLongTermReference = %d,expeced iLTRRefNum = %d,actual bEnableLongTermReference = %d,actual iLTRRefNum = %d",
910+ pLTRValue->bEnableLongTermReference, pLTRValue->iLTRRefNum, m_pEncContext->pSvcParam->bEnableLongTermReference,
911+ m_pEncContext->pSvcParam->iLTRRefNum);
891912 }
892913 break;
893914 case ENCODER_OPTION_ENABLE_SSEI: {
@@ -960,6 +981,10 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 66 unmodified lines
960981 return cmInitParaError;
961982 }
962983 CheckProfileSetting (pProfileInfo->iLayer, pProfileInfo->uiProfileIdc);
984+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
985+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_PROFILE,layerId = %d,expected profile = %d,actual profile = %d",
986+ pProfileInfo->iLayer, pProfileInfo->uiProfileIdc,
987+ m_pEncContext->pSvcParam->sSpatialLayers[pProfileInfo->iLayer].uiProfileIdc);
963988 }
964989 break;
965990 case ENCODER_OPTION_LEVEL: {
@@ -970,21 +995,31 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 4 unmodified lines
970995 return cmInitParaError;
971996 }
972997 CheckLevelSetting (pLevelInfo->iLayer, pLevelInfo->uiLevelIdc);
998+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
999+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_LEVEL,layerId = %d,expected level = %d,actual level = %d",
1000+ pLevelInfo->iLayer, pLevelInfo->uiLevelIdc, m_pEncContext->pSvcParam->sSpatialLayers[pLevelInfo->iLayer].uiLevelIdc);
9731001 }
9741002 break;
9751003 case ENCODER_OPTION_NUMBER_REF: {
9761004 int32_t iValue = * ((int32_t*)pOption);
9771005 CheckReferenceNumSetting (iValue);
1006+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1007+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_NUMBER_REF,expected refNum = %d,actual refnum = %d", iValue,
1008+ m_pEncContext->pSvcParam->iNumRefFrame);
9781009 }
9791010 break;
9801011 case ENCODER_OPTION_DELIVERY_STATUS: {
9811012 SDeliveryStatus* pValue = (static_cast<SDeliveryStatus*> (pOption));
9821013 m_pEncContext->bDeliveryFlag = pValue->bDeliveryFlag;
1014+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1015+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DELIVERY_STATUS,bDeliveryFlag = %d", pValue->bDeliveryFlag);
9831016 }
9841017 break;
9851018 case ENCODER_OPTION_COMPLEXITY: {
9861019 int32_t iValue = * (static_cast<int32_t*> (pOption));
9871020 m_pEncContext->pSvcParam->iComplexityMode = (ECOMPLEXITY_MODE)iValue;
1021+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1022+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_COMPLEXITY,iComplexityMode = %d", iValue);
9881023 }
9891024 break;
9901025 case ENCODER_OPTION_GET_STATISTICS: {
@@ -995,11 +1030,15 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 4 unmodified lines
9951030 case ENCODER_OPTION_STATISTICS_LOG_INTERVAL: {
9961031 int32_t iValue = * (static_cast<int32_t*> (pOption));
9971032 m_pEncContext->iStatisticsLogInterval = iValue;
1033+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1034+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_STATISTICS_LOG_INTERVAL,iStatisticsLogInterval = %d", iValue);
9981035 }
9991036 break;
10001037 case ENCODER_OPTION_IS_LOSSLESS_LINK: {
10011038 bool bValue = * (static_cast<bool*> (pOption));
10021039 m_pEncContext->pSvcParam->bIsLosslessLink = bValue;
1040+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1041+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IS_LOSSLESS_LINK,bIsLosslessLink = %d", bValue);
10031042 }
10041043 break;
10051044 default:

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