shithub: openh264

--- a/codec/build/iOS/dec/demo/demo/DEMOViewController.m

+++ b/codec/build/iOS/dec/demo/demo/DEMOViewController.m

@@ -47,7 +47,7 @@

 - (void)viewDidLoad

     [super viewDidLoad];

-	// Do any additional setup after loading the view, typically from a nib.

+    // Do any additional setup after loading the view, typically from a nib.

     //Add the testing codes

     self.resFileArray = [[NSMutableArray alloc] init];

     self.selectedRow = 0;

--- a/codec/common/inc/WelsThreadLib.h

+++ b/codec/common/inc/WelsThreadLib.h

@@ -60,7 +60,7 @@

 #define    WELS_THREAD_ROUTINE_TYPE         DWORD  WINAPI

 #define    WELS_THREAD_ROUTINE_RETURN(rc)   return (DWORD)rc;

-#else	// NON-WINDOWS

+#else // NON-WINDOWS

 #include <stdlib.h>

 #include <unistd.h>

--- a/codec/common/inc/copy_mb.h

+++ b/codec/common/inc/copy_mb.h

@@ -42,8 +42,8 @@

 void WelsCopy8x4_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);

 void WelsCopy4x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);

 void WelsCopy8x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);

-void WelsCopy8x16_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);	//

-void WelsCopy16x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);	//

+void WelsCopy8x16_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS); //

+void WelsCopy16x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS); //

 void WelsCopy16x16_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);

 #if defined(__cplusplus)

--- a/codec/common/inc/expand_pic.h

+++ b/codec/common/inc/expand_pic.h

@@ -46,7 +46,7 @@

 extern "C" {

 #endif//__cplusplus

-#define PADDING_LENGTH			32 // reference extension

+#define PADDING_LENGTH 32 // reference extension

 #if defined(X86_ASM)

 void ExpandPictureLuma_sse2 (uint8_t* pDst,

--- a/codec/common/inc/golomb_common.h

+++ b/codec/common/inc/golomb_common.h

@@ -67,11 +67,11 @@

 static inline int32_t InitBits (SBitStringAux* pBs, const uint8_t* kpBuf, const int32_t kiSize) {

   uint8_t* ptr = (uint8_t*)kpBuf;

-  pBs->pStartBuf	= ptr;

-  pBs->pCurBuf	= ptr;

-  pBs->pEndBuf	= ptr + kiSize;

-  pBs->iLeftBits	= 32;

-  pBs->uiCurBits	= 0;

+  pBs->pStartBuf = ptr;

+  pBs->pCurBuf   = ptr;

+  pBs->pEndBuf   = ptr + kiSize;

+  pBs->iLeftBits = 32;

+  pBs->uiCurBits = 0;

   return kiSize;

--- a/codec/common/inc/ls_defines.h

+++ b/codec/common/inc/ls_defines.h

@@ -62,7 +62,7 @@

 STRUCTA (64, 4);

 STRUCTA (64, 8);

 //#define _USE_STRUCT_INT_CVT

-//	#ifdef _USE_STRUCT_INT_CVT

+//#ifdef _USE_STRUCT_INT_CVT

 #define ST16(a, b) (((struct tagUnaligned_16 *) (a))->l) = (b)

 #define ST32(a, b) (((struct tagUnaligned_32 *) (a))->l) = (b)

 #define ST64(a, b) (((struct tagUnaligned_64 *) (a))->l) = (b)

@@ -81,11 +81,11 @@

 #define ST64A2(a, b) STA(a, b, 64, 2)

 #define ST64A4(a, b) STA(a, b, 64, 4)

 #define ST64A8(a, b) STA(a, b, 64, 8)

-//	#else

-//		inline void __ST16(void *dst, uint16_t v) { memcpy(dst, &v, 2); }

-//		inline void __ST32(void *dst, uint32_t v) { memcpy(dst, &v, 4); }

+//#else

+//inline void __ST16(void *dst, uint16_t v) { memcpy(dst, &v, 2); }

+//inline void __ST32(void *dst, uint32_t v) { memcpy(dst, &v, 4); }

 //inline void __ST64(void *dst, uint64_t v) { memcpy(dst, &v, 8); }

-//	#endif

+//#endif

 #else

@@ -116,15 +116,15 @@

 #endif /* !__GNUC__ */

 #ifndef INTD16

-#define INTD16	LD16

+#define INTD16 LD16

 #endif//INTD16

 #ifndef INTD32

-#define INTD32	LD32

+#define INTD32 LD32

 #endif//INTD32

 #ifndef INTD64

-#define INTD64	LD64

+#define INTD64 LD64

 #endif//INTD64

 #endif//___LD_ST_MACROS___

--- a/codec/common/inc/macros.h

+++ b/codec/common/inc/macros.h

@@ -70,7 +70,7 @@

 #if defined(_MSC_VER)

 #if(_MSC_VER < 1700)

-#define inline	__inline

+#define inline __inline

 #endif

 #define ALIGNED_DECLARE( type, var, n ) __declspec(align(n)) type var

@@ -82,51 +82,51 @@

 #ifndef WELS_ALIGN

-#define WELS_ALIGN(x, n)	(((x)+(n)-1)&~((n)-1))

+#define WELS_ALIGN(x, n) (((x)+(n)-1)&~((n)-1))

 #endif//WELS_ALIGN

 #if 1 // Alternative implementation of WELS_MAX and WELS_MIN

 #ifndef WELS_MAX

-#define WELS_MAX(x, y)	((x) > (y) ? (x) : (y))

+#define WELS_MAX(x, y) ((x) > (y) ? (x) : (y))

 #endif//WELS_MAX

 #ifndef WELS_MIN

-#define WELS_MIN(x, y)	((x) < (y) ? (x) : (y))

+#define WELS_MIN(x, y) ((x) < (y) ? (x) : (y))

 #endif//WELS_MIN

 #else // Alternative implementation of WELS_MAX and WELS_MIN

 #ifndef WELS_MAX

-#define WELS_MAX(x, y)	((x) - (((x)-(y))&(((x)-(y))>>31)))

+#define WELS_MAX(x, y) ((x) - (((x)-(y))&(((x)-(y))>>31)))

 #endif//WELS_MAX

 #ifndef WELS_MIN

-#define WELS_MIN(x, y)	((y) + (((x)-(y))&(((x)-(y))>>31)))

+#define WELS_MIN(x, y) ((y) + (((x)-(y))&(((x)-(y))>>31)))

 #endif//WELS_MIN

 #endif // Alternative implementation of WELS_MAX and WELS_MIN

 #ifndef WELS_CEIL

-#define WELS_CEIL(x)	ceil(x)	// FIXME: low complexity instead of math library used

+#define WELS_CEIL(x) ceil(x) // FIXME: low complexity instead of math library used

 #endif//WELS_CEIL

 #ifndef WELS_FLOOR

-#define WELS_FLOOR(x)	floor(x)	// FIXME: low complexity instead of math library used

+#define WELS_FLOOR(x) floor(x)        // FIXME: low complexity instead of math library used