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

Remove an unused function for byte order swapping

Browse Source
This commit is contained in:
Martin Storsjö
2014-01-27 22:18:23 +02:00
parent e17e664e1a
commit 55717d3fb8
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codec/decoder/core/inc/bit_stream.h
View File

@@ -66,8 +66,6 @@ int32_t InitBits (PBitStringAux pBitString, const uint8_t* kpBuf, const int32_t
void_t InitReadBits (PBitStringAux pBitString); void_t InitReadBits (PBitStringAux pBitString);
uint32_t EndianFix (uint32_t uiX);
} // namespace WelsDec } // namespace WelsDec

32
codec/decoder/core/src/bit_stream.cpp
View File

@@ -41,38 +41,6 @@
namespace WelsDec { namespace WelsDec {
#ifdef WORDS_BIGENDIAN
inline uint32_t EndianFix (uint32_t uiX) {
return uiX;
}
#else //WORDS_BIGENDIAN
#if defined(_MSC_VER) && defined(_M_IX86)
inline uint32_t EndianFix (uint32_t uiX) {
__asm {
mov eax, uiX
bswap eax
mov uiX, eax
}
return uiX;
}
#else //_MSC_VER
inline uint32_t EndianFix (uint32_t uiX) {
#ifdef ARM_ARCHv7
__asm__ __volatile__ ("rev %0, %0":"+r" (uiX)); //Just for the ARMv7
#elif defined (X86_ARCH)
__asm__ __volatile__ ("bswap %0":"+r" (uiX));
#else
uiX = ((uiX & 0xff000000) >> 24) | ((uiX & 0xff0000) >> 8) |
((uiX & 0xff00) << 8) | ((uiX & 0xff) << 24);
#endif
return uiX;
}
#endif //_MSC_VER
#endif //WORDS_BIGENDIAN
inline uint32_t GetValue4Bytes (uint8_t* pDstNal) { inline uint32_t GetValue4Bytes (uint8_t* pDstNal) {
uint32_t uiValue = 0; uint32_t uiValue = 0;
uiValue = (pDstNal[0] << 24) | (pDstNal[1] << 16) | (pDstNal[2] << 8) | (pDstNal[3]); uiValue = (pDstNal[0] << 24) | (pDstNal[1] << 16) | (pDstNal[2] << 8) | (pDstNal[3]);