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

use active SPS parameters instead of other SPS.

Browse Source
This commit is contained in:
Licai Guo 2014-02-24 00:52:17 -08:00
parent 6854e06796
commit 2983c92e1c
1 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
codec/decoder/core/src/decoder.cpp
View File

@ -174,50 +174,16 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx) {
/*
* get size of reference picture list in target layer incoming, = (iNumRefFrames x 2)
* get size of reference picture list in target layer incoming, = (iNumRefFrames
*/
static inline int32_t GetTargetRefListSize (PWelsDecoderContext pCtx) {
bool* pSubsetSpsAvail = &pCtx->bSubspsAvailFlags[0];
bool* pSpsAvail = &pCtx->bSpsAvailFlags[0];
int32_t iSubsetIdx = -1;
int32_t iSpsIdx = -1;
bool bExistSubsetSps = false;
int32_t bExistSps = false;
int32_t iPos = MAX_SPS_COUNT - 1;
int32_t iNumRefFrames = 0;
while (iPos >= 0) {
if (pSubsetSpsAvail[iPos]) {
bExistSubsetSps = true;
iSubsetIdx = iPos;
break;
}
-- iPos;
}
if (!bExistSubsetSps) {
iPos = MAX_SPS_COUNT - 1;
while (iPos >= 0) {
if (pSpsAvail[iPos]) {
bExistSps = true;
iSpsIdx = iPos;
break;
}
-- iPos;
}
}
if (! (bExistSubsetSps || bExistSps)) {
if ((pCtx == NULL) || (pCtx->pSps == NULL)) {
iNumRefFrames = MAX_REF_PIC_COUNT;
} else {
PSps pSps = bExistSubsetSps ? (&pCtx->sSubsetSpsBuffer[iSubsetIdx].sSps) : (&pCtx->sSpsBuffer[iSpsIdx]);
iNumRefFrames = (pSps->iNumRefFrames) + 1;
iNumRefFrames = pCtx->pSps->iNumRefFrames + 1;
}
if (0 == iNumRefFrames)
iNumRefFrames = (MIN_REF_PIC_COUNT);
#ifdef LONG_TERM_REF
//pic_queue size minimum set 2
if (iNumRefFrames < 2) {