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

Add an encoder method for encoding the SPS/PPS without encoding a frame

Browse Source 
This is useful if using a muxer that requires the SPS/PPS to be
available before the first frame is encoded.
This commit is contained in:
Martin Storsjö 2014-01-10 20:46:05 +02:00
parent f02d0aa667
commit 2766215545
5 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,11 @@ class ISVCEncoder {
virtual int EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo) = 0; virtual int EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo) = 0;
virtual int EncodeFrame (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) = 0; virtual int EncodeFrame (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) = 0;
/*
* return: 0 - success; otherwise - failed;
*/
virtual int EncodeParameterSets (SFrameBSInfo* pBsInfo) = 0;
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */

2
codec/encoder/core/inc/extern.h
View File

@ -98,6 +98,8 @@ void WelsUninitEncoderExt (sWelsEncCtx** ppCtx);
int32_t WelsEncoderEncodeExt (sWelsEncCtx*, void* pDst, const SSourcePicture** kppSrcList, int32_t WelsEncoderEncodeExt (sWelsEncCtx*, void* pDst, const SSourcePicture** kppSrcList,
const int32_t kiConfiguredLayerNum); const int32_t kiConfiguredLayerNum);
int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst);
/* /*
* Force coding IDR as follows * Force coding IDR as follows
*/ */

31
codec/encoder/core/src/encoder_ext.cpp
View File

@ -3093,6 +3093,37 @@ int32_t ForceCodingIDR (sWelsEncCtx* pCtx) {
return 0; return 0;
} }
int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst) {
SFrameBSInfo* pFbi = (SFrameBSInfo*)pDst;
SLayerBSInfo* pLayerBsInfo = &pFbi->sLayerInfo[0];
int32_t iNalLen[128] = {0};
int32_t iCountNal = 0;
pLayerBsInfo->pBsBuf = pCtx->pFrameBs;
InitBits (&pCtx->pOut->sBsWrite, pCtx->pOut->pBsBuffer, pCtx->pOut->uiSize);
WelsWriteParameterSets (pCtx, &iNalLen[0], &iCountNal);
pLayerBsInfo->uiPriorityId = 0;
pLayerBsInfo->uiSpatialId = 0;
pLayerBsInfo->uiTemporalId = 0;
pLayerBsInfo->uiQualityId = 0;
pLayerBsInfo->uiLayerType = NON_VIDEO_CODING_LAYER;
pLayerBsInfo->iNalCount = iCountNal;
for (int32_t iNalIndex = 0; iNalIndex < iCountNal; ++ iNalIndex) {
pLayerBsInfo->iNalLengthInByte[iNalIndex] = iNalLen[iNalIndex];
}
pCtx->eLastNalPriority = NRI_PRI_HIGHEST;
pFbi->iLayerNum = 1;
#if defined(X86_ASM)
WelsEmms();
#endif //X86_ASM
return 0;
}
/*! /*!
* \brief core svc encoding process * \brief core svc encoding process
* *

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

@ -76,6 +76,11 @@ class CWelsH264SVCEncoder : public ISVCEncoder {
virtual int EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo); virtual int EncodeFrame (const unsigned char* kpSrc, SFrameBSInfo* pBsInfo);
virtual int EncodeFrame (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo); virtual int EncodeFrame (const SSourcePicture** kppSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo);
/*
* return: 0 - success; otherwise - failed;
*/
virtual int EncodeParameterSets (SFrameBSInfo* pBsInfo);
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */

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

@ -730,6 +730,10 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture** pSrcPicList, int
} }
int CWelsH264SVCEncoder::EncodeParameterSets (SFrameBSInfo* pBsInfo) {
return WelsEncoderEncodeParameterSets (m_pEncContext, pBsInfo);
}
/* /*
* return: 0 - success; otherwise - failed; * return: 0 - success; otherwise - failed;
*/ */