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

Merge pull request #898 from ruil2/enc_rc_4

Browse Source 
simplify stash pop bs
This commit is contained in:
huili2 2014-05-28 16:21:10 +08:00
commit 153fa10dc5
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
codec/encoder/core/src/svc_encode_slice.cpp
View File

@ -593,11 +593,7 @@ TRY_REENCODING:
sDss.iCurrentPos = BsGetBitsPos (pBs);
if (DynSlcJudgeSliceBoundaryStepBack (pEncCtx, pSlice, pSliceCtx, pCurMb, &sDss)) { //islice
//stack pBs pointer
pBs->pBufPtr = sDss.pBsStackBufPtr;
pBs->uiCurBits = sDss.uiBsStackCurBits;
pBs->iLeftBits = sDss.iBsStackLeftBits;
StashPopMBStatus (&sDss, pBs, pSlice);
pCurLayer->pLastCodedMbIdxOfPartition[kiPartitionId] = iCurMbIdx -
1; // update pLastCodedMbIdxOfPartition, need to -1 due to stepping back
++ pCurLayer->pNumSliceCodedOfPartition[kiPartitionId];
@ -1116,13 +1112,7 @@ TRY_REENCODING:
//DYNAMIC_SLICING_ONE_THREAD - MultiD
sDss.iCurrentPos = BsGetBitsPos (pBs);
if (DynSlcJudgeSliceBoundaryStepBack (pEncCtx, pSlice, pSliceCtx, pCurMb, &sDss)) {
//stack pBs pointer
pBs->pBufPtr = sDss.pBsStackBufPtr;
pBs->uiCurBits = sDss.uiBsStackCurBits;
pBs->iLeftBits = sDss.iBsStackLeftBits;
iMbSkipRun = sDss.iMbSkipRunStack;
StashPopMBStatus (&sDss, pBs, pSlice, &iMbSkipRun);
pCurLayer->pLastCodedMbIdxOfPartition[kiPartitionId] = iCurMbIdx -
1; // update pLastCodedMbIdxOfPartition, need to -1 due to stepping back
++ pCurLayer->pNumSliceCodedOfPartition[kiPartitionId];