generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a typo in the public codec API

Browse Source
This commit is contained in:
Martin Storsjö 2013-12-12 16:12:12 +02:00
parent 85414c1904
commit 3331ff6566
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/api/svc/codec_api.h
View File

@ -45,7 +45,7 @@ public:
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 @@ class ISVCDecoder
{
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,

2
codec/console/dec/src/h264dec.cpp
View File

@ -530,7 +530,7 @@ int32_t main(int32_t iArgC, char* pArgV[])
}
if ( pDecoder ){
pDecoder->Unintialize();
pDecoder->Uninitialize();
#if defined(_MSC_VER)
pDestroyDecoderFunc( pDecoder );

2
codec/decoder/plus/inc/welsDecoderExt.h
View File

@ -65,7 +65,7 @@ public:
virtual ~CWelsDecoder();
virtual long Initialize(void_t* pParam, const INIT_TYPE keInitType);
virtual long Unintialize();
virtual long Uninitialize();
/***************************************************************************
* Description:

2
codec/decoder/plus/src/welsDecoderExt.cpp
View File

@ -191,7 +191,7 @@ long CWelsDecoder::Initialize(void_t* pParam, const INIT_TYPE keInitType)
return cmResultSuccess;
}
long CWelsDecoder::Unintialize()
long CWelsDecoder::Uninitialize()
{
UninitDecoder();

2
codec/encoder/plus/inc/welsEncoderExt.h
View File

@ -69,7 +69,7 @@ public:
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]

34
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -258,7 +258,7 @@ CWelsH264SVCEncoder::~CWelsH264SVCEncoder()
m_iSwitchTimes = 0;
#endif//OUTPUT_BIT_STREAM
Unintialize();
Uninitialize();
}
void CWelsH264SVCEncoder::InitEncoder( void )
@ -301,7 +301,7 @@ int CWelsH264SVCEncoder::Initialize(SVCEncodingParam* argv, const INIT_TYPE iIni
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 @@ int CWelsH264SVCEncoder::Initialize(SVCEncodingParam* argv, const INIT_TYPE iIni
// 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 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
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 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
if ( 0 == iColorspace )
{
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInputCsp= %d.\n", iColorspace);
Unintialize();
Uninitialize();
return cmInitParaError;
}
@ -389,14 +389,14 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
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 )
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,27 +404,27 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
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;
}
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;
}
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 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
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 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
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 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
if ( WelsInitEncoderExt( &m_pEncContext, pCfg ) )
{
WelsLog(m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), WelsInitEncoderExt failed.\n");
Unintialize();
Uninitialize();
return cmInitParaError;
}
@ -516,17 +516,17 @@ int CWelsH264SVCEncoder::Initialize(void * argv, const INIT_TYPE iInitType)
/*
* SVC Encoder Uninitialization
*/
int32_t CWelsH264SVCEncoder::Unintialize()
int32_t CWelsH264SVCEncoder::Uninitialize()
{
if ( !m_bInitialFlag )
{
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 )