Showing the changes to codec/decoder/core/src/fmo.cpp (1 of 71 files). Show all
Unified · Split
| @@ -42,8 +42,6 @@ · 41 unmodified lines | |||
| 42 | #include "memory_align.h" | 42 | #include "memory_align.h" |
| 43 | #include "error_code.h" | 43 | #include "error_code.h" |
| 44 | 44 | ||
| 45 | namespace WelsDec { | ||
| 46 | |||
| 47 | /*! | 45 | /*! |
| 48 | * \brief Generate MB allocated map for interleaved slice group (TYPE 0) | 46 | * \brief Generate MB allocated map for interleaved slice group (TYPE 0) |
| 49 | * | 47 | * |
| @@ -53,8 +51,8 @@ namespace WelsDec { · 3 unmodified lines | |||
| 53 | * \return 0 - successful; none 0 - failed | 51 | * \return 0 - successful; none 0 - failed |
| 54 | */ | 52 | */ |
| 55 | static inline int32_t FmoGenerateMbAllocMapType0 (PFmo pFmo, PPps pPps) { | 53 | static inline int32_t FmoGenerateMbAllocMapType0 (PFmo pFmo, PPps pPps) { |
| 56 | uint32_t uiNumSliceGroups = 0; | 54 | uint32_t uiNumSliceGroups; |
| 57 | int32_t iMbNum = 0; | 55 | int32_t iMbNum; |
| 58 | int32_t i = 0; | 56 | int32_t i = 0; |
| 59 | 57 | ||
| 60 | WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo || NULL == pPps)) | 58 | WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo || NULL == pPps)) |
| @@ -90,8 +88,8 @@ static inline int32_t FmoGenerateMbAllocMapType0 (PFmo pFmo, PPps pPps) { · 29 unmodified lines | |||
| 90 | * \return 0 - successful; none 0 - failed | 88 | * \return 0 - successful; none 0 - failed |
| 91 | */ | 89 | */ |
| 92 | static inline int32_t FmoGenerateMbAllocMapType1 (PFmo pFmo, PPps pPps, const int32_t kiMbWidth) { | 90 | static inline int32_t FmoGenerateMbAllocMapType1 (PFmo pFmo, PPps pPps, const int32_t kiMbWidth) { |
| 93 | uint32_t uiNumSliceGroups = 0; | 91 | uint32_t uiNumSliceGroups; |
| 94 | int32_t iMbNum = 0; | 92 | int32_t iMbNum; |
| 95 | int32_t i = 0; | 93 | int32_t i = 0; |
| 96 | WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo || NULL == pPps)) | 94 | WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo || NULL == pPps)) |
| 97 | uiNumSliceGroups = pPps->uiNumSliceGroups; | 95 | uiNumSliceGroups = pPps->uiNumSliceGroups; |
| @@ -119,7 +117,7 @@ static inline int32_t FmoGenerateMbAllocMapType1 (PFmo pFmo, PPps pPps, const in · 21 unmodified lines | |||
| 119 | */ | 117 | */ |
| 120 | static inline int32_t FmoGenerateSliceGroup (PFmo pFmo, const PPps kpPps, const int32_t kiMbWidth, | 118 | static inline int32_t FmoGenerateSliceGroup (PFmo pFmo, const PPps kpPps, const int32_t kiMbWidth, |
| 121 | const int32_t kiMbHeight, CMemoryAlign* pMa) { | 119 | const int32_t kiMbHeight, CMemoryAlign* pMa) { |
| 122 | int32_t iNumMb = 0; | 120 | int32_t iNumMb; |
| 123 | int32_t iErr = 0; | 121 | int32_t iErr = 0; |
| 124 | bool bResolutionChanged = false; | 122 | bool bResolutionChanged = false; |
| 125 | 123 | ||
| @@ -322,5 +320,3 @@ MB_XY_T FmoNextMb (PFmo pFmo, const MB_XY_T kiMbXy) { · 196 unmodified lines | |||
| 322 | // -1: No further MB in this slice (could be end of picture) | 320 | // -1: No further MB in this slice (could be end of picture) |
| 323 | return iNextMb; | 321 | return iNextMb; |
| 324 | } | 322 | } |
| 325 | |||
| 326 | } // namespace WelsDec | ||