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

fix timestamp = 0 issue when rc mode is BITRATE mode

Browse Source
This commit is contained in:
sijchen 2016-02-17 15:24:40 -08:00
parent 597b4eef73
commit 9816e3302d
6 changed files with 26 additions and 22 deletions

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

@ -93,7 +93,7 @@ void WelsUninitEncoderExt (sWelsEncCtx** ppCtx);
* \param kpSrcPic Source picture * \param kpSrcPic Source picture
* \return EFrameType (videoFrameTypeIDR/videoFrameTypeI/videoFrameTypeP) * \return EFrameType (videoFrameTypeIDR/videoFrameTypeI/videoFrameTypeP)
*/ */
int32_t WelsEncoderEncodeExt (sWelsEncCtx*, SFrameBSInfo* pFbi, const SSourcePicture* kpSrcPic,int64_t uiTimeStamp); int32_t WelsEncoderEncodeExt (sWelsEncCtx*, SFrameBSInfo* pFbi, const SSourcePicture* kpSrcPic);
int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst); int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst);

2
codec/encoder/core/inc/rc.h

@ -288,5 +288,7 @@ void WelsRcInitModule (sWelsEncCtx* pCtx, RC_MODES iRcMode);
void WelsRcInitFuncPointers (sWelsEncCtx* pEncCtx, RC_MODES iRcMode); void WelsRcInitFuncPointers (sWelsEncCtx* pEncCtx, RC_MODES iRcMode);
void WelsRcFreeMemory (sWelsEncCtx* pCtx); void WelsRcFreeMemory (sWelsEncCtx* pCtx);
long long GetTimestampForRc(const long long uiTimeStamp, const long long uiLastTimeStamp, const float fFrameRate);
} }
#endif //RC_H #endif //RC_H

20
codec/encoder/core/src/encoder_ext.cpp

@ -3716,7 +3716,7 @@ void ClearFrameBsInfo (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi) {
* \pParam pSrcPic Source Picture * \pParam pSrcPic Source Picture
* \return EFrameType (videoFrameTypeIDR/videoFrameTypeI/videoFrameTypeP) * \return EFrameType (videoFrameTypeIDR/videoFrameTypeI/videoFrameTypeP)
*/ */
int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSourcePicture* pSrcPic,int64_t uiTimeStamp ) { int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSourcePicture* pSrcPic ) {
if (pCtx == NULL) { if (pCtx == NULL) {
return ENC_RETURN_MEMALLOCERR; return ENC_RETURN_MEMALLOCERR;
} }
@ -3756,14 +3756,14 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
pCtx->iEncoderError = ENC_RETURN_SUCCESS; pCtx->iEncoderError = ENC_RETURN_SUCCESS;
pCtx->bCurFrameMarkedAsSceneLtr = false; pCtx->bCurFrameMarkedAsSceneLtr = false;
pFbi->iLayerNum = 0; // for initialization pFbi->iLayerNum = 0; // for initialization
pFbi->uiTimeStamp = uiTimeStamp; pFbi->uiTimeStamp = GetTimestampForRc(pSrcPic->uiTimeStamp, pCtx->uiLastTimestamp, pCtx->pSvcParam->sSpatialLayers->fFrameRate);
for (int32_t iNalIdx = 0; iNalIdx < MAX_LAYER_NUM_OF_FRAME; iNalIdx++) { for (int32_t iNalIdx = 0; iNalIdx < MAX_LAYER_NUM_OF_FRAME; iNalIdx++) {
pFbi->sLayerInfo[iNalIdx].eFrameType = videoFrameTypeSkip; pFbi->sLayerInfo[iNalIdx].eFrameType = videoFrameTypeSkip;
} }
// perform csc/denoise/downsample/padding, generate spatial layers // perform csc/denoise/downsample/padding, generate spatial layers
iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic); iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic);
if (pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus) { if (pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus) {
pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus (pCtx, iSpatialNum,uiTimeStamp); pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus (pCtx, iSpatialNum, pFbi->uiTimeStamp);
} }
if (iSpatialNum < 1) { if (iSpatialNum < 1) {
@ -3809,7 +3809,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
pLayerBsInfo->eFrameType = eFrameType; pLayerBsInfo->eFrameType = eFrameType;
WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
"[Rc] Frame timestamp = %lld, skip one frame due to target_br, continual skipped %d frames", "[Rc] Frame timestamp = %lld, skip one frame due to target_br, continual skipped %d frames",
uiTimeStamp, pCtx->iContinualSkipFrames); pFbi->uiTimeStamp, pCtx->iContinualSkipFrames);
++ iSpatialIdx; ++ iSpatialIdx;
if (pSvcParam->bSimulcastAVC) { if (pSvcParam->bSimulcastAVC) {
if (pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip) if (pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip)
@ -3830,13 +3830,13 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
//loop each layer to check if have skip frame when RC and frame skip enable //loop each layer to check if have skip frame when RC and frame skip enable
if (pCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr) { if (pCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr) {
bool bSkip = pCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr (pCtx, iSpatialNum, eFrameType, bool bSkip = pCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr (pCtx, iSpatialNum, eFrameType,
(uint32_t)uiTimeStamp); (uint32_t)pFbi->uiTimeStamp);
if (bSkip) { if (bSkip) {
eFrameType = videoFrameTypeSkip; eFrameType = videoFrameTypeSkip;
pLayerBsInfo->eFrameType = videoFrameTypeSkip; pLayerBsInfo->eFrameType = videoFrameTypeSkip;
WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
"[Rc] Frame timestamp = %lld, skip one frame due to max_br, continual skipped %d frames", "[Rc] Frame timestamp = %lld, skip one frame due to max_br, continual skipped %d frames",
uiTimeStamp, pCtx->iContinualSkipFrames); pFbi->uiTimeStamp, pCtx->iContinualSkipFrames);
++ iSpatialIdx; ++ iSpatialIdx;
if (pSvcParam->bSimulcastAVC) if (pSvcParam->bSimulcastAVC)
continue; continue;
@ -3968,7 +3968,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
eFrameType); //get reordering syntax used for writing slice header and transmit to encoder. eFrameType); //get reordering syntax used for writing slice header and transmit to encoder.
PrefetchReferencePicture (pCtx, eFrameType); // update reference picture for current pDq layer PrefetchReferencePicture (pCtx, eFrameType); // update reference picture for current pDq layer
pCtx->pFuncList->pfRc.pfWelsRcPictureInit (pCtx, uiTimeStamp); pCtx->pFuncList->pfRc.pfWelsRcPictureInit (pCtx, pFbi->uiTimeStamp);
PreprocessSliceCoding (pCtx); // MUST be called after pfWelsRcPictureInit() and WelsInitCurrentLayer() PreprocessSliceCoding (pCtx); // MUST be called after pfWelsRcPictureInit() and WelsInitCurrentLayer()
//TODO Complexity Calculation here for screen content //TODO Complexity Calculation here for screen content
@ -4166,7 +4166,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
} }
if (NULL != pCtx->pFuncList->pfRc.pfWelsRcPostFrameSkipping if (NULL != pCtx->pFuncList->pfRc.pfWelsRcPostFrameSkipping
&& pCtx->pFuncList->pfRc.pfWelsRcPostFrameSkipping (pCtx, iCurDid,uiTimeStamp)) { && pCtx->pFuncList->pfRc.pfWelsRcPostFrameSkipping (pCtx, iCurDid, pFbi->uiTimeStamp)) {
StackBackEncoderStatus (pCtx, eFrameType); StackBackEncoderStatus (pCtx, eFrameType);
ClearFrameBsInfo (pCtx, pFbi); ClearFrameBsInfo (pCtx, pFbi);
@ -4182,7 +4182,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
WelsRcPostFrameSkippedUpdate (pCtx, iCurDid); WelsRcPostFrameSkippedUpdate (pCtx, iCurDid);
WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
"[Rc] Frame timestamp = %lld, skip one frame due to post skip, continual skipped %d frames", "[Rc] Frame timestamp = %lld, skip one frame due to post skip, continual skipped %d frames",
uiTimeStamp, pCtx->iContinualSkipFrames); pFbi->uiTimeStamp, pCtx->iContinualSkipFrames);
pCtx->iEncoderError = ENC_RETURN_SUCCESS; pCtx->iEncoderError = ENC_RETURN_SUCCESS;
return ENC_RETURN_SUCCESS; return ENC_RETURN_SUCCESS;
} }
@ -4200,7 +4200,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
} }
pCtx->pFuncList->pfRc.pfWelsRcPictureInfoUpdate (pCtx, iLayerSize); pCtx->pFuncList->pfRc.pfWelsRcPictureInfoUpdate (pCtx, iLayerSize);
RcTraceFrameBits (pCtx,uiTimeStamp); RcTraceFrameBits (pCtx, pFbi->uiTimeStamp);
pCtx->pDecPic->iFrameAverageQp = pCtx->pWelsSvcRc[iDidIdx].iAverageFrameQp; pCtx->pDecPic->iFrameAverageQp = pCtx->pWelsSvcRc[iDidIdx].iAverageFrameQp;
//update scc related //update scc related

7
codec/encoder/core/src/ratectl.cpp

@ -1541,4 +1541,11 @@ void WelsRcFreeMemory (sWelsEncCtx* pEncCtx) {
} }
} }
long long GetTimestampForRc(const long long uiTimeStamp, const long long uiLastTimeStamp, const float fFrameRate) {
if ((uiLastTimeStamp == uiTimeStamp) || ((uiTimeStamp == 0) && (uiLastTimeStamp != -1))) {
return (uiLastTimeStamp + (int32_t) (1000.0 / fFrameRate));
}
return uiTimeStamp;
}
}//end of namespace }//end of namespace

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

@ -100,7 +100,7 @@ class CWelsH264SVCEncoder : public ISVCEncoder {
int InitializeInternal (SWelsSvcCodingParam* argv); int InitializeInternal (SWelsSvcCodingParam* argv);
void TraceParamInfo(SEncParamExt *pParam); void TraceParamInfo(SEncParamExt *pParam);
void LogStatistics (const int64_t kiCurrentFrameTs,int32_t iMaxDid); void LogStatistics (const int64_t kiCurrentFrameTs,int32_t iMaxDid);
void UpdateStatistics(const int64_t kiCurrentFrameTs, SFrameBSInfo* pBsInfo, const int64_t kiCurrentFrameMs); void UpdateStatistics(SFrameBSInfo* pBsInfo, const int64_t kiCurrentFrameMs);
sWelsEncCtx* m_pEncContext; sWelsEncCtx* m_pEncContext;

15
codec/encoder/plus/src/welsEncoderExt.cpp

@ -402,14 +402,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSIn
int CWelsH264SVCEncoder ::EncodeFrameInternal (const SSourcePicture* pSrcPic, SFrameBSInfo* pBsInfo) { int CWelsH264SVCEncoder ::EncodeFrameInternal (const SSourcePicture* pSrcPic, SFrameBSInfo* pBsInfo) {
const int64_t kiBeforeFrameUs = WelsTime(); const int64_t kiBeforeFrameUs = WelsTime();
int64_t uiTimeStamp = pSrcPic->uiTimeStamp; const int32_t kiEncoderReturn = WelsEncoderEncodeExt (m_pEncContext, pBsInfo, pSrcPic);
if ((m_pEncContext->uiLastTimestamp == uiTimeStamp) || ((uiTimeStamp == 0) && (m_pEncContext->uiLastTimestamp != -1))) {
uiTimeStamp = m_pEncContext->uiLastTimestamp + (int32_t) (1000.0 /
m_pEncContext->pSvcParam->sSpatialLayers->fFrameRate);
}
m_pEncContext->uiLastTimestamp = uiTimeStamp;
const int32_t kiEncoderReturn = WelsEncoderEncodeExt (m_pEncContext, pBsInfo, pSrcPic, uiTimeStamp);
const int64_t kiCurrentFrameMs = (WelsTime() - kiBeforeFrameUs) / 1000; const int64_t kiCurrentFrameMs = (WelsTime() - kiBeforeFrameUs) / 1000;
if ((kiEncoderReturn == ENC_RETURN_MEMALLOCERR) || (kiEncoderReturn == ENC_RETURN_MEMOVERFLOWFOUND) if ((kiEncoderReturn == ENC_RETURN_MEMALLOCERR) || (kiEncoderReturn == ENC_RETURN_MEMOVERFLOWFOUND)
@ -422,7 +415,7 @@ int CWelsH264SVCEncoder ::EncodeFrameInternal (const SSourcePicture* pSrcPic, S
return cmUnknownReason; return cmUnknownReason;
} }
UpdateStatistics (uiTimeStamp, pBsInfo, kiCurrentFrameMs); UpdateStatistics (pBsInfo, kiCurrentFrameMs);
///////////////////for test ///////////////////for test
#ifdef OUTPUT_BIT_STREAM #ifdef OUTPUT_BIT_STREAM
@ -573,9 +566,11 @@ void CWelsH264SVCEncoder::LogStatistics (const int64_t kiCurrentFrameTs, int32_t
} }
} }
void CWelsH264SVCEncoder::UpdateStatistics (const int64_t kiCurrentFrameTs, SFrameBSInfo* pBsInfo, void CWelsH264SVCEncoder::UpdateStatistics (SFrameBSInfo* pBsInfo,
const int64_t kiCurrentFrameMs) { const int64_t kiCurrentFrameMs) {
const int64_t kiCurrentFrameTs = m_pEncContext->uiLastTimestamp = pBsInfo->uiTimeStamp;
int32_t iMaxDid = m_pEncContext->pSvcParam->iSpatialLayerNum - 1; int32_t iMaxDid = m_pEncContext->pSvcParam->iSpatialLayerNum - 1;
SLayerBSInfo* pLayerInfo = &pBsInfo->sLayerInfo[0]; SLayerBSInfo* pLayerInfo = &pBsInfo->sLayerInfo[0];
for (int32_t iDid = 0; iDid <= iMaxDid; iDid++) { for (int32_t iDid = 0; iDid <= iMaxDid; iDid++) {