History

Merge pull request #1577 from ruil2/set_param

modify log info(remove unuseful log and add some new logs)

sijchen committed 11 years ago

Commit 607d8142 parents 852ed8a a100fb81 file · +26 −100Browse 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+26−100
@@ -133,12 +133,6 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 132 unmodified lines
133133 CWelsH264SVCEncoder::~CWelsH264SVCEncoder() {
134134 if (m_pWelsTrace) {
135135 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::~CWelsH264SVCEncoder()");
136−
137−#ifdef REC_FRAME_COUNT
138− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
139− "CWelsH264SVCEncoder::~CWelsH264SVCEncoder(), m_uiCountFrameNum= %d, m_iCspInternal= 0x%x", m_uiCountFrameNum,
140− m_iCspInternal);
141−#endif
142136 }
143137
144138 #ifdef REC_FRAME_COUNT
@@ -176,10 +170,6 @@ void CWelsH264SVCEncoder::InitEncoder (void) { · 31 unmodified lines
176170 m_pWelsTrace->SetTraceLevel (WELS_LOG_ERROR);
177171 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::InitEncoder(), openh264 codec version = %s",
178172 VERSION_NUMBER);
179−#ifdef REC_FRAME_COUNT
180− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
181− "CWelsH264SVCEncoder::InitEncoder, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x", m_uiCountFrameNum, m_iCspInternal);
182−#endif
183173 }
184174
185175 /* Interfaces override from ISVCEncoder */
@@ -253,14 +243,6 @@ int CWelsH264SVCEncoder::InitializeInternal (SWelsSvcCodingParam* pCfg) { · 67 unmodified lines
253243 m_bInitialFlag);
254244 Uninitialize();
255245 }
256−
257−#ifdef REC_FRAME_COUNT
258− SWelsSvcCodingParam& sEncodingParam = *pCfg;
259− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
260− "CWelsH264SVCEncoder::Initialize, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
261− m_uiCountFrameNum, m_iCspInternal);
262−#endif//REC_FRAME_COUNT
263−
264246 // Check valid parameters
265247 const int32_t iNumOfLayers = pCfg->iSpatialLayerNum;
266248 if (iNumOfLayers < 1 || iNumOfLayers > MAX_DEPENDENCY_LAYER) {
@@ -373,11 +355,6 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { · 106 unmodified lines
373355 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize(), openh264 codec version = %s.",
374356 VERSION_NUMBER);
375357
376−#ifdef REC_FRAME_COUNT
377− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
378− "CWelsH264SVCEncoder::Uninitialize, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x", m_uiCountFrameNum, m_iCspInternal);
379−#endif//REC_FRAME_COUNT
380−
381358 if (NULL != m_pEncContext) {
382359 WelsUninitEncoderExt (&m_pEncContext);
383360 m_pEncContext = NULL;
@@ -407,7 +384,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSIn · 23 unmodified lines
407384 #ifdef REC_FRAME_COUNT
408385 ++ m_uiCountFrameNum;
409386 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
410− "CWelsH264SVCEncoder::EncodeFrame(), m_uiCountFrameNum= %d, m_iCspInternal= 0x%x", m_uiCountFrameNum, m_iCspInternal);
387+ "CWelsH264SVCEncoder::EncodeFrame(), m_uiCountFrameNum= %d,", m_uiCountFrameNum);
411388 #endif//REC_FRAME_COUNT
412389
413390 #ifdef DUMP_SRC_PICTURE
@@ -495,13 +472,8 @@ int CWelsH264SVCEncoder::ForceIntraFrame (bool bIDR) { · 81 unmodified lines
495472 if (! (m_pEncContext && m_bInitialFlag)) {
496473 return 1;
497474 }
498−
499−#ifdef REC_FRAME_COUNT
500475 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
501− "CWelsH264SVCEncoder::ForceIntraFrame(), bIDR= %d, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x", bIDR,
502− m_uiCountFrameNum, m_iCspInternal);
503−#endif//REC_FRAME_COUNT
504−
476+ "CWelsH264SVCEncoder::ForceIntraFrame(), bIDR= %d", bIDR);
505477 ForceCodingIDR (m_pEncContext);
506478
507479 m_pEncContext->sEncoderStatistics.uiIDRReqNum++;
@@ -696,35 +668,20 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 188 unmodified lines
696668 return cmInitParaError;
697669 }
698670
699−#ifdef REC_FRAME_COUNT
700− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
701− "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d",
702− m_uiCountFrameNum, m_iCspInternal, iValue);
703−#endif//REC_FRAME_COUNT
704−
705671 m_iCspInternal = iColorspace;
706−#ifdef REC_FRAME_COUNT
707672 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
708− "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
709− m_uiCountFrameNum, m_iCspInternal);
710−#endif//REC_FRAME_COUNT
673+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal= 0x%x", m_iCspInternal);
711674 }
712675 break;
713676 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
714677 int32_t iValue = * ((int32_t*)pOption);
715−#ifdef REC_FRAME_COUNT
716678 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
717− "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IDR_INTERVAL, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d",
718− m_uiCountFrameNum, m_iCspInternal, iValue);
719−#endif//REC_FRAME_COUNT
720−
679+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IDR_INTERVAL iValue= %d", iValue);
721680 if (iValue < -1 || iValue == 0)
722681 iValue = 1;
723682 if (iValue == (int32_t)m_pEncContext->pSvcParam->uiIntraPeriod) {
724683 return cmResultSuccess;
725684 }
726−
727−
728685 m_pEncContext->pSvcParam->uiIntraPeriod = (uint32_t)iValue;
729686 }
730687 break;
@@ -746,6 +703,14 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 15 unmodified lines
746703 m_iMaxPicWidth = iTargetWidth;
747704 m_iMaxPicHeight = iTargetHeight;
748705 }
706+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
707+ "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE iUsageType = %d,iPicWidth= %d;iPicHeight= %d;iTargetBitrate= %d;fMaxFrameRate= %.6ff;iRCMode= %d",
708+ sEncodingParam.iUsageType,
709+ sEncodingParam.iPicWidth,
710+ sEncodingParam.iPicHeight,
711+ sEncodingParam.iTargetBitrate,
712+ sEncodingParam.fMaxFrameRate,
713+ sEncodingParam.iRCMode);
749714 if (WelsEncoderParamAdjust (&m_pEncContext, &sConfig)) {
750715 return cmInitParaError;
751716 }
@@ -790,12 +755,6 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 38 unmodified lines
790755 m_iMaxPicWidth = iTargetWidth;
791756 m_iMaxPicHeight = iTargetHeight;
792757 }
793−#ifdef REC_FRAME_COUNT
794− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
795− "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
796− m_uiCountFrameNum, m_iCspInternal);
797−#endif//REC_FRAME_COUNT
798−
799758 /* Check every field whether there is new request for memory block changed or else, Oct. 24, 2008 */
800759 if (WelsEncoderParamAdjust (&m_pEncContext, &sConfig)) {
801760 return cmInitParaError;
@@ -804,11 +763,6 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 2 unmodified lines
804763 break;
805764 case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate
806765 float iValue = * ((float*)pOption);
807−#ifdef REC_FRAME_COUNT
808− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
809− "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_FRAME_RATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %f",
810− m_uiCountFrameNum, m_iCspInternal, iValue);
811−#endif//REC_FRAME_COUNT
812766 if (iValue <= 0) {
813767 return cmInitParaError;
814768 }
@@ -823,11 +777,6 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 8 unmodified lines
823777 case ENCODER_OPTION_BITRATE: { // Target bit-rate
824778 SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
825779 int32_t iBitrate = pInfo->iBitrate;
826−#ifdef REC_FRAME_COUNT
827− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
828− "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d",
829− m_uiCountFrameNum, m_iCspInternal, iValue);
830−#endif//REC_FRAME_COUNT
831780 if (iBitrate <= 0) {
832781 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
833782 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iBitrate = %d",
@@ -874,12 +823,6 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 40 unmodified lines
874823 case ENCODER_OPTION_MAX_BITRATE: { // Target bit-rate
875824 SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
876825 int32_t iBitrate = pInfo->iBitrate;
877−
878−#ifdef REC_FRAME_COUNT
879− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
880− "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d",
881− m_uiCountFrameNum, m_iCspInternal, iValue);
882−#endif//REC_FRAME_COUNT
883826 if (iBitrate <= 0) {
884827 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
885828 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE,iBitrate = %d",
@@ -1127,58 +1070,40 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 241 unmodified lines
11271070 }
11281071 break;
11291072 case ENCODER_OPTION_DATAFORMAT: { // Input color space
1130−#ifdef REC_FRAME_COUNT
11311073 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1132− "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_DATAFORMAT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
1133− m_uiCountFrameNum, m_iCspInternal);
1134−#endif//REC_FRAME_COUNT
1135−
1074+ "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal= 0x%x", m_iCspInternal);
11361075 * ((int32_t*)pOption) = m_iCspInternal;
11371076 }
11381077 break;
11391078 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
1140−#ifdef REC_FRAME_COUNT
11411079 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1142− "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_IDR_INTERVAL, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
1143− m_uiCountFrameNum, m_iCspInternal);
1144−#endif//REC_FRAME_COUNT
1080+ "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_IDR_INTERVAL, uiIntraPeriod= %d",
1081+ m_pEncContext->pSvcParam->uiIntraPeriod);
11451082 * ((int32_t*)pOption) = m_pEncContext->pSvcParam->uiIntraPeriod;
11461083 }
11471084 break;
11481085 case ENCODER_OPTION_SVC_ENCODE_PARAM_EXT: { // SVC Encoding Parameter
1149−#ifdef REC_FRAME_COUNT
11501086 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1151− "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
1152− m_uiCountFrameNum, m_iCspInternal);
1153−#endif//REC_FRAME_COUNT
1087+ "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT");
11541088 memcpy (pOption, m_pEncContext->pSvcParam, sizeof (SEncParamExt)); // confirmed_safe_unsafe_usage
11551089 }
11561090 break;
11571091 case ENCODER_OPTION_SVC_ENCODE_PARAM_BASE: { // SVC Encoding Parameter
1158−#ifdef REC_FRAME_COUNT
11591092 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1160− "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
1161− m_uiCountFrameNum, m_iCspInternal);
1162−#endif//REC_FRAME_COUNT
1093+ "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE");
11631094 m_pEncContext->pSvcParam->GetBaseParams ((SEncParamBase*) pOption);
11641095 }
11651096 break;
11661097
11671098 case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate
1168−#ifdef REC_FRAME_COUNT
11691099 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1170− "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_FRAME_RATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
1171− m_uiCountFrameNum, m_iCspInternal);
1172−#endif//REC_FRAME_COUNT
1100+ "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_FRAME_RATE, fMaxFrameRate = %.6ff",
1101+ m_pEncContext->pSvcParam->fMaxFrameRate);
11731102 * ((float*)pOption) = m_pEncContext->pSvcParam->fMaxFrameRate;
11741103 }
11751104 break;
11761105 case ENCODER_OPTION_BITRATE: { // Target bit-rate
1177−#ifdef REC_FRAME_COUNT
1178− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1179− "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
1180− m_uiCountFrameNum, m_iCspInternal);
1181−#endif//REC_FRAME_COUNT
1106+
11821107 SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
11831108 if ((pInfo->iLayer != SPATIAL_LAYER_ALL) && (pInfo->iLayer != SPATIAL_LAYER_0) && (pInfo->iLayer != SPATIAL_LAYER_1)
11841109 && (pInfo->iLayer != SPATIAL_LAYER_2) && (pInfo->iLayer != SPATIAL_LAYER_3))
@@ -1188,14 +1113,12 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 3 unmodified lines
11881113 } else {
11891114 pInfo->iBitrate = m_pEncContext->pSvcParam->sSpatialLayers[pInfo->iLayer].iSpatialBitrate;
11901115 }
1116+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1117+ "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_BITRATE, layerId =%d,iBitrate = %d",
1118+ pInfo->iLayer, pInfo->iBitrate);
11911119 }
11921120 break;
11931121 case ENCODER_OPTION_MAX_BITRATE: { // Target bit-rate
1194−#ifdef REC_FRAME_COUNT
1195− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1196− "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_MAX_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x",
1197− m_uiCountFrameNum, m_iCspInternal);
1198−#endif//REC_FRAME_COUNT
11991122 SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
12001123 if ((pInfo->iLayer != SPATIAL_LAYER_ALL) && (pInfo->iLayer != SPATIAL_LAYER_0) && (pInfo->iLayer != SPATIAL_LAYER_1)
12011124 && (pInfo->iLayer != SPATIAL_LAYER_2) && (pInfo->iLayer != SPATIAL_LAYER_3))
@@ -1205,6 +1128,9 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 3 unmodified lines
12051128 } else {
12061129 pInfo->iBitrate = m_pEncContext->pSvcParam->sSpatialLayers[pInfo->iLayer].iMaxSpatialBitrate;
12071130 }
1131+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1132+ "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_MAX_BITRATE,, layerId =%d,iBitrate = %d",
1133+ pInfo->iLayer, pInfo->iBitrate);
12081134 }
12091135 break;
12101136 case ENCODER_OPTION_GET_STATISTICS: {

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