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

Remove endianness assumptions from DeblockingBsMarginalMBAvcbase

Browse Source 
This fixes a decoder unit test when running on big endian.
This commit is contained in:
Martin Storsjö 2015-05-13 14:43:09 +03:00
parent 2453042bf0
commit 239e22d088
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codec/decoder/core/src/deblocking.cpp
View File

@ -279,8 +279,7 @@ void static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS
uint32_t DeblockingBsMarginalMBAvcbase (PDqLayer pCurDqLayer, int32_t iEdge, int32_t iNeighMb, int32_t iMbXy) { uint32_t DeblockingBsMarginalMBAvcbase (PDqLayer pCurDqLayer, int32_t iEdge, int32_t iNeighMb, int32_t iMbXy) {
int32_t i, j; int32_t i, j;
uint32_t uiBSx4; uint8_t pBS[4];
uint8_t* pBS = (uint8_t*) (&uiBSx4);
const uint8_t* pBIdx = &g_kuiTableBIdx[iEdge][0]; const uint8_t* pBIdx = &g_kuiTableBIdx[iEdge][0];
const uint8_t* pBnIdx = &g_kuiTableBIdx[iEdge][4]; const uint8_t* pBnIdx = &g_kuiTableBIdx[iEdge][4];
const uint8_t* pB8x8Idx = &g_kuiTableB8x8Idx[iEdge][0]; const uint8_t* pB8x8Idx = &g_kuiTableB8x8Idx[iEdge][0];
@ -349,7 +348,7 @@ uint32_t DeblockingBsMarginalMBAvcbase (PDqLayer pCurDqLayer, int32_t iEdge, int
} }
} }
return uiBSx4; return pBS[0] | (pBS[1] << 8) | (pBS[2] << 16) | (pBS[3] << 24);
} }
int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterIdc) { int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterIdc) {
int32_t iMbY = pCurDqLayer->iMbY; int32_t iMbY = pCurDqLayer->iMbY;