Remove endianness assumptions from DeblockingBsMarginalMBAvcbase

This fixes a decoder unit test when running on big endian.

Martin Storsjö committed 11 years ago

Commit 239e22d1 parent 24530421 file · +2 −3Browse files

Showing the changes to codec/decoder (1 of 1 file). Show all

Unified · Split

codec/decoder/core/src/deblocking.cpp+2−3

@@ -279,8 +279,7 @@ void static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS · 278 unmodified lines
279	279
280	280	uint32_t DeblockingBsMarginalMBAvcbase (PDqLayer pCurDqLayer, int32_t iEdge, int32_t iNeighMb, int32_t iMbXy) {
281	281	int32_t i, j;
282		− uint32_t uiBSx4;
283		− uint8_t* pBS = (uint8_t*) (&uiBSx4);
	282	+ uint8_t pBS[4];
284	283	const uint8_t* pBIdx = &g_kuiTableBIdx[iEdge][0];
285	284	const uint8_t* pBnIdx = &g_kuiTableBIdx[iEdge][4];
286	285	const uint8_t* pB8x8Idx = &g_kuiTableB8x8Idx[iEdge][0];
@@ -349,7 +348,7 @@ uint32_t DeblockingBsMarginalMBAvcbase (PDqLayer pCurDqLayer, int32_t iEdge, int · 62 unmodified lines
349	348	}
350	349	}
351	350
352		− return uiBSx4;
	351	+ return pBS[0] \| (pBS[1] << 8) \| (pBS[2] << 16) \| (pBS[3] << 24);
353	352	}
354	353	int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterIdc) {
355	354	int32_t iMbY = pCurDqLayer->iMbY;