History

Remove tabs where a simple space is just enough

Martin Storsjö committed 11 years ago

Commit ca51ee01 parent 51efa5754 files · +769 −772Browse files

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

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+17−17
@@ -163,7 +163,7 @@ CWelsH264SVCEncoder::~CWelsH264SVCEncoder() { · 162 unmodified lines
163 163
164void CWelsH264SVCEncoder::InitEncoder (void) {164void CWelsH264SVCEncoder::InitEncoder (void) {
165 165
166 m_pWelsTrace = new welsCodecTrace();166 m_pWelsTrace = new welsCodecTrace();
167 if (m_pWelsTrace == NULL) {167 if (m_pWelsTrace == NULL) {
168 return;168 return;
169 }169 }
@@ -257,7 +257,7 @@ int CWelsH264SVCEncoder::InitializeInternal (SWelsSvcCodingParam* pCfg) { · 87 unmodified lines
257 return cmInitParaError;257 return cmInitParaError;
258 }258 }
259 if (pCfg->iTemporalLayerNum < 1)259 if (pCfg->iTemporalLayerNum < 1)
260 pCfg->iTemporalLayerNum = 1;260 pCfg->iTemporalLayerNum = 1;
261 if (pCfg->iTemporalLayerNum > MAX_TEMPORAL_LEVEL) {261 if (pCfg->iTemporalLayerNum > MAX_TEMPORAL_LEVEL) {
262 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,262 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
263 "CWelsH264SVCEncoder::Initialize(), invalid iTemporalLayerNum= %d, valid at range of [1, %d].",263 "CWelsH264SVCEncoder::Initialize(), invalid iTemporalLayerNum= %d, valid at range of [1, %d].",
@@ -312,9 +312,9 @@ int CWelsH264SVCEncoder::InitializeInternal (SWelsSvcCodingParam* pCfg) { · 48 unmodified lines
312 } else {312 } else {
313 pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? LONG_TERM_REF_NUM : 0;313 pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? LONG_TERM_REF_NUM : 0;
314 if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT) {314 if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT) {
315 pCfg->iNumRefFrame = ((pCfg->uiGopSize >> 1) > 1) ? ((pCfg->uiGopSize >> 1) + pCfg->iLTRRefNum) :315 pCfg->iNumRefFrame = ((pCfg->uiGopSize >> 1) > 1) ? ((pCfg->uiGopSize >> 1) + pCfg->iLTRRefNum) :
316 (MIN_REF_PIC_COUNT + pCfg->iLTRRefNum);316 (MIN_REF_PIC_COUNT + pCfg->iLTRRefNum);
317 pCfg->iNumRefFrame = WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);317 pCfg->iNumRefFrame = WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);
318 }318 }
319 }319 }
320 320
@@ -360,7 +360,7 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { · 39 unmodified lines
360 360
361 if (NULL != m_pEncContext) {361 if (NULL != m_pEncContext) {
362 WelsUninitEncoderExt (&m_pEncContext);362 WelsUninitEncoderExt (&m_pEncContext);
363 m_pEncContext = NULL;363 m_pEncContext = NULL;
364 }364 }
365 365
366 m_bInitialFlag = false;366 m_bInitialFlag = false;
@@ -671,8 +671,8 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 304 unmodified lines
671 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal= 0x%x", m_iCspInternal);671 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal= 0x%x", m_iCspInternal);
672 }672 }
673 break;673 break;
674 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval674 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
675 int32_t iValue = * ((int32_t*)pOption);675 int32_t iValue = * ((int32_t*)pOption);
676 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,676 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
677 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IDR_INTERVAL iValue= %d", iValue);677 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IDR_INTERVAL iValue= %d", iValue);
678 if (iValue < -1 || iValue == 0)678 if (iValue < -1 || iValue == 0)
@@ -680,7 +680,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 1 unmodified line
680 if (iValue == (int32_t)m_pEncContext->pSvcParam->uiIntraPeriod) {680 if (iValue == (int32_t)m_pEncContext->pSvcParam->uiIntraPeriod) {
681 return cmResultSuccess;681 return cmResultSuccess;
682 }682 }
683 m_pEncContext->pSvcParam->uiIntraPeriod = (uint32_t)iValue;683 m_pEncContext->pSvcParam->uiIntraPeriod = (uint32_t)iValue;
684 }684 }
685 break;685 break;
686 case ENCODER_OPTION_SVC_ENCODE_PARAM_BASE: { // SVC Encoding Parameter686 case ENCODER_OPTION_SVC_ENCODE_PARAM_BASE: { // SVC Encoding Parameter
@@ -769,8 +769,8 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 82 unmodified lines
769 }769 }
770 }770 }
771 break;771 break;
772 case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate772 case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate
773 float iValue = * ((float*)pOption);773 float iValue = * ((float*)pOption);
774 if (iValue <= 0) {774 if (iValue <= 0) {
775 return cmInitParaError;775 return cmInitParaError;
776 }776 }
@@ -791,7 +791,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 14 unmodified lines
791 iBitrate);791 iBitrate);
792 return cmInitParaError;792 return cmInitParaError;
793 }793 }
794 iBitrate = WELS_CLIP3 (iBitrate, MIN_BIT_RATE, MAX_BIT_RATE);794 iBitrate = WELS_CLIP3 (iBitrate, MIN_BIT_RATE, MAX_BIT_RATE);
795 switch (pInfo->iLayer) {795 switch (pInfo->iLayer) {
796 case SPATIAL_LAYER_ALL:796 case SPATIAL_LAYER_ALL:
797 m_pEncContext->pSvcParam->iTargetBitrate = iBitrate;797 m_pEncContext->pSvcParam->iTargetBitrate = iBitrate;
@@ -837,7 +837,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 39 unmodified lines
837 iBitrate);837 iBitrate);
838 return cmInitParaError;838 return cmInitParaError;
839 }839 }
840 iBitrate = WELS_CLIP3 (iBitrate, MIN_BIT_RATE, MAX_BIT_RATE);840 iBitrate = WELS_CLIP3 (iBitrate, MIN_BIT_RATE, MAX_BIT_RATE);
841 switch (pInfo->iLayer) {841 switch (pInfo->iLayer) {
842 case SPATIAL_LAYER_ALL:842 case SPATIAL_LAYER_ALL:
843 m_pEncContext->pSvcParam->iMaxBitrate = iBitrate;843 m_pEncContext->pSvcParam->iMaxBitrate = iBitrate;
@@ -875,7 +875,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 31 unmodified lines
875 break;875 break;
876 case ENCODER_OPTION_RC_MODE: { // 0:quality mode;1:bit-rate mode;2:bitrate limited mode876 case ENCODER_OPTION_RC_MODE: { // 0:quality mode;1:bit-rate mode;2:bitrate limited mode
877 int32_t iValue = * ((int32_t*)pOption);877 int32_t iValue = * ((int32_t*)pOption);
878 m_pEncContext->pSvcParam->iRCMode = (RC_MODES) iValue;878 m_pEncContext->pSvcParam->iRCMode = (RC_MODES) iValue;
879 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,879 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
880 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_RC_MODE iRCMode= %d ",880 "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_RC_MODE iRCMode= %d ",
881 iValue);881 iValue);
@@ -883,7 +883,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 1 unmodified line
883 break;883 break;
884 case ENCODER_PADDING_PADDING: { // 0:disable padding;1:padding884 case ENCODER_PADDING_PADDING: { // 0:disable padding;1:padding
885 int32_t iValue = * ((int32_t*)pOption);885 int32_t iValue = * ((int32_t*)pOption);
886 m_pEncContext->pSvcParam->iPaddingFlag = iValue;886 m_pEncContext->pSvcParam->iPaddingFlag = iValue;
887 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,887 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
888 "CWelsH264SVCEncoder::SetOption():ENCODER_PADDING_PADDING iPaddingFlag= %d ",888 "CWelsH264SVCEncoder::SetOption():ENCODER_PADDING_PADDING iPaddingFlag= %d ",
889 iValue);889 iValue);
@@ -1114,7 +1114,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 224 unmodified lines
1114 case ENCODER_OPTION_DATAFORMAT: { // Input color space1114 case ENCODER_OPTION_DATAFORMAT: { // Input color space
1115 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,1115 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1116 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal= 0x%x", m_iCspInternal);1116 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal= 0x%x", m_iCspInternal);
1117 * ((int32_t*)pOption) = m_iCspInternal;1117 * ((int32_t*)pOption) = m_iCspInternal;
1118 }1118 }
1119 break;1119 break;
1120 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval1120 case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
@@ -1141,7 +1141,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 20 unmodified lines
1141 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,1141 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
1142 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_FRAME_RATE, fMaxFrameRate = %.6ff",1142 "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_FRAME_RATE, fMaxFrameRate = %.6ff",
1143 m_pEncContext->pSvcParam->fMaxFrameRate);1143 m_pEncContext->pSvcParam->fMaxFrameRate);
1144 * ((float*)pOption) = m_pEncContext->pSvcParam->fMaxFrameRate;1144 * ((float*)pOption) = m_pEncContext->pSvcParam->fMaxFrameRate;
1145 }1145 }
1146 break;1146 break;
1147 case ENCODER_OPTION_BITRATE: { // Target bit-rate1147 case ENCODER_OPTION_BITRATE: { // Target bit-rate
@@ -1196,7 +1196,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 48 unmodified lines
1196 }1196 }
1197 break;1197 break;
1198 case ENCODER_OPTION_STATISTICS_LOG_INTERVAL: {1198 case ENCODER_OPTION_STATISTICS_LOG_INTERVAL: {
1199 * ((int32_t*)pOption) = m_pEncContext->iStatisticsLogInterval;1199 * ((int32_t*)pOption) = m_pEncContext->iStatisticsLogInterval;
1200 }1200 }
1201 break;1201 break;
1202 case ENCODER_OPTION_COMPLEXITY: {1202 case ENCODER_OPTION_COMPLEXITY: {

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