ref: 063709c92e8bafe467d384f564afbdc6b66eb39a
parent: 85414c1904b17d3b6ed58b1e2b09dd5b6f99e288
parent: 3331ff656676a43e5fd97327c569734399d5fa40
author: Ethan Hugg <ethanhugg@gmail.com>
date: Thu Dec 12 03:44:04 EST 2013
Merge pull request #19 from mstorsjo/typofix Fix a typo in the public codec API
--- a/codec/api/svc/codec_api.h
+++ b/codec/api/svc/codec_api.h
@@ -45,7 +45,7 @@
virtual int Initialize(SVCEncodingParam* pParam, const INIT_TYPE kiInitType = INIT_TYPE_PARAMETER_BASED) = 0;
virtual int Initialize(void* pParam, const INIT_TYPE kiInitType = INIT_TYPE_CONFIG_BASED) = 0;
- virtual int Unintialize() = 0;
+ virtual int Uninitialize() = 0;
/*
* return: EVideoFrameType [IDR: videoFrameTypeIDR; P: videoFrameTypeP; ERROR: videoFrameTypeInvalid]
@@ -77,7 +77,7 @@
{public:
virtual long Initialize(void* pParam, const INIT_TYPE iInitType) = 0;
- virtual long Unintialize() = 0;
+ virtual long Uninitialize() = 0;
virtual DECODING_STATE DecodeFrame( const unsigned char* pSrc,
const int iSrcLen,
--- a/codec/console/dec/src/h264dec.cpp
+++ b/codec/console/dec/src/h264dec.cpp
@@ -530,7 +530,7 @@
}
if ( pDecoder ){- pDecoder->Unintialize();
+ pDecoder->Uninitialize();
#if defined(_MSC_VER)
pDestroyDecoderFunc( pDecoder );
--- a/codec/decoder/plus/inc/welsDecoderExt.h
+++ b/codec/decoder/plus/inc/welsDecoderExt.h
@@ -65,7 +65,7 @@
virtual ~CWelsDecoder();
virtual long Initialize(void_t* pParam, const INIT_TYPE keInitType);
- virtual long Unintialize();
+ virtual long Uninitialize();
/***************************************************************************
* Description:
--- a/codec/decoder/plus/src/welsDecoderExt.cpp
+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
@@ -191,7 +191,7 @@
return cmResultSuccess;
}
-long CWelsDecoder::Unintialize()
+long CWelsDecoder::Uninitialize()
{UninitDecoder();
--- a/codec/encoder/plus/inc/welsEncoderExt.h
+++ b/codec/encoder/plus/inc/welsEncoderExt.h
@@ -69,7 +69,7 @@
virtual int Initialize(SVCEncodingParam* argv, const INIT_TYPE init_type);
virtual int Initialize(void* argv, const INIT_TYPE init_type);
- virtual int Unintialize();
+ virtual int Uninitialize();
/*
* return: EVideoFrameType [IDR: videoFrameTypeIDR; P: videoFrameTypeP; ERROR: videoFrameTypeInvalid]
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -258,7 +258,7 @@
m_iSwitchTimes = 0;
#endif//OUTPUT_BIT_STREAM
- Unintialize();
+ Uninitialize();
}
void CWelsH264SVCEncoder::InitEncoder( void )
@@ -301,7 +301,7 @@
if ( m_bInitialFlag )
{
WelsLog(m_pEncContext, WELS_LOG_WARNING, "CWelsH264SVCEncoder::Initialize(), reinitialize, m_bInitialFlag= %d\n", m_bInitialFlag);
- Unintialize();
+ Uninitialize();
}
SVCEncodingParam sEncodingParam;
@@ -352,7 +352,7 @@
// Convert SVCEncodingParam into WelsSVCParamConfig here..
if ( sConfig.ParamTranscode( sEncodingParam, true ) ){
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), parameter_translation failed.\n");
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
@@ -372,7 +372,7 @@
if ( m_bInitialFlag )
{
WelsLog(m_pEncContext, WELS_LOG_WARNING, "CWelsH264SVCEncoder::Initialize(), reinitialize, m_bInitialFlag= %d.\n", m_bInitialFlag);
- Unintialize();
+ Uninitialize();
}
SWelsSvcCodingParam *pCfg = static_cast<SWelsSvcCodingParam*>(argv);
@@ -381,7 +381,7 @@
if ( 0 == iColorspace )
{
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInputCsp= %d.\n", iColorspace);
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
@@ -389,7 +389,7 @@
const int32_t iNumOfLayers = pCfg->iNumDependencyLayer;
if ( iNumOfLayers < 1 || iNumOfLayers > MAX_DEPENDENCY_LAYER ){
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iNumDependencyLayer= %d, valid at range of [1, %d].\n", iNumOfLayers, MAX_DEPENDENCY_LAYER);
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
if ( pCfg->iNumTemporalLayer < 1 )
@@ -396,7 +396,7 @@
pCfg->iNumTemporalLayer = 1;
if ( pCfg->iNumTemporalLayer > MAX_TEMPORAL_LEVEL ){
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iNumTemporalLayer= %d, valid at range of [1, %d].\n", pCfg->iNumTemporalLayer, MAX_TEMPORAL_LEVEL);
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
@@ -404,13 +404,13 @@
if ( pCfg->uiGopSize < 1 || pCfg->uiGopSize > MAX_GOP_SIZE ){
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid uiGopSize= %d, valid at range of [1, %d].\n", pCfg->uiGopSize, MAX_GOP_SIZE);
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
if ( !WELS_POWER2_IF(pCfg->uiGopSize) ){
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);
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
@@ -417,7 +417,7 @@
if ( pCfg->uiIntraPeriod && pCfg->uiIntraPeriod < pCfg->uiGopSize )
{
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);
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
@@ -424,7 +424,7 @@
if ( ( pCfg->uiIntraPeriod && (pCfg->uiIntraPeriod & (pCfg->uiGopSize-1)) != 0) )
{
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);
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
@@ -455,7 +455,7 @@
if ( NULL == m_pSrcPicList ){
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), pOut of memory due m_pSrcPicList memory request.\n");
- Unintialize();
+ Uninitialize();
return cmMallocMemeError;
}
@@ -473,7 +473,7 @@
if ( NULL == m_pSrcPicList[i] )
{
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), pOut of memory due m_pSrcPicList[%d] memory request.\n", i);
- Unintialize();
+ Uninitialize();
m_iSrcListSize = 0;
return cmMallocMemeError;
}
@@ -503,7 +503,7 @@
if ( WelsInitEncoderExt( &m_pEncContext, pCfg ) )
{
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), WelsInitEncoderExt failed.\n");
- Unintialize();
+ Uninitialize();
return cmInitParaError;
}
@@ -516,7 +516,7 @@
/*
* SVC Encoder Uninitialization
*/
-int32_t CWelsH264SVCEncoder::Unintialize()
+int32_t CWelsH264SVCEncoder::Uninitialize()
{
if ( !m_bInitialFlag )
{
@@ -523,10 +523,10 @@
return 0;
}
- WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Unintialize()..\n" );
+ WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize()..\n" );
#ifdef REC_FRAME_COUNT
- WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Unintialize, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum, m_iCspInternal );
+ WelsLog( m_pEncContext, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum, m_iCspInternal );
#endif//REC_FRAME_COUNT
if ( NULL != m_pEncContext )