History

Merge pull request #1024 from ruil2/trace_fix

change void* to explicit type definition

huili2 committed 12 years ago

Commit 775b5072 parents f71cf37 1ffcd3617 files · +224 −223Browse files

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

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+39−39
@@ -440,7 +440,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSIn · 439 unmodified lines
440440
441441 #ifdef REC_FRAME_COUNT
442442 ++ m_uiCountFrameNum;
443− WelsLog (m_pEncContext, WELS_LOG_INFO,
443+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
444444 "CWelsH264SVCEncoder::EncodeFrame(), m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum, m_iCspInternal);
445445 #endif//REC_FRAME_COUNT
446446
@@ -458,7 +458,7 @@ int CWelsH264SVCEncoder::EncodeFrameInternal (const SSourcePicture* pSrcPic, SF · 11 unmodified lines
458458 WelsUninitEncoderExt (&m_pEncContext);
459459 return cmMallocMemeError;
460460 } else if ((kiEncoderReturn != ENC_RETURN_SUCCESS) && (kiEncoderReturn == ENC_RETURN_CORRECTED)) {
461− WelsLog (m_pEncContext, WELS_LOG_ERROR, "unexpected return(%d) from EncodeFrameInternal()!\n", kiEncoderReturn);
461+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "unexpected return(%d) from EncodeFrameInternal()!\n", kiEncoderReturn);
462462 return cmUnkonwReason;
463463 }
464464 ///////////////////for test
@@ -546,7 +546,7 @@ int CWelsH264SVCEncoder::ForceIntraFrame (bool bIDR) { · 81 unmodified lines
546546 }
547547
548548 #ifdef REC_FRAME_COUNT
549− WelsLog (m_pEncContext, WELS_LOG_INFO,
549+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
550550 "CWelsH264SVCEncoder::ForceIntraFrame(), bIDR= %d, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", bIDR,
551551 m_uiCountFrameNum, m_iCspInternal);
552552 #endif//REC_FRAME_COUNT
@@ -560,12 +560,12 @@ void CWelsH264SVCEncoder::CheckProfileSetting (int32_t iLayer, EProfileIdc uiPro · 7 unmodified lines
560560 pLayerInfo->uiProfileIdc = uiProfileIdc;
561561 if ((iLayer == SPATIAL_LAYER_0) && (uiProfileIdc != PRO_BASELINE)) {
562562 pLayerInfo->uiProfileIdc = PRO_BASELINE;
563− WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile\n", uiProfileIdc);
563+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile\n", uiProfileIdc);
564564 }
565565 if (iLayer > SPATIAL_LAYER_0) {
566566 if ((uiProfileIdc != PRO_BASELINE) || (uiProfileIdc != PRO_SCALABLE_BASELINE)) {
567567 pLayerInfo->uiProfileIdc = PRO_BASELINE;
568− WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile\n", uiProfileIdc);
568+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile\n", uiProfileIdc);
569569 }
570570 }
571571 }
@@ -574,14 +574,14 @@ void CWelsH264SVCEncoder::CheckLevelSetting (int32_t iLayer, ELevelIdc uiLevelId · 2 unmodified lines
574574 pLayerInfo->uiLevelIdc = uiLevelIdc;
575575 if ((uiLevelIdc < LEVEL_1_0) || (uiLevelIdc > LEVEL_5_2)) {
576576 pLayerInfo->uiLevelIdc = LEVEL_5_2;
577− WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support level(%d) change to LEVEL_5_2\n", uiLevelIdc);
577+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING, "doesn't support level(%d) change to LEVEL_5_2\n", uiLevelIdc);
578578 }
579579 }
580580 void CWelsH264SVCEncoder::CheckReferenceNumSetting (int32_t iNumRef) {
581581 m_pEncContext->pSvcParam->iNumRefFrame = iNumRef;
582582 if ((iNumRef < MIN_REF_PIC_COUNT) || (iNumRef > MAX_REFERENCE_PICTURE_COUNT_NUM)) {
583583 m_pEncContext->pSvcParam->iNumRefFrame = AUTO_REF_PIC_COUNT;
584− WelsLog (m_pEncContext, WELS_LOG_WARNING,
584+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
585585 "doesn't support the number of reference frame(%d) change to auto select mode\n", iNumRef);
586586 }
587587 }
@@ -600,7 +600,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 12 unmodified lines
600600
601601 switch (eOptionId) {
602602 case ENCODER_OPTION_INTER_SPATIAL_PRED: { // Inter spatial layer prediction flag
603− WelsLog (m_pEncContext, WELS_LOG_INFO, "ENCODER_OPTION_INTER_SPATIAL_PRED, this feature not supported at present.\n");
603+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "ENCODER_OPTION_INTER_SPATIAL_PRED, this feature not supported at present.\n");
604604 }
605605 break;
606606 case ENCODER_OPTION_DATAFORMAT: { // Input color space
@@ -611,14 +611,14 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 4 unmodified lines
611611 }
612612
613613 #ifdef REC_FRAME_COUNT
614− WelsLog (m_pEncContext, WELS_LOG_INFO,
614+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
615615 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n",
616616 m_uiCountFrameNum, m_iCspInternal, iValue);
617617 #endif//REC_FRAME_COUNT
618618
619619 m_iCspInternal = iColorspace;
620620 #ifdef REC_FRAME_COUNT
621− WelsLog (m_pEncContext, WELS_LOG_INFO,
621+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
622622 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
623623 m_uiCountFrameNum, m_iCspInternal);
624624 #endif//REC_FRAME_COUNT
@@ -627,7 +627,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 2 unmodified lines
627627 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
628628 int32_t iValue = * ((int32_t*)pOption);
629629 #ifdef REC_FRAME_COUNT
630− WelsLog (m_pEncContext, WELS_LOG_INFO,
630+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
631631 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IDR_INTERVAL, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n",
632632 m_uiCountFrameNum, m_iCspInternal, iValue);
633633 #endif//REC_FRAME_COUNT
@@ -650,9 +650,9 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 16 unmodified lines
650650 int32_t iTargetHeight = 0;
651651
652652 memcpy (&sEncodingParam, pOption, sizeof (SEncParamExt)); // confirmed_safe_unsafe_usage
653− WelsLog (m_pEncContext, WELS_LOG_INFO, "ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, sEncodingParam.iInputCsp= 0x%x\n",
653+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, sEncodingParam.iInputCsp= 0x%x\n",
654654 sEncodingParam.iInputCsp);
655− WelsLog (m_pEncContext, WELS_LOG_INFO,
655+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
656656 "coding_param->iPicWidth= %d;coding_param->iPicHeight= %d;coding_param->iTargetBitrate= %d; coding_param->iMaxBitrate= %d; coding_param->iRCMode= %d;coding_param->iPaddingFlag= %d;coding_param->iTemporalLayerNum= %d;coding_param->iSpatialLayerNum= %d;coding_param->fFrameRate= %.6ff;coding_param->iInputCsp= %d;coding_param->uiIntraPeriod= %d;coding_param->bEnableSpsPpsIdAddition = %d;coding_param->bPrefixNalAddingCtrl = %d;coding_param->bEnableDenoise= %d;coding_param->bEnableBackgroundDetection= %d;coding_param->bEnableAdaptiveQuant= %d;coding_param->bEnableAdaptiveQuant= %d;coding_param->bEnableLongTermReference= %d;coding_param->iLtrMarkPeriod= %d;\n",
657657 sEncodingParam.iPicWidth,
658658 sEncodingParam.iPicHeight,
@@ -676,7 +676,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 17 unmodified lines
676676 int32_t i = 0;
677677 while (i < sEncodingParam.iSpatialLayerNum) {
678678 SSpatialLayerConfig* pSpatialCfg = &sEncodingParam.sSpatialLayers[i];
679− WelsLog (m_pEncContext, WELS_LOG_INFO,
679+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
680680 "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iMaxSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n",
681681 i, pSpatialCfg->iVideoWidth,
682682 pSpatialCfg->iVideoHeight,
@@ -717,7 +717,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 34 unmodified lines
717717 m_iCspInternal = iInputColorspace;
718718 }
719719 #ifdef REC_FRAME_COUNT
720− WelsLog (m_pEncContext, WELS_LOG_INFO,
720+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
721721 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
722722 m_uiCountFrameNum, m_iCspInternal);
723723 #endif//REC_FRAME_COUNT
@@ -733,7 +733,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 9 unmodified lines
733733 case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate
734734 float iValue = * ((float*)pOption);
735735 #ifdef REC_FRAME_COUNT
736− WelsLog (m_pEncContext, WELS_LOG_INFO,
736+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
737737 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_FRAME_RATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %f\n",
738738 m_uiCountFrameNum, m_iCspInternal, iValue);
739739 #endif//REC_FRAME_COUNT
@@ -749,12 +749,12 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 9 unmodified lines
749749 SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
750750 int32_t iBitrate = pInfo->iBitrate;
751751 #ifdef REC_FRAME_COUNT
752− WelsLog (m_pEncContext, WELS_LOG_INFO,
752+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
753753 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n",
754754 m_uiCountFrameNum, m_iCspInternal, iValue);
755755 #endif//REC_FRAME_COUNT
756756 if (iBitrate <= 0) {
757− WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iBitrate = %d\n",
757+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iBitrate = %d\n",
758758 iBitrate);
759759 return cmInitParaError;
760760 }
@@ -776,7 +776,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 15 unmodified lines
776776 m_pEncContext->pSvcParam->sSpatialLayers[3].iSpatialBitrate = iBitrate;
777777 break;
778778 default:
779− WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iLayer = %d\n",
779+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iLayer = %d\n",
780780 pInfo->iLayer);
781781 return cmInitParaError;
782782 break;
@@ -790,12 +790,12 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 7 unmodified lines
790790 int32_t iBitrate = pInfo->iBitrate;
791791
792792 #ifdef REC_FRAME_COUNT
793− WelsLog (m_pEncContext, WELS_LOG_INFO,
793+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
794794 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n",
795795 m_uiCountFrameNum, m_iCspInternal, iValue);
796796 #endif//REC_FRAME_COUNT
797797 if (iBitrate <= 0) {
798− WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE,iBitrate = %d\n",
798+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE,iBitrate = %d\n",
799799 iBitrate);
800800 return cmInitParaError;
801801 }
@@ -817,7 +817,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 15 unmodified lines
817817 m_pEncContext->pSvcParam->sSpatialLayers[3].iMaxSpatialBitrate = iBitrate;
818818 break;
819819 default:
820− WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE,iLayer = %d\n",
820+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE,iLayer = %d\n",
821821 pInfo->iLayer);
822822 return cmInitParaError;
823823 break;
@@ -854,21 +854,21 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 30 unmodified lines
854854 case ENCODER_OPTION_LTR: {
855855 uint32_t iValue = * ((uint32_t*) (pOption));
856856 m_pEncContext->pSvcParam->bEnableLongTermReference = iValue ? true : false;
857− WelsLog (m_pEncContext, WELS_LOG_WARNING, " CWelsH264SVCEncoder::SetOption enable LTR = %d",
857+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING, " CWelsH264SVCEncoder::SetOption enable LTR = %d",
858858 m_pEncContext->pSvcParam->bEnableLongTermReference);
859859 }
860860 break;
861861 case ENCODER_OPTION_ENABLE_SSEI: {
862862 bool iValue = * ((bool*)pOption);
863863 m_pEncContext->pSvcParam->bEnableSSEI = iValue;
864− WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SSEI = %d \n",
864+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SSEI = %d \n",
865865 m_pEncContext->pSvcParam->bEnableSSEI);
866866 }
867867 break;
868868 case ENCODER_OPTION_ENABLE_PREFIX_NAL_ADDING: {
869869 bool iValue = * ((bool*)pOption);
870870 m_pEncContext->pSvcParam->bPrefixNalAddingCtrl = iValue;
871− WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption bPrefixNalAddingCtrl = %d \n",
871+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption bPrefixNalAddingCtrl = %d \n",
872872 m_pEncContext->pSvcParam->bPrefixNalAddingCtrl);
873873 }
874874 break;
@@ -876,7 +876,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 1 unmodified line
876876 bool iValue = * ((bool*)pOption);
877877
878878 m_pEncContext->pSvcParam->bEnableSpsPpsIdAddition = iValue;
879− WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SPS/PPS ID = %d \n",
879+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SPS/PPS ID = %d \n",
880880 m_pEncContext->pSvcParam->bEnableSpsPpsIdAddition);
881881 }
882882 break;
@@ -921,7 +921,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 38 unmodified lines
921921 case ENCODER_OPTION_PROFILE: {
922922 SProfileInfo* pProfileInfo = (static_cast<SProfileInfo*> (pOption));
923923 if ((pProfileInfo->iLayer < SPATIAL_LAYER_0) || (pProfileInfo->iLayer > SPATIAL_LAYER_3)) {
924− WelsLog (m_pEncContext, WELS_LOG_ERROR,
924+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
925925 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_PROFILE,iLayer = %d(rang0-3)\n", pProfileInfo->iLayer);
926926 return cmInitParaError;
927927 }
@@ -931,7 +931,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 3 unmodified lines
931931 case ENCODER_OPTION_LEVEL: {
932932 SLevelInfo* pLevelInfo = (static_cast<SLevelInfo*> (pOption));
933933 if ((pLevelInfo->iLayer < SPATIAL_LAYER_0) || (pLevelInfo->iLayer > SPATIAL_LAYER_3)) {
934− WelsLog (m_pEncContext, WELS_LOG_ERROR,
934+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
935935 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_PROFILE,iLayer = %d(rang0-3)\n", pLevelInfo->iLayer);
936936 return cmInitParaError;
937937 }
@@ -965,12 +965,12 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 27 unmodified lines
965965
966966 switch (eOptionId) {
967967 case ENCODER_OPTION_INTER_SPATIAL_PRED: { // Inter spatial layer prediction flag
968− WelsLog (m_pEncContext, WELS_LOG_INFO, "ENCODER_OPTION_INTER_SPATIAL_PRED, this feature not supported at present.\n");
968+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "ENCODER_OPTION_INTER_SPATIAL_PRED, this feature not supported at present.\n");
969969 }
970970 break;
971971 case ENCODER_OPTION_DATAFORMAT: { // Input color space
972972 #ifdef REC_FRAME_COUNT
973− WelsLog (m_pEncContext, WELS_LOG_INFO,
973+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
974974 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_DATAFORMAT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
975975 m_uiCountFrameNum, m_iCspInternal);
976976 #endif//REC_FRAME_COUNT
@@ -980,7 +980,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 3 unmodified lines
980980 break;
981981 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
982982 #ifdef REC_FRAME_COUNT
983− WelsLog (m_pEncContext, WELS_LOG_INFO,
983+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
984984 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_IDR_INTERVAL, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
985985 m_uiCountFrameNum, m_iCspInternal);
986986 #endif//REC_FRAME_COUNT
@@ -989,7 +989,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 2 unmodified lines
989989 break;
990990 case ENCODER_OPTION_SVC_ENCODE_PARAM_EXT: { // SVC Encoding Parameter
991991 #ifdef REC_FRAME_COUNT
992− WelsLog (m_pEncContext, WELS_LOG_INFO,
992+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
993993 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
994994 m_uiCountFrameNum, m_iCspInternal);
995995 #endif//REC_FRAME_COUNT
@@ -998,7 +998,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 2 unmodified lines
998998 break;
999999 case ENCODER_OPTION_SVC_ENCODE_PARAM_BASE: { // SVC Encoding Parameter
10001000 #ifdef REC_FRAME_COUNT
1001− WelsLog (m_pEncContext, WELS_LOG_INFO,
1001+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
10021002 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
10031003 m_uiCountFrameNum, m_iCspInternal);
10041004 #endif//REC_FRAME_COUNT
@@ -1008,7 +1008,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 3 unmodified lines
10081008
10091009 case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate
10101010 #ifdef REC_FRAME_COUNT
1011− WelsLog (m_pEncContext, WELS_LOG_INFO,
1011+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
10121012 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_FRAME_RATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
10131013 m_uiCountFrameNum, m_iCspInternal);
10141014 #endif//REC_FRAME_COUNT
@@ -1017,7 +1017,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 2 unmodified lines
10171017 break;
10181018 case ENCODER_OPTION_BITRATE: { // Target bit-rate
10191019 #ifdef REC_FRAME_COUNT
1020− WelsLog (m_pEncContext, WELS_LOG_INFO,
1020+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
10211021 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
10221022 m_uiCountFrameNum, m_iCspInternal);
10231023 #endif//REC_FRAME_COUNT
@@ -1034,7 +1034,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 10 unmodified lines
10341034 break;
10351035 case ENCODER_OPTION_MAX_BITRATE: { // Target bit-rate
10361036 #ifdef REC_FRAME_COUNT
1037− WelsLog (m_pEncContext, WELS_LOG_INFO,
1037+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
10381038 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_MAX_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
10391039 m_uiCountFrameNum, m_iCspInternal);
10401040 #endif//REC_FRAME_COUNT
@@ -1077,7 +1077,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 36 unmodified lines
10771077 case videoFormatYV12:
10781078 WelsStrcat (strFileName, 256, "yuv"); // confirmed_safe_unsafe_usage
10791079 pFile = WelsFopen (strFileName, "ab+");
1080− // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_I420, m_iCspInternal= 0x%x\n", m_iCspInternal);
1080+ // WelsLog( &m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "WELS_CSP_I420, m_iCspInternal= 0x%x\n", m_iCspInternal);
10811081 if (NULL != pFile) {
10821082 fwrite (pSrc, sizeof (uint8_t), (iDataLength * 3) >> 1, pFile);
10831083 fflush (pFile);
@@ -1095,7 +1095,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 11 unmodified lines
10951095 case videoFormatBGR:
10961096 WelsStrcat (strFileName, 256, "bgr"); // confirmed_safe_unsafe_usage
10971097 pFile = WelsFopen (strFileName, "ab+");
1098− // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_BGR, m_iCspInternal= 0x%x\n", m_iCspInternal);
1098+ // WelsLog( &m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "WELS_CSP_BGR, m_iCspInternal= 0x%x\n", m_iCspInternal);
10991099 if (NULL != pFile) {
11001100 fwrite (pSrc, sizeof (uint8_t), iDataLength * 3, pFile);
11011101 fflush (pFile);
@@ -1112,7 +1112,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 10 unmodified lines
11121112 }
11131113 break;
11141114 default:
1115− WelsLog (m_pEncContext, WELS_LOG_INFO, "Exclusive case, m_iCspInternal= 0x%x\n", m_iCspInternal);
1115+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "Exclusive case, m_iCspInternal= 0x%x\n", m_iCspInternal);
11161116 break;
11171117 }
11181118 #endif//DUMP_SRC_PICTURE

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