Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 5 files). Show all
Unified · Split
| @@ -2519,7 +2519,6 @@ void WelsInitCurrentLayer (sWelsEncCtx* pCtx, · 2518 unmodified lines | |||
| 2519 | SPicture* pDecPic = pCtx->pDecPic; | 2519 | SPicture* pDecPic = pCtx->pDecPic; |
| 2520 | SDqLayer* pCurDq = pCtx->pCurDqLayer; | 2520 | SDqLayer* pCurDq = pCtx->pCurDqLayer; |
| 2521 | SSlice* pBaseSlice = pCurDq->ppSliceInLayer[0]; | 2521 | SSlice* pBaseSlice = pCurDq->ppSliceInLayer[0]; |
| 2522 | SSlice* pSlice = NULL; | ||
| 2523 | const uint8_t kiCurDid = pCtx->uiDependencyId; | 2522 | const uint8_t kiCurDid = pCtx->uiDependencyId; |
| 2524 | const bool kbUseSubsetSpsFlag = (!pParam->bSimulcastAVC) && (kiCurDid > BASE_DEPENDENCY_ID); | 2523 | const bool kbUseSubsetSpsFlag = (!pParam->bSimulcastAVC) && (kiCurDid > BASE_DEPENDENCY_ID); |
| 2525 | SSpatialLayerConfig* fDlp = &pParam->sSpatialLayers[kiCurDid]; | 2524 | SSpatialLayerConfig* fDlp = &pParam->sSpatialLayers[kiCurDid]; |
| @@ -2565,13 +2564,7 @@ void WelsInitCurrentLayer (sWelsEncCtx* pCtx, · 39 unmodified lines | |||
| 2565 | 2564 | ||
| 2566 | iIdx = 1; | 2565 | iIdx = 1; |
| 2567 | while (iIdx < iSliceCount) { | 2566 | while (iIdx < iSliceCount) { |
| 2568 | pSlice = pCurDq->ppSliceInLayer[iIdx]; | 2567 | InitSliceHeadWithBase (pCurDq->ppSliceInLayer[iIdx], pBaseSlice); |
| 2569 | |||
| 2570 | pSlice->sSliceHeaderExt.sSliceHeader.iPpsId = pBaseSlice->sSliceHeaderExt.sSliceHeader.iPpsId; | ||
| 2571 | pSlice->sSliceHeaderExt.sSliceHeader.pPps = pBaseSlice->sSliceHeaderExt.sSliceHeader.pPps; | ||
| 2572 | pSlice->sSliceHeaderExt.sSliceHeader.iSpsId = pBaseSlice->sSliceHeaderExt.sSliceHeader.iSpsId; | ||
| 2573 | pSlice->sSliceHeaderExt.sSliceHeader.pSps = pBaseSlice->sSliceHeaderExt.sSliceHeader.pSps; | ||
| 2574 | pSlice->bSliceHeaderExtFlag = pBaseSlice->bSliceHeaderExtFlag; | ||
| 2575 | ++ iIdx; | 2568 | ++ iIdx; |
| 2576 | } | 2569 | } |
| 2577 | 2570 | ||
| @@ -3787,6 +3780,9 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 1209 unmodified lines | |||
| 3787 | //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum] | 3780 | //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum] |
| 3788 | // UpdateSliceInLayerInfo(); // reordering | 3781 | // UpdateSliceInLayerInfo(); // reordering |
| 3789 | 3782 | ||
| 3783 | //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum] | ||
| 3784 | // UpdateSliceInLayerInfo(); // reordering | ||
| 3785 | |||
| 3790 | iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, kiPartitionCnt); | 3786 | iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, kiPartitionCnt); |
| 3791 | } else { // for non-dynamic-slicing mode single threading branch.. | 3787 | } else { // for non-dynamic-slicing mode single threading branch.. |
| 3792 | const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag; | 3788 | const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag; |