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

Merge pull request #184 from mstorsjo/c-interface-vtbl

Browse Source 
Add a public C API to the library by mimicking the C++ ABI with a C struct
This commit is contained in:
Ethan Hugg 2014-01-22 08:11:40 -08:00
commit 691e8379b5
8 changed files with 142 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,36 +36,43 @@
#include "codec_app_def.h" #include "codec_app_def.h"
#include "codec_def.h" #include "codec_def.h"
#if defined(_WIN32) || defined(__cdecl)
#define EXTAPI __cdecl
#else
#define EXTAPI
#endif
#ifdef __cplusplus
class ISVCEncoder { class ISVCEncoder {
public: public:
/* /*
* return: CM_RETURN: 0 - success; otherwise - failed; * return: CM_RETURN: 0 - success; otherwise - failed;
*/ */
virtual int Initialize (SVCEncodingParam* pParam, const INIT_TYPE kiInitType = INIT_TYPE_PARAMETER_BASED) = 0; virtual int EXTAPI 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 EXTAPI Initialize2 (void* pParam, const INIT_TYPE kiInitType = INIT_TYPE_CONFIG_BASED) = 0;
virtual int Uninitialize() = 0; virtual int EXTAPI Uninitialize() = 0;
/* /*
* return: EVideoFrameType [IDR: videoFrameTypeIDR; P: videoFrameTypeP; ERROR: videoFrameTypeInvalid] * return: EVideoFrameType [IDR: videoFrameTypeIDR; P: videoFrameTypeP; ERROR: videoFrameTypeInvalid]
*/ */
virtual int EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo) = 0; virtual int EXTAPI EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo) = 0;
virtual int EncodeFrame (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) = 0; virtual int EXTAPI EncodeFrame2 (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) = 0;
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */
virtual int EncodeParameterSets (SFrameBSInfo* pBsInfo) = 0; virtual int EXTAPI EncodeParameterSets (SFrameBSInfo* pBsInfo) = 0;
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */
virtual int PauseFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo) = 0; virtual int EXTAPI PauseFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo) = 0;
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */
virtual int ForceIntraFrame (bool bIDR) = 0; virtual int EXTAPI ForceIntraFrame (bool bIDR) = 0;
/************************************************************************ /************************************************************************
* InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,.. * InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,..
@ -73,58 +80,118 @@ class ISVCEncoder {
/* /*
* return: CM_RETURN: 0 - success; otherwise - failed; * return: CM_RETURN: 0 - success; otherwise - failed;
*/ */
virtual int SetOption (ENCODER_OPTION eOptionId, void* pOption) = 0; virtual int EXTAPI SetOption (ENCODER_OPTION eOptionId, void* pOption) = 0;
virtual int GetOption (ENCODER_OPTION eOptionId, void* pOption) = 0; virtual int EXTAPI GetOption (ENCODER_OPTION eOptionId, void* pOption) = 0;
}; };
class ISVCDecoder { class ISVCDecoder {
public: public:
virtual long Initialize (void* pParam, const INIT_TYPE iInitType) = 0; virtual long EXTAPI Initialize (void* pParam, const INIT_TYPE iInitType) = 0;
virtual long Uninitialize() = 0; virtual long EXTAPI Uninitialize() = 0;
virtual DECODING_STATE DecodeFrame (const unsigned char* pSrc, virtual DECODING_STATE EXTAPI DecodeFrame (const unsigned char* pSrc,
const int iSrcLen, const int iSrcLen,
unsigned char** ppDst, unsigned char** ppDst,
int* pStride, int* pStride,
int& iWidth, int& iWidth,
int& iHeight) = 0; int& iHeight) = 0;
/* /*
* src must be 4 byte aligned, recommend 16 byte aligned. the available src size must be multiple of 4. * src must be 4 byte aligned, recommend 16 byte aligned. the available src size must be multiple of 4.
*/ */
virtual DECODING_STATE DecodeFrame (const unsigned char* pSrc, virtual DECODING_STATE EXTAPI DecodeFrame2 (const unsigned char* pSrc,
const int iSrcLen, const int iSrcLen,
void** ppDst, void** ppDst,
SBufferInfo* pDstInfo) = 0; SBufferInfo* pDstInfo) = 0;
/* /*
* src must be 4 byte aligned, recommend 16 byte aligned. the available src size must be multiple of 4. * src must be 4 byte aligned, recommend 16 byte aligned. the available src size must be multiple of 4.
* this API does not work for now!! This is for future use to support non-I420 color format output. * this API does not work for now!! This is for future use to support non-I420 color format output.
*/ */
virtual DECODING_STATE DecodeFrameEx (const unsigned char* pSrc, virtual DECODING_STATE EXTAPI DecodeFrameEx (const unsigned char* pSrc,
const int iSrcLen, const int iSrcLen,
unsigned char* pDst, unsigned char* pDst,
int iDstStride, int iDstStride,
int& iDstLen, int& iDstLen,
int& iWidth, int& iWidth,
int& iHeight, int& iHeight,
int& iColorFormat) = 0; int& iColorFormat) = 0;
/************************************************************************* /*************************************************************************
* OutDataFormat * OutDataFormat
*************************************************************************/ *************************************************************************/
virtual long SetOption (DECODER_OPTION eOptionId, void* pOption) = 0; virtual long EXTAPI SetOption (DECODER_OPTION eOptionId, void* pOption) = 0;
virtual long GetOption (DECODER_OPTION eOptionId, void* pOption) = 0; virtual long EXTAPI GetOption (DECODER_OPTION eOptionId, void* pOption) = 0;
}; };
extern "C" extern "C"
{ {
#else
typedef struct ISVCEncoderVtbl ISVCEncoderVtbl;
typedef const ISVCEncoderVtbl* ISVCEncoder;
struct ISVCEncoderVtbl {
int (*Initialize) (ISVCEncoder*, SVCEncodingParam* pParam, const INIT_TYPE kiInitType);
int (*Initialize2) (ISVCEncoder*, void* pParam, const INIT_TYPE kiInitType);
int (*Uninitialize) (ISVCEncoder*);
int (*EncodeFrame) (ISVCEncoder*, const unsigned char* kpSrc, SFrameBSInfo* pBsInfo);
int (*EncodeFrame2) (ISVCEncoder*, const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo);
int (*EncodeParameterSets) (ISVCEncoder*, SFrameBSInfo* pBsInfo);
int (*PauseFrame) (ISVCEncoder*, const unsigned char* kpSrc, SFrameBSInfo* pBsInfo);
int (*ForceIntraFrame) (ISVCEncoder*, bool bIDR);
int (*SetOption) (ISVCEncoder*, ENCODER_OPTION eOptionId, void* pOption);
int (*GetOption) (ISVCEncoder*, ENCODER_OPTION eOptionId, void* pOption);
};
typedef struct ISVCDecoderVtbl ISVCDecoderVtbl;
typedef const ISVCDecoderVtbl* ISVCDecoder;
struct ISVCDecoderVtbl {
long (*Initialize) (ISVCDecoder*, void* pParam, const INIT_TYPE iInitType);
long (*Uninitialize) (ISVCDecoder*);
DECODING_STATE (*DecodeFrame) (ISVCDecoder*, const unsigned char* pSrc,
const int iSrcLen,
unsigned char** ppDst,
int* pStride,
int* iWidth,
int* iHeight);
DECODING_STATE (*DecodeFrame2) (ISVCDecoder*, const unsigned char* pSrc,
const int iSrcLen,
void** ppDst,
SBufferInfo* pDstInfo);
DECODING_STATE (*DecodeFrameEx) (ISVCDecoder*, const unsigned char* pSrc,
const int iSrcLen,
unsigned char* pDst,
int iDstStride,
int* iDstLen,
int* iWidth,
int* iHeight,
int* iColorFormat);
long (*SetOption) (ISVCDecoder*, DECODER_OPTION eOptionId, void* pOption);
long (*GetOption) (ISVCDecoder*, DECODER_OPTION eOptionId, void* pOption);
};
#endif
int CreateSVCEncoder (ISVCEncoder** ppEncoder); int CreateSVCEncoder (ISVCEncoder** ppEncoder);
void DestroySVCEncoder (ISVCEncoder* pEncoder); void DestroySVCEncoder (ISVCEncoder* pEncoder);
long CreateDecoder (ISVCDecoder** ppDecoder); long CreateDecoder (ISVCDecoder** ppDecoder);
void DestroyDecoder (ISVCDecoder* pDecoder); void DestroyDecoder (ISVCDecoder* pDecoder);
#ifdef __cplusplus
} }
#endif
#endif//WELS_VIDEO_CODEC_SVC_API_H__ #endif//WELS_VIDEO_CODEC_SVC_API_H__

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

@ -217,7 +217,7 @@ void_t H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, co
pData[2] = NULL; pData[2] = NULL;
memset (&sDstBufInfo, 0, sizeof (SBufferInfo)); memset (&sDstBufInfo, 0, sizeof (SBufferInfo));
pDecoder->DecodeFrame (pBuf + iBufPos, iSliceSize, pData, &sDstBufInfo); pDecoder->DecodeFrame2 (pBuf + iBufPos, iSliceSize, pData, &sDstBufInfo);
if (sDstBufInfo.iBufferStatus == 1) { if (sDstBufInfo.iBufferStatus == 1) {
pDst[0] = (uint8_t*)pData[0]; pDst[0] = (uint8_t*)pData[0];
@ -259,7 +259,7 @@ void_t H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, co
pData[2] = NULL; pData[2] = NULL;
memset (&sDstBufInfo, 0, sizeof (SBufferInfo)); memset (&sDstBufInfo, 0, sizeof (SBufferInfo));
pDecoder->DecodeFrame (NULL, 0, pData, &sDstBufInfo); pDecoder->DecodeFrame2 (NULL, 0, pData, &sDstBufInfo);
if (sDstBufInfo.iBufferStatus == 1) { if (sDstBufInfo.iBufferStatus == 1) {
pDst[0] = (uint8_t*)pData[0]; pDst[0] = (uint8_t*)pData[0];
pDst[1] = (uint8_t*)pData[1]; pDst[1] = (uint8_t*)pData[1];

4
codec/console/enc/src/welsenc.cpp
View File

@ -964,7 +964,7 @@ int ProcessEncodingSvcWithConfig (ISVCEncoder* pPtrEnc, int argc, char** argv) {
sSvcParam.sDependencyLayers[sSvcParam.iNumDependencyLayer - 1].iFrameHeight = sSvcParam.sDependencyLayers[sSvcParam.iNumDependencyLayer - 1].iFrameHeight =
WELS_ALIGN(sSvcParam.sDependencyLayers[sSvcParam.iNumDependencyLayer - 1].iActualHeight, MB_HEIGHT_LUMA); WELS_ALIGN(sSvcParam.sDependencyLayers[sSvcParam.iNumDependencyLayer - 1].iActualHeight, MB_HEIGHT_LUMA);
if (cmResultSuccess != pPtrEnc->Initialize ((void*)&sSvcParam, INIT_TYPE_CONFIG_BASED)) { // SVC encoder initialization if (cmResultSuccess != pPtrEnc->Initialize2 ((void*)&sSvcParam, INIT_TYPE_CONFIG_BASED)) { // SVC encoder initialization
fprintf (stderr, "SVC encoder Initialize failed\n"); fprintf (stderr, "SVC encoder Initialize failed\n");
iRet = 1; iRet = 1;
goto INSIDE_MEM_FREE; goto INSIDE_MEM_FREE;
@ -1094,7 +1094,7 @@ int ProcessEncodingSvcWithConfig (ISVCEncoder* pPtrEnc, int argc, char** argv) {
// To encoder this frame // To encoder this frame
iStart = WelsTime(); iStart = WelsTime();
int iEncFrames = pPtrEnc->EncodeFrame (const_cast<const SSourcePicture**> (pSrcPicList), nSpatialLayerNum, &sFbi); int iEncFrames = pPtrEnc->EncodeFrame2 (const_cast<const SSourcePicture**> (pSrcPicList), nSpatialLayerNum, &sFbi);
iTotal += WelsTime() - iStart; iTotal += WelsTime() - iStart;
// fixed issue in case dismatch source picture introduced by frame skipped, 1/12/2010 // fixed issue in case dismatch source picture introduced by frame skipped, 1/12/2010

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

@ -59,8 +59,8 @@ class CWelsDecoder : public ISVCDecoder {
CWelsDecoder (void_t); CWelsDecoder (void_t);
virtual ~CWelsDecoder(); virtual ~CWelsDecoder();
virtual long Initialize (void_t* pParam, const INIT_TYPE keInitType); virtual long EXTAPI Initialize (void_t* pParam, const INIT_TYPE keInitType);
virtual long Uninitialize(); virtual long EXTAPI Uninitialize();
/*************************************************************************** /***************************************************************************
* Description: * Description:
@ -74,28 +74,28 @@ virtual long Uninitialize();
* *
* return: if decode frame success return 0, otherwise corresponding error returned. * return: if decode frame success return 0, otherwise corresponding error returned.
***************************************************************************/ ***************************************************************************/
virtual DECODING_STATE DecodeFrame (const unsigned char* kpSrc, virtual DECODING_STATE EXTAPI DecodeFrame (const unsigned char* kpSrc,
const int kiSrcLen, const int kiSrcLen,
unsigned char** ppDst, unsigned char** ppDst,
int* pStride, int* pStride,
int& iWidth, int& iWidth,
int& iHeight); int& iHeight);
virtual DECODING_STATE DecodeFrame (const unsigned char* kpSrc, virtual DECODING_STATE EXTAPI DecodeFrame2 (const unsigned char* kpSrc,
const int kiSrcLen, const int kiSrcLen,
void_t** ppDst, void_t** ppDst,
SBufferInfo* pDstInfo); SBufferInfo* pDstInfo);
virtual DECODING_STATE DecodeFrameEx (const unsigned char* kpSrc, virtual DECODING_STATE EXTAPI DecodeFrameEx (const unsigned char* kpSrc,
const int kiSrcLen, const int kiSrcLen,
unsigned char* pDst, unsigned char* pDst,
int iDstStride, int iDstStride,
int& iDstLen, int& iDstLen,
int& iWidth, int& iWidth,
int& iHeight, int& iHeight,
int& color_format); int& color_format);
virtual long SetOption (DECODER_OPTION eOptID, void_t* pOption); virtual long EXTAPI SetOption (DECODER_OPTION eOptID, void_t* pOption);
virtual long GetOption (DECODER_OPTION eOptID, void_t* pOption); virtual long EXTAPI GetOption (DECODER_OPTION eOptID, void_t* pOption);
private: private:
PWelsDecoderContext m_pDecContext; PWelsDecoderContext m_pDecContext;

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

@ -340,7 +340,7 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void_t* pOption) {
return cmInitParaError; return cmInitParaError;
} }
DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc, DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc,
const int kiSrcLen, const int kiSrcLen,
void_t** ppDst, void_t** ppDst,
SBufferInfo* pDstInfo) { SBufferInfo* pDstInfo) {
@ -430,7 +430,7 @@ DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc,
DstInfo.UsrData.sSystemBuffer.iHeight = iHeight; DstInfo.UsrData.sSystemBuffer.iHeight = iHeight;
DstInfo.eBufferProperty = BUFFER_HOST; DstInfo.eBufferProperty = BUFFER_HOST;
eDecState = DecodeFrame (kpSrc, kiSrcLen, (void_t**)ppDst, &DstInfo); eDecState = DecodeFrame2 (kpSrc, kiSrcLen, (void_t**)ppDst, &DstInfo);
if (eDecState == dsErrorFree) { if (eDecState == dsErrorFree) {
pStride[0] = DstInfo.UsrData.sSystemBuffer.iStride[0]; pStride[0] = DstInfo.UsrData.sSystemBuffer.iStride[0];
pStride[1] = DstInfo.UsrData.sSystemBuffer.iStride[1]; pStride[1] = DstInfo.UsrData.sSystemBuffer.iStride[1];

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

@ -65,31 +65,31 @@ class CWelsH264SVCEncoder : public ISVCEncoder {
/* /*
* return: CM_RETURN: 0 - success; otherwise - failed; * return: CM_RETURN: 0 - success; otherwise - failed;
*/ */
virtual int Initialize (SVCEncodingParam* argv, const INIT_TYPE init_type); virtual int EXTAPI Initialize (SVCEncodingParam* argv, const INIT_TYPE init_type);
virtual int Initialize (void* argv, const INIT_TYPE init_type); virtual int EXTAPI Initialize2 (void* argv, const INIT_TYPE init_type);
virtual int Uninitialize(); virtual int EXTAPI Uninitialize();
/* /*
* return: EVideoFrameType [IDR: videoFrameTypeIDR; P: videoFrameTypeP; ERROR: videoFrameTypeInvalid] * return: EVideoFrameType [IDR: videoFrameTypeIDR; P: videoFrameTypeP; ERROR: videoFrameTypeInvalid]
*/ */
virtual int EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo); virtual int EXTAPI EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo);
virtual int EncodeFrame (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo); virtual int EXTAPI EncodeFrame2 (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo);
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */
virtual int EncodeParameterSets (SFrameBSInfo* pBsInfo); virtual int EXTAPI EncodeParameterSets (SFrameBSInfo* pBsInfo);
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */
virtual int PauseFrame (const unsigned char* pSrc, SFrameBSInfo* pBsInfo); virtual int EXTAPI PauseFrame (const unsigned char* pSrc, SFrameBSInfo* pBsInfo);
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */
virtual int ForceIntraFrame (bool bIDR); virtual int EXTAPI ForceIntraFrame (bool bIDR);
/************************************************************************ /************************************************************************
* InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,.. * InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,..
@ -97,8 +97,8 @@ class CWelsH264SVCEncoder : public ISVCEncoder {
/* /*
* return: CM_RETURN: 0 - success; otherwise - failed; * return: CM_RETURN: 0 - success; otherwise - failed;
*/ */
virtual int SetOption (ENCODER_OPTION opt_id, void* option); virtual int EXTAPI SetOption (ENCODER_OPTION opt_id, void* option);
virtual int GetOption (ENCODER_OPTION opt_id, void* option); virtual int EXTAPI GetOption (ENCODER_OPTION opt_id, void* option);
private: private:
sWelsEncCtx* m_pEncContext; sWelsEncCtx* m_pEncContext;

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

@ -353,10 +353,10 @@ int CWelsH264SVCEncoder::Initialize (SVCEncodingParam* argv, const INIT_TYPE iIn
m_iSrcListSize = 1; m_iSrcListSize = 1;
return Initialize ((void*)&sConfig, INIT_TYPE_CONFIG_BASED); return Initialize2 ((void*)&sConfig, INIT_TYPE_CONFIG_BASED);
} }
int CWelsH264SVCEncoder::Initialize (void* argv, const INIT_TYPE iInitType) { int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) {
if (INIT_TYPE_CONFIG_BASED != iInitType || NULL == argv) { if (INIT_TYPE_CONFIG_BASED != iInitType || NULL == argv) {
WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInitType= %d, argv= 0x%p.\n", WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInitType= %d, argv= 0x%p.\n",
iInitType, (void*)argv); iInitType, (void*)argv);
@ -602,7 +602,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const unsigned char* pSrc, SFrameBSInfo* p
int32_t uiFrameType = videoFrameTypeInvalid; int32_t uiFrameType = videoFrameTypeInvalid;
if (RawData2SrcPic ((uint8_t*)pSrc) == 0) { if (RawData2SrcPic ((uint8_t*)pSrc) == 0) {
uiFrameType = EncodeFrame (const_cast<const SSourcePicture**> (m_pSrcPicList), 1, pBsInfo); uiFrameType = EncodeFrame2 (const_cast<const SSourcePicture**> (m_pSrcPicList), 1, pBsInfo);
} }
#ifdef REC_FRAME_COUNT #ifdef REC_FRAME_COUNT
@ -619,7 +619,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const unsigned char* pSrc, SFrameBSInfo* p
} }
int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture** pSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) { int CWelsH264SVCEncoder::EncodeFrame2 (const SSourcePicture** pSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) {
if (! (pSrcPicList && m_pEncContext && m_bInitialFlag)) { if (! (pSrcPicList && m_pEncContext && m_bInitialFlag)) {
return videoFrameTypeInvalid; return videoFrameTypeInvalid;
} }

2
test/decoder_test.cpp
View File

@ -67,7 +67,7 @@ static bool DecodeAndProcess(ISVCDecoder* decoder, const uint8_t* src,
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
memset(&bufInfo, 0, sizeof(SBufferInfo)); memset(&bufInfo, 0, sizeof(SBufferInfo));
DECODING_STATE rv = decoder->DecodeFrame(src, sliceSize, data, &bufInfo); DECODING_STATE rv = decoder->DecodeFrame2(src, sliceSize, data, &bufInfo);
if (rv != dsErrorFree) { if (rv != dsErrorFree) {
return false; return false;
} }