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

Merge pull request #1006 from ruil2/bug_fix

Browse Source 
fix defect7654 that  the encoder won't generate IDR when temporal layer setting changes
This commit is contained in:
huili2 2014-06-25 17:29:29 +08:00
commit be94bf9ffa
5 changed files with 74 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/encoder/core/inc/au_set.h
View File

@ -45,7 +45,7 @@
#include "bit_stream.h" #include "bit_stream.h"
#include "parameter_sets.h" #include "parameter_sets.h"
#include "param_svc.h" #include "param_svc.h"
#include "utils.h"
namespace WelsSVCEnc { namespace WelsSVCEnc {
/*! /*!
************************************************************************************* *************************************************************************************
@ -139,6 +139,6 @@ int32_t WelsInitPps (SWelsPPS* pPps,
const uint32_t kuiPpsId, const uint32_t kuiPpsId,
const bool kbDeblockingFilterPresentFlag, const bool kbDeblockingFilterPresentFlag,
const bool kbUsingSubsetSps); const bool kbUsingSubsetSps);
int32_t WelsCheckRefFrameLimitation(SLogContext* pLogCtx,SWelsSvcCodingParam* pParam);
} }
#endif//WELS_ACCESS_UNIT_PARSER_H__ #endif//WELS_ACCESS_UNIT_PARSER_H__

10
codec/encoder/core/inc/param_svc.h
View File

@ -116,7 +116,7 @@ typedef struct TagWelsSvcCodingParam: SEncParamExt {
iCountThreadsNum; // # derived from disable_multiple_slice_idc (=0 or >1) means; iCountThreadsNum; // # derived from disable_multiple_slice_idc (=0 or >1) means;
int8_t iDecompStages; // GOP size dependency int8_t iDecompStages; // GOP size dependency
int32_t iMaxNumRefFrame;
public: public:
TagWelsSvcCodingParam() { TagWelsSvcCodingParam() {
@ -190,7 +190,7 @@ typedef struct TagWelsSvcCodingParam: SEncParamExt {
void FillDefault() { void FillDefault() {
FillDefault (*this); FillDefault (*this);
uiGopSize = 1; // GOP size (at maximal frame rate: 16) uiGopSize = 1; // GOP size (at maximal frame rate: 16)
iMaxNumRefFrame = 1;
SUsedPicRect.iLeft = SUsedPicRect.iLeft =
SUsedPicRect.iTop = SUsedPicRect.iTop =
SUsedPicRect.iWidth = SUsedPicRect.iWidth =
@ -369,6 +369,8 @@ typedef struct TagWelsSvcCodingParam: SEncParamExt {
iNumRefFrame = WELS_CLIP3 (iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM); iNumRefFrame = WELS_CLIP3 (iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);
} }
} }
if (iNumRefFrame > iMaxNumRefFrame)
iMaxNumRefFrame = iNumRefFrame;
iLtrMarkPeriod = pCodingParam.iLtrMarkPeriod; iLtrMarkPeriod = pCodingParam.iLtrMarkPeriod;
bPrefixNalAddingCtrl = pCodingParam.bPrefixNalAddingCtrl; bPrefixNalAddingCtrl = pCodingParam.bPrefixNalAddingCtrl;
@ -391,8 +393,8 @@ typedef struct TagWelsSvcCodingParam: SEncParamExt {
float fLayerFrameRate = WELS_CLIP3 (pCodingParam.sSpatialLayers[iIdxSpatial].fFrameRate, float fLayerFrameRate = WELS_CLIP3 (pCodingParam.sSpatialLayers[iIdxSpatial].fFrameRate,
MIN_FRAME_RATE, fParamMaxFrameRate); MIN_FRAME_RATE, fParamMaxFrameRate);
pSpatialLayer->fFrameRate = pSpatialLayer->fFrameRate =
pDlp->fInputFrameRate = pDlp->fInputFrameRate =
pDlp->fOutputFrameRate = WELS_CLIP3 (fLayerFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE); pDlp->fOutputFrameRate = WELS_CLIP3 (fLayerFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE);
if (pDlp->fInputFrameRate > fMaxFr + EPSN) if (pDlp->fInputFrameRate > fMaxFr + EPSN)
fMaxFr = pDlp->fInputFrameRate; fMaxFr = pDlp->fInputFrameRate;

39
codec/encoder/core/src/au_set.cpp
View File

@ -40,6 +40,7 @@
#include "au_set.h" #include "au_set.h"
#include "svc_enc_golomb.h" #include "svc_enc_golomb.h"
#include "macros.h"
namespace WelsSVCEnc { namespace WelsSVCEnc {
@ -102,6 +103,44 @@ static inline int32_t WelsCheckLevelLimitation (const SWelsSPS* kpSps, const SLe
} }
int32_t WelsCheckRefFrameLimitation (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam) {
int32_t i = 0;
int32_t iRefFrame = 1;
//get the number of reference frame according to level limitation.
for (i = 0; i < pParam->iSpatialLayerNum; ++ i) {
SSpatialLayerConfig* pSpatialLayer = &pParam->sSpatialLayers[i];
uint32_t uiPicInMBs = ((pSpatialLayer->iVideoHeight + 15) >> 4) * ((pSpatialLayer->iVideoWidth + 15) >> 4);
if (pSpatialLayer->uiLevelIdc == LEVEL_UNKNOWN) {
pSpatialLayer->uiLevelIdc = LEVEL_5_0;
WelsLog (pLogCtx, WELS_LOG_WARNING, "change level to level5.0\n");
}
iRefFrame = g_ksLevelLimit[pSpatialLayer->uiLevelIdc - 1].uiMaxDPBMB / uiPicInMBs;
if (iRefFrame < pParam->iMaxNumRefFrame)
pParam->iMaxNumRefFrame = iRefFrame;
if (pParam->iMaxNumRefFrame < 1) {
pParam->iMaxNumRefFrame = 1;
WelsLog (pLogCtx, WELS_LOG_ERROR, "error Level setting (%d)\n", pSpatialLayer->uiLevelIdc);
return ENC_RETURN_UNSUPPORTED_PARA;
}
}
//check temporal layer number according to the number of reference frame
int32_t iMaxTemporalLayer = pParam->iNumRefFrame - pParam->iLTRRefNum;
if (iMaxTemporalLayer < 1) {
iMaxTemporalLayer = 1;
WelsLog (pLogCtx, WELS_LOG_ERROR, "Invalid the number of reference frame ltr num(%d)\n", pParam->iLTRRefNum);
return ENC_RETURN_UNSUPPORTED_PARA;
}
if (pParam->iTemporalLayerNum > iMaxTemporalLayer)
pParam->iTemporalLayerNum = iMaxTemporalLayer;
//get the maximum num of reference frame according to temporal Layer
iRefFrame = WELS_CLIP3 ((pParam->iTemporalLayerNum + pParam->iLTRRefNum), MIN_REF_PIC_COUNT,
MAX_REFERENCE_REORDER_COUNT_NUM);
if (pParam->iMaxNumRefFrame < iRefFrame)
pParam->iMaxNumRefFrame = iRefFrame;
return ENC_RETURN_SUCCESS;
}
static inline int32_t WelsGetLevelIdc (const SWelsSPS* kpSps, float fFrameRate, int32_t iTargetBitRate) { static inline int32_t WelsGetLevelIdc (const SWelsSPS* kpSps, float fFrameRate, int32_t iTargetBitRate) {
int32_t iOrder; int32_t iOrder;
for (iOrder = 0; iOrder < LEVEL_NUMBER; iOrder++) { for (iOrder = 0; iOrder < LEVEL_NUMBER; iOrder++) {

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

@ -156,7 +156,7 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) {
} }
} }
return ENC_RETURN_SUCCESS; return WelsCheckRefFrameLimitation (pLogCtx, pCfg);
} }
@ -753,7 +753,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) {
pMa = (*ppCtx)->pMemAlign; pMa = (*ppCtx)->pMemAlign;
pParam = (*ppCtx)->pSvcParam; pParam = (*ppCtx)->pSvcParam;
iDlayerCount = pParam->iSpatialLayerNum; iDlayerCount = pParam->iSpatialLayerNum;
iNumRef = pParam->iNumRefFrame; iNumRef = pParam->iMaxNumRefFrame;
const int32_t kiFeatureStrategyIndex = FME_DEFAULT_FEATURE_INDEX; const int32_t kiFeatureStrategyIndex = FME_DEFAULT_FEATURE_INDEX;
const int32_t kiMe16x16 = ME_DIA_CROSS; const int32_t kiMe16x16 = ME_DIA_CROSS;
@ -927,7 +927,8 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) {
// Need port pSps/pPps initialization due to spatial scalability changed // Need port pSps/pPps initialization due to spatial scalability changed
if (!bUseSubsetSps) { if (!bUseSubsetSps) {
WelsInitSps (pSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod, pParam->iNumRefFrame, WelsInitSps (pSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
pParam->iMaxNumRefFrame,
iSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE); iSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE);
if (iDlayerCount > 1) { if (iDlayerCount > 1) {
@ -937,7 +938,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) {
} }
} else { } else {
WelsInitSubsetSps (pSubsetSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod, WelsInitSubsetSps (pSubsetSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
pParam->iNumRefFrame, pParam->iMaxNumRefFrame,
iSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE); iSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE);
} }
@ -1420,7 +1421,7 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx) {
if (pParam->iUsageType == SCREEN_CONTENT_REAL_TIME) { if (pParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
(*ppCtx)->pVaa = (SVAAFrameInfoExt*)pMa->WelsMallocz (sizeof (SVAAFrameInfoExt), "pVaa"); (*ppCtx)->pVaa = (SVAAFrameInfoExt*)pMa->WelsMallocz (sizeof (SVAAFrameInfoExt), "pVaa");
WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pVaa), FreeMemorySvc (ppCtx)) WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pVaa), FreeMemorySvc (ppCtx))
if (RequestMemoryVaaScreen ((*ppCtx)->pVaa, pMa, (*ppCtx)->pSvcParam->iNumRefFrame, iCountMaxMbNum << 2)) { if (RequestMemoryVaaScreen ((*ppCtx)->pVaa, pMa, (*ppCtx)->pSvcParam->iMaxNumRefFrame, iCountMaxMbNum << 2)) {
WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMemoryVaaScreen failed!"); WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMemoryVaaScreen failed!");
FreeMemorySvc (ppCtx); FreeMemorySvc (ppCtx);
return 1; return 1;
@ -1674,7 +1675,7 @@ void FreeMemorySvc (sWelsEncCtx** ppCtx) {
FreePicture (pMa, &pRefList->pRef[iRef]); FreePicture (pMa, &pRefList->pRef[iRef]);
} }
++ iRef; ++ iRef;
} while (iRef < 1 + pParam->iNumRefFrame); } while (iRef < 1 + pParam->iMaxNumRefFrame);
pMa->WelsFree (pCtx->ppRefPicListExt[ilayer], "ppRefPicListExt[]"); pMa->WelsFree (pCtx->ppRefPicListExt[ilayer], "ppRefPicListExt[]");
pCtx->ppRefPicListExt[ilayer] = NULL; pCtx->ppRefPicListExt[ilayer] = NULL;
@ -1727,7 +1728,7 @@ void FreeMemorySvc (sWelsEncCtx** ppCtx) {
pCtx->pVaa->sVaaCalcInfo.pMad8x8 = NULL; pCtx->pVaa->sVaaCalcInfo.pMad8x8 = NULL;
} }
if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME)
ReleaseMemoryVaaScreen (pCtx->pVaa, pMa, pCtx->pSvcParam->iNumRefFrame); ReleaseMemoryVaaScreen (pCtx->pVaa, pMa, pCtx->pSvcParam->iMaxNumRefFrame);
pMa->WelsFree (pCtx->pVaa, "pVaa"); pMa->WelsFree (pCtx->pVaa, "pVaa");
pCtx->pVaa = NULL; pCtx->pVaa = NULL;
} }
@ -3583,16 +3584,18 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa
/* Decide whether need reset for IDR frame based on adjusting prarameters changed */ /* Decide whether need reset for IDR frame based on adjusting prarameters changed */
/* Temporal levels, spatial settings and/ or quality settings changed need update parameter sets related. */ /* Temporal levels, spatial settings and/ or quality settings changed need update parameter sets related. */
bNeedReset = (pOldParam == NULL) || bNeedReset = (pOldParam == NULL) ||
(pOldParam->iTemporalLayerNum != pNewParam->iTemporalLayerNum) ||
(pOldParam->uiGopSize != pNewParam->uiGopSize) ||
(pOldParam->iSpatialLayerNum != pNewParam->iSpatialLayerNum) || (pOldParam->iSpatialLayerNum != pNewParam->iSpatialLayerNum) ||
(pOldParam->iDecompStages != pNewParam->iDecompStages) ||
(pOldParam->iPicWidth != pNewParam->iPicWidth (pOldParam->iPicWidth != pNewParam->iPicWidth
|| pOldParam->iPicHeight != pNewParam->iPicHeight) || || pOldParam->iPicHeight != pNewParam->iPicHeight) ||
(pOldParam->SUsedPicRect.iWidth != pNewParam->SUsedPicRect.iWidth (pOldParam->SUsedPicRect.iWidth != pNewParam->SUsedPicRect.iWidth
|| pOldParam->SUsedPicRect.iHeight != pNewParam->SUsedPicRect.iHeight) || || pOldParam->SUsedPicRect.iHeight != pNewParam->SUsedPicRect.iHeight) ||
(pOldParam->bEnableLongTermReference != pNewParam->bEnableLongTermReference) || (pOldParam->bEnableLongTermReference != pNewParam->bEnableLongTermReference) ||
(pOldParam->iLTRRefNum != pNewParam->iLTRRefNum); (pOldParam->iLTRRefNum != pNewParam->iLTRRefNum);
if (pNewParam->iMaxNumRefFrame > pOldParam->iMaxNumRefFrame) {
pNewParam->iMaxNumRefFrame = pOldParam->iMaxNumRefFrame;
bNeedReset = true;
}
if (!bNeedReset) { // Check its picture resolutions/quality settings respectively in each dependency layer if (!bNeedReset) { // Check its picture resolutions/quality settings respectively in each dependency layer
iIndexD = 0; iIndexD = 0;
assert (pOldParam->iSpatialLayerNum == pNewParam->iSpatialLayerNum); assert (pOldParam->iSpatialLayerNum == pNewParam->iSpatialLayerNum);
@ -3630,12 +3633,6 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa
bNeedReset = true; bNeedReset = true;
break; break;
} }
if (kpOldDlp->iHighestTemporalId != kpNewDlp->iHighestTemporalId) {
bNeedReset = true;
break;
}
++ iIndexD; ++ iIndexD;
} while (iIndexD < pOldParam->iSpatialLayerNum); } while (iIndexD < pOldParam->iSpatialLayerNum);
} }

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

@ -371,7 +371,8 @@ int CWelsH264SVCEncoder::InitializeInternal (SWelsSvcCodingParam* pCfg) {
pCfg->iNumRefFrame = WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM); pCfg->iNumRefFrame = WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);
} }
} }
if (pCfg->iNumRefFrame > pCfg->iMaxNumRefFrame)
pCfg->iMaxNumRefFrame = pCfg->iNumRefFrame;
if (pCfg->iLtrMarkPeriod == 0) { if (pCfg->iLtrMarkPeriod == 0) {
pCfg->iLtrMarkPeriod = 30; pCfg->iLtrMarkPeriod = 30;
} }
@ -559,23 +560,30 @@ void CWelsH264SVCEncoder::CheckProfileSetting (int32_t iLayer, EProfileIdc uiPro
pLayerInfo->uiProfileIdc = uiProfileIdc; pLayerInfo->uiProfileIdc = uiProfileIdc;
if ((iLayer == SPATIAL_LAYER_0) && (uiProfileIdc != PRO_BASELINE)) { if ((iLayer == SPATIAL_LAYER_0) && (uiProfileIdc != PRO_BASELINE)) {
pLayerInfo->uiProfileIdc = PRO_BASELINE; pLayerInfo->uiProfileIdc = PRO_BASELINE;
WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile", uiProfileIdc); WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile\n", uiProfileIdc);
} }
if (iLayer > SPATIAL_LAYER_0) { if (iLayer > SPATIAL_LAYER_0) {
if ((uiProfileIdc != PRO_BASELINE) || (uiProfileIdc != PRO_SCALABLE_BASELINE)) { if ((uiProfileIdc != PRO_BASELINE) || (uiProfileIdc != PRO_SCALABLE_BASELINE)) {
pLayerInfo->uiProfileIdc = PRO_BASELINE; pLayerInfo->uiProfileIdc = PRO_BASELINE;
WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile", uiProfileIdc); WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support profile(%d),change to baseline profile\n", uiProfileIdc);
} }
} }
} }
void CWelsH264SVCEncoder::CheckLevelSetting (int32_t iLayer, ELevelIdc uiLevelIdc) { void CWelsH264SVCEncoder::CheckLevelSetting (int32_t iLayer, ELevelIdc uiLevelIdc) {
SSpatialLayerConfig* pLayerInfo = &m_pEncContext->pSvcParam->sSpatialLayers[iLayer]; SSpatialLayerConfig* pLayerInfo = &m_pEncContext->pSvcParam->sSpatialLayers[iLayer];
pLayerInfo->uiLevelIdc = uiLevelIdc; pLayerInfo->uiLevelIdc = uiLevelIdc;
//TBD if ((uiLevelIdc < LEVEL_1_0) || (uiLevelIdc > LEVEL_5_2)) {
pLayerInfo->uiLevelIdc = LEVEL_5_2;
WelsLog (m_pEncContext, WELS_LOG_WARNING, "doesn't support level(%d) change to LEVEL_5_2\n", uiLevelIdc);
}
} }
void CWelsH264SVCEncoder::CheckReferenceNumSetting (int32_t iNumRef) { void CWelsH264SVCEncoder::CheckReferenceNumSetting (int32_t iNumRef) {
m_pEncContext->pSvcParam->iNumRefFrame = iNumRef; m_pEncContext->pSvcParam->iNumRefFrame = iNumRef;
//TBD if ((iNumRef < MIN_REF_PIC_COUNT) || (iNumRef > MAX_REFERENCE_PICTURE_COUNT_NUM)) {
m_pEncContext->pSvcParam->iNumRefFrame = AUTO_REF_PIC_COUNT;
WelsLog (m_pEncContext, WELS_LOG_WARNING,
"doesn't support the number of reference frame(%d) change to auto select mode\n", iNumRef);
}
} }
/************************************************************************ /************************************************************************
* InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,.. * InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,..
@ -936,7 +944,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) {
} }
break; break;
case ENCODER_OPTION_DELIVERY_STATUS: { case ENCODER_OPTION_DELIVERY_STATUS: {
SDeliveryStatus *pValue = (static_cast<SDeliveryStatus*>(pOption)); SDeliveryStatus* pValue = (static_cast<SDeliveryStatus*> (pOption));
m_pEncContext->iDropNumber = pValue->iDropNum; m_pEncContext->iDropNumber = pValue->iDropNum;
} }
break; break;