Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 8 files). Show all
Unified · Split
| @@ -161,7 +161,7 @@ inline int32_t WelsDecodeConstructSlice (PWelsDecoderContext pCtx, PNalUnit pCu · 160 unmodified lines | ||
| 161 | 161 | */ |
| 162 | 162 | int32_t ParseRefPicListReordering (PBitStringAux pBs, PSliceHeader pSh) { |
| 163 | 163 | int32_t iList = 0; |
| 164 | − const ESliceType keSt = pSh->eSliceType; | |
| 164 | + const EWelsSliceType keSt = pSh->eSliceType; | |
| 165 | 165 | PRefPicListReorderSyn pRefPicListReordering = &pSh->pRefPicListReordering; |
| 166 | 166 | PSps pSps = pSh->pSps; |
| 167 | 167 | uint32_t uiCode; |
| @@ -446,7 +446,7 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 278 unmodified lines | ||
| 446 | 446 | PSubsetSps pSubsetSps = NULL; |
| 447 | 447 | PSps pSps = NULL; |
| 448 | 448 | PPps pPps = NULL; |
| 449 | − ENalUnitType eNalType = static_cast<ENalUnitType> (0); | |
| 449 | + EWelsNalUnitType eNalType = static_cast<EWelsNalUnitType> (0); | |
| 450 | 450 | int32_t iPpsId = 0; |
| 451 | 451 | int32_t iRet = ERR_NONE; |
| 452 | 452 | uint8_t uiSliceType = 0; |
| @@ -508,7 +508,7 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 55 unmodified lines | ||
| 508 | 508 | } |
| 509 | 509 | } |
| 510 | 510 | |
| 511 | − pSliceHead->eSliceType = static_cast <ESliceType> (uiSliceType); | |
| 511 | + pSliceHead->eSliceType = static_cast <EWelsSliceType> (uiSliceType); | |
| 512 | 512 | |
| 513 | 513 | WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_parameter_set_id |
| 514 | 514 | iPpsId = uiCode; |