History

This refine is to remove slice number limitation in the future. The changes contains: 1. add pNalLen in Structure SWelsEncoderOutput to store each nal length 2. rename iNalLengthInByte[MAX_NAL_UNITS_IN_LAYER] to pNalLengthInByte in Structure SLayerBSInfo, the pointer point to pNalLen, like pBSBuf point to pFrameBS.

ganyang committed 12 years ago

Commit c08c0f81 parent 3c4d1518 files · +34 −34Browse files

Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 8 files). Show all

Unified · Split

codec/encoder/core/src/slice_multi_threading.cpp+3−3
@@ -548,7 +548,7 @@ int32_t AppendSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, const int32 · 547 unmodified lines
548 iLayerSize += pSliceBs->uiBsPos;548 iLayerSize += pSliceBs->uiBsPos;
549 549
550 while (iNalIdx < iCountNal) {550 while (iNalIdx < iCountNal) {
551 pLbi->iNalLengthInByte[iNalIdxBase + iNalIdx] = pSliceBs->iNalLen[iNalIdx];551 pLbi->pNalLengthInByte[iNalIdxBase + iNalIdx] = pSliceBs->iNalLen[iNalIdx];
552 ++ iNalIdx;552 ++ iNalIdx;
553 }553 }
554 pLbi->iNalCount += iCountNal;554 pLbi->iNalCount += iCountNal;
@@ -580,7 +580,7 @@ int32_t AppendSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, const int32 · 25 unmodified lines
580 iLayerSize += pSliceBs->uiBsPos;580 iLayerSize += pSliceBs->uiBsPos;
581 581
582 while (iNalIdx < iCountNal) {582 while (iNalIdx < iCountNal) {
583 pLbi->iNalLengthInByte[iNalIdxBase + iNalIdx] = pSliceBs->iNalLen[iNalIdx];583 pLbi->pNalLengthInByte[iNalIdxBase + iNalIdx] = pSliceBs->iNalLen[iNalIdx];
584 ++ iNalIdx;584 ++ iNalIdx;
585 }585 }
586 pLbi->iNalCount += iCountNal;586 pLbi->iNalCount += iCountNal;
@@ -621,7 +621,7 @@ int32_t WriteSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, uint8_t* pFr · 34 unmodified lines
621 WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)621 WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
622 iSliceSize += iNalSize;622 iSliceSize += iNalSize;
623 pDst += iNalSize;623 pDst += iNalSize;
624 pLbi->iNalLengthInByte[iNalBase + iNalIdx] = iNalSize;624 pLbi->pNalLengthInByte[iNalBase + iNalIdx] = iNalSize;
625 625
626 ++ iNalIdx;626 ++ iNalIdx;
627 }627 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t