History

Fix a typo in the public codec API

Martin Storsjö committed 12 years ago

Commit 3331ff61 parent 85414c16 files · +23 −23Browse files

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

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+17−17
@@ -258,7 +258,7 @@ CWelsH264SVCEncoder::~CWelsH264SVCEncoder() · 257 unmodified lines
258258 m_iSwitchTimes = 0;
259259 #endif//OUTPUT_BIT_STREAM
260260
261− Unintialize();
261+ Uninitialize();
262262 }
263263
264264 void CWelsH264SVCEncoder::InitEncoder( void )
@@ -301,7 +301,7 @@ int CWelsH264SVCEncoder::Initialize(SVCEncodingParam* argv, const INIT_TYPE iIni · 36 unmodified lines
301301 if ( m_bInitialFlag )
302302 {
303303 WelsLog(m_pEncContext, WELS_LOG_WARNING, "CWelsH264SVCEncoder::Initialize(), reinitialize, m_bInitialFlag= %d\n", m_bInitialFlag);
304− Unintialize();
304+ Uninitialize();
305305 }
306306
307307 SVCEncodingParam sEncodingParam;
@@ -352,7 +352,7 @@ int CWelsH264SVCEncoder::Initialize(SVCEncodingParam* argv, const INIT_TYPE iIni · 44 unmodified lines
352352 // Convert SVCEncodingParam into WelsSVCParamConfig here..
353353 if ( sConfig.ParamTranscode( sEncodingParam, true ) ){
354354 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), parameter_translation failed.\n");
355− Unintialize();
355+ Uninitialize();
356356 return cmInitParaError;
357357 }
358358
@@ -372,7 +372,7 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 13 unmodified lines
372372 if ( m_bInitialFlag )
373373 {
374374 WelsLog(m_pEncContext, WELS_LOG_WARNING, "CWelsH264SVCEncoder::Initialize(), reinitialize, m_bInitialFlag= %d.\n", m_bInitialFlag);
375− Unintialize();
375+ Uninitialize();
376376 }
377377
378378 SWelsSvcCodingParam *pCfg = static_cast<SWelsSvcCodingParam*>(argv);
@@ -381,7 +381,7 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 2 unmodified lines
381381 if ( 0 == iColorspace )
382382 {
383383 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInputCsp= %d.\n", iColorspace);
384− Unintialize();
384+ Uninitialize();
385385 return cmInitParaError;
386386 }
387387
@@ -389,14 +389,14 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 1 unmodified line
389389 const int32_t iNumOfLayers = pCfg->iNumDependencyLayer;
390390 if ( iNumOfLayers < 1 || iNumOfLayers > MAX_DEPENDENCY_LAYER ){
391391 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iNumDependencyLayer= %d, valid at range of [1, %d].\n", iNumOfLayers, MAX_DEPENDENCY_LAYER);
392− Unintialize();
392+ Uninitialize();
393393 return cmInitParaError;
394394 }
395395 if ( pCfg->iNumTemporalLayer < 1 )
396396 pCfg->iNumTemporalLayer = 1;
397397 if ( pCfg->iNumTemporalLayer > MAX_TEMPORAL_LEVEL ){
398398 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iNumTemporalLayer= %d, valid at range of [1, %d].\n", pCfg->iNumTemporalLayer, MAX_TEMPORAL_LEVEL);
399− Unintialize();
399+ Uninitialize();
400400 return cmInitParaError;
401401 }
402402
@@ -404,27 +404,27 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 1 unmodified line
404404
405405 if ( pCfg->uiGopSize < 1 || pCfg->uiGopSize > MAX_GOP_SIZE ){
406406 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid uiGopSize= %d, valid at range of [1, %d].\n", pCfg->uiGopSize, MAX_GOP_SIZE);
407− Unintialize();
407+ Uninitialize();
408408 return cmInitParaError;
409409 }
410410
411411 if ( !WELS_POWER2_IF(pCfg->uiGopSize) ){
412412 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid uiGopSize= %d, valid at range of [1, %d] and yield to power of 2.\n", pCfg->uiGopSize, MAX_GOP_SIZE);
413− Unintialize();
413+ Uninitialize();
414414 return cmInitParaError;
415415 }
416416
417417 if ( pCfg->uiIntraPeriod && pCfg->uiIntraPeriod < pCfg->uiGopSize )
418418 {
419419 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid uiIntraPeriod= %d, valid in case it equals to 0 for unlimited intra period or exceeds specified uiGopSize= %d.\n", pCfg->uiIntraPeriod, pCfg->uiGopSize);
420− Unintialize();
420+ Uninitialize();
421421 return cmInitParaError;
422422 }
423423
424424 if ( ( pCfg->uiIntraPeriod && (pCfg->uiIntraPeriod & (pCfg->uiGopSize-1)) != 0) )
425425 {
426426 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid uiIntraPeriod= %d, valid in case it equals to 0 for unlimited intra period or exceeds specified uiGopSize= %d also multiple of it.\n", pCfg->uiIntraPeriod, pCfg->uiGopSize);
427− Unintialize();
427+ Uninitialize();
428428 return cmInitParaError;
429429 }
430430
@@ -455,7 +455,7 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 24 unmodified lines
455455
456456 if ( NULL == m_pSrcPicList ){
457457 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), pOut of memory due m_pSrcPicList memory request.\n");
458− Unintialize();
458+ Uninitialize();
459459 return cmMallocMemeError;
460460 }
461461
@@ -473,7 +473,7 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 11 unmodified lines
473473 if ( NULL == m_pSrcPicList[i] )
474474 {
475475 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), pOut of memory due m_pSrcPicList[%d] memory request.\n", i);
476− Unintialize();
476+ Uninitialize();
477477 m_iSrcListSize = 0;
478478 return cmMallocMemeError;
479479 }
@@ -503,7 +503,7 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 23 unmodified lines
503503 if ( WelsInitEncoderExt( &m_pEncContext, pCfg ) )
504504 {
505505 WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), WelsInitEncoderExt failed.\n");
506− Unintialize();
506+ Uninitialize();
507507 return cmInitParaError;
508508 }
509509
@@ -516,17 +516,17 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType) · 6 unmodified lines
516516 /*
517517 * SVC Encoder Uninitialization
518518 */
519−int32_t CWelsH264SVCEncoder::Unintialize()
519+int32_t CWelsH264SVCEncoder::Uninitialize()
520520 {
521521 if ( !m_bInitialFlag )
522522 {
523523 return 0;
524524 }
525525
526− WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Unintialize()..\n" );
526+ WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize()..\n" );
527527
528528 #ifdef REC_FRAME_COUNT
529− WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Unintialize, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum, m_iCspInternal );
529+ WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum, m_iCspInternal );
530530 #endif//REC_FRAME_COUNT
531531
532532 if ( NULL != m_pEncContext )

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