From 3052b7ac6428aaf47dbc28fe81a2dc68852d1f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 3 Jun 2015 12:14:30 +0300 Subject: [PATCH] Remove tabs from vertically aligned function declarations and typedefs --- codec/encoder/core/inc/encode_mb_aux.h | 8 +-- codec/encoder/core/inc/svc_enc_frame.h | 4 +- codec/encoder/core/inc/svc_encode_mb.h | 16 +++--- codec/encoder/core/inc/wels_preprocess.h | 2 +- codec/processing/src/downsample/downsample.h | 32 ++++++------ codec/processing/src/vaacalc/vaacalculation.h | 50 +++++++++---------- 6 files changed, 56 insertions(+), 56 deletions(-) diff --git a/codec/encoder/core/inc/encode_mb_aux.h b/codec/encoder/core/inc/encode_mb_aux.h index 11a4b4cb..cd2e620c 100644 --- a/codec/encoder/core/inc/encode_mb_aux.h +++ b/codec/encoder/core/inc/encode_mb_aux.h @@ -44,10 +44,10 @@ int32_t WelsGetNoneZeroCount_c (int16_t* pLevel); /**************************************************************************** * Scan and Score functions ****************************************************************************/ -void WelsScan4x4Ac_c (int16_t* pZigValue, int16_t* pDct); -void WelsScan4x4Dc (int16_t* pLevel, int16_t* pDct); -void WelsScan4x4DcAc_c (int16_t* pLevel, int16_t* pDct); -int32_t WelsCalculateSingleCtr4x4_c (int16_t* pDct); +void WelsScan4x4Ac_c (int16_t* pZigValue, int16_t* pDct); +void WelsScan4x4Dc (int16_t* pLevel, int16_t* pDct); +void WelsScan4x4DcAc_c (int16_t* pLevel, int16_t* pDct); +int32_t WelsCalculateSingleCtr4x4_c (int16_t* pDct); /**************************************************************************** * HDM and Quant functions diff --git a/codec/encoder/core/inc/svc_enc_frame.h b/codec/encoder/core/inc/svc_enc_frame.h index a39f25b2..8749dc92 100644 --- a/codec/encoder/core/inc/svc_enc_frame.h +++ b/codec/encoder/core/inc/svc_enc_frame.h @@ -53,8 +53,8 @@ namespace WelsEnc { ///////////////////////////////////DQ Layer level/////////////////////////////////// -typedef struct TagDqLayer SDqLayer; -typedef SDqLayer* pDqLayer; +typedef struct TagDqLayer SDqLayer; +typedef SDqLayer* pDqLayer; typedef struct TagFeatureSearchPreparation { SScreenBlockFeatureStorage* pRefBlockFeature;//point the the ref frame storage diff --git a/codec/encoder/core/inc/svc_encode_mb.h b/codec/encoder/core/inc/svc_encode_mb.h index 86a196dd..6408e637 100644 --- a/codec/encoder/core/inc/svc_encode_mb.h +++ b/codec/encoder/core/inc/svc_encode_mb.h @@ -48,16 +48,16 @@ #include "wels_func_ptr_def.h" namespace WelsEnc { -void WelsDctMb (int16_t* pRs, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4); +void WelsDctMb (int16_t* pRs, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4); -void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache); -void WelsEncRecI4x4Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, uint8_t uiI4x4Idx); -void WelsEncInterY (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache); -void WelsEncRecUV (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache, int16_t* pRs, int32_t iUV); -void WelsRecPskip (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SMB* pCurMb, SMbCache* pMbCache); +void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache); +void WelsEncRecI4x4Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, uint8_t uiI4x4Idx); +void WelsEncInterY (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache); +void WelsEncRecUV (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache, int16_t* pRs, int32_t iUV); +void WelsRecPskip (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SMB* pCurMb, SMbCache* pMbCache); -bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache); -bool WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV); +bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache); +bool WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV); } #endif diff --git a/codec/encoder/core/inc/wels_preprocess.h b/codec/encoder/core/inc/wels_preprocess.h index c8fc8a66..40160347 100644 --- a/codec/encoder/core/inc/wels_preprocess.h +++ b/codec/encoder/core/inc/wels_preprocess.h @@ -150,7 +150,7 @@ class CWelsPreProcess { private: int32_t SingleLayerPreprocess (sWelsEncCtx* pEncCtx, const SSourcePicture* kpSrc, Scaled_Picture* m_sScaledPicture); - void BilateralDenoising (SPicture* pSrc, const int32_t iWidth, const int32_t iHeight); + void BilateralDenoising (SPicture* pSrc, const int32_t iWidth, const int32_t iHeight); bool DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture); int32_t DownsamplePadding (SPicture* pSrc, SPicture* pDstPic, int32_t iSrcWidth, int32_t iSrcHeight, int32_t iShrinkWidth, int32_t iShrinkHeight, int32_t iTargetWidth, int32_t iTargetHeight, diff --git a/codec/processing/src/downsample/downsample.h b/codec/processing/src/downsample/downsample.h index 11c85dc6..09048f0b 100644 --- a/codec/processing/src/downsample/downsample.h +++ b/codec/processing/src/downsample/downsample.h @@ -58,8 +58,8 @@ typedef void (GeneralDownsampleFunc) (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstHeight, uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight); -typedef HalveDownsampleFunc* PHalveDownsampleFunc; -typedef GeneralDownsampleFunc* PGeneralDownsampleFunc; +typedef HalveDownsampleFunc* PHalveDownsampleFunc; +typedef GeneralDownsampleFunc* PGeneralDownsampleFunc; HalveDownsampleFunc DyadicBilinearDownsampler_c; GeneralDownsampleFunc GeneralBilinearFastDownsampler_c; @@ -67,28 +67,28 @@ GeneralDownsampleFunc GeneralBilinearAccurateDownsampler_c; typedef struct { // align_index: 0 = x32; 1 = x16; 2 = x8; 3 = common case left; - PHalveDownsampleFunc pfHalfAverage[4]; - PGeneralDownsampleFunc pfGeneralRatioLuma; - PGeneralDownsampleFunc pfGeneralRatioChroma; + PHalveDownsampleFunc pfHalfAverage[4]; + PGeneralDownsampleFunc pfGeneralRatioLuma; + PGeneralDownsampleFunc pfGeneralRatioChroma; } SDownsampleFuncs; #ifdef X86_ASM WELSVP_EXTERN_C_BEGIN // used for scr width is multipler of 8 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx8_sse; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx8_sse; // iSrcWidth= x16 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx16_sse; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx16_sse; // iSrcWidth= x32 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_sse; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_sse; // used for scr width is multipler of 16 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx16_ssse3; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx16_ssse3; // iSrcWidth= x32 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_ssse3; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_ssse3; // iSrcWidth= x16 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx16_sse4; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx16_sse4; // iSrcWidth= x32 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_sse4; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_sse4; GeneralDownsampleFunc GeneralBilinearFastDownsamplerWrap_sse2; GeneralDownsampleFunc GeneralBilinearAccurateDownsamplerWrap_sse2; @@ -103,9 +103,9 @@ WELSVP_EXTERN_C_END #ifdef HAVE_NEON WELSVP_EXTERN_C_BEGIN // iSrcWidth no limitation -HalveDownsampleFunc DyadicBilinearDownsampler_neon; +HalveDownsampleFunc DyadicBilinearDownsampler_neon; // iSrcWidth = x32 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_neon; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_neon; GeneralDownsampleFunc GeneralBilinearAccurateDownsamplerWrap_neon; @@ -119,9 +119,9 @@ WELSVP_EXTERN_C_END #ifdef HAVE_NEON_AARCH64 WELSVP_EXTERN_C_BEGIN // iSrcWidth no limitation -HalveDownsampleFunc DyadicBilinearDownsampler_AArch64_neon; +HalveDownsampleFunc DyadicBilinearDownsampler_AArch64_neon; // iSrcWidth = x32 pixels -HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_AArch64_neon; +HalveDownsampleFunc DyadicBilinearDownsamplerWidthx32_AArch64_neon; GeneralDownsampleFunc GeneralBilinearAccurateDownsamplerWrap_AArch64_neon; diff --git a/codec/processing/src/vaacalc/vaacalculation.h b/codec/processing/src/vaacalc/vaacalculation.h index d3c89704..5badb099 100644 --- a/codec/processing/src/vaacalc/vaacalculation.h +++ b/codec/processing/src/vaacalc/vaacalculation.h @@ -75,11 +75,11 @@ typedef void (VAACalcSadSsdFunc) (const uint8_t* pCurData, const uint8_t* pRefDa int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16, int32_t* pSsd16x16); -typedef VAACalcSadBgdFunc* PVAACalcSadBgdFunc; -typedef VAACalcSadSsdBgdFunc* PVAACalcSadSsdBgdFunc; -typedef VAACalcSadFunc* PVAACalcSadFunc; -typedef VAACalcSadVarFunc* PVAACalcSadVarFunc; -typedef VAACalcSadSsdFunc* PVAACalcSadSsdFunc; +typedef VAACalcSadBgdFunc* PVAACalcSadBgdFunc; +typedef VAACalcSadSsdBgdFunc* PVAACalcSadSsdBgdFunc; +typedef VAACalcSadFunc* PVAACalcSadFunc; +typedef VAACalcSadVarFunc* PVAACalcSadVarFunc; +typedef VAACalcSadSsdFunc* PVAACalcSadSsdFunc; typedef struct TagVaaFuncs { PVAACalcSadBgdFunc pfVAACalcSadBgd; @@ -90,40 +90,40 @@ typedef struct TagVaaFuncs { } SVaaFuncs; -VAACalcSadBgdFunc VAACalcSadBgd_c; -VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_c; -VAACalcSadFunc VAACalcSad_c; -VAACalcSadVarFunc VAACalcSadVar_c; -VAACalcSadSsdFunc VAACalcSadSsd_c; +VAACalcSadBgdFunc VAACalcSadBgd_c; +VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_c; +VAACalcSadFunc VAACalcSad_c; +VAACalcSadVarFunc VAACalcSadVar_c; +VAACalcSadSsdFunc VAACalcSadSsd_c; #ifdef X86_ASM WELSVP_EXTERN_C_BEGIN -VAACalcSadBgdFunc VAACalcSadBgd_sse2; -VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_sse2; -VAACalcSadFunc VAACalcSad_sse2; -VAACalcSadVarFunc VAACalcSadVar_sse2; -VAACalcSadSsdFunc VAACalcSadSsd_sse2; +VAACalcSadBgdFunc VAACalcSadBgd_sse2; +VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_sse2; +VAACalcSadFunc VAACalcSad_sse2; +VAACalcSadVarFunc VAACalcSadVar_sse2; +VAACalcSadSsdFunc VAACalcSadSsd_sse2; WELSVP_EXTERN_C_END #endif #ifdef HAVE_NEON WELSVP_EXTERN_C_BEGIN -VAACalcSadBgdFunc VAACalcSadBgd_neon; -VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_neon; -VAACalcSadFunc VAACalcSad_neon; -VAACalcSadVarFunc VAACalcSadVar_neon; -VAACalcSadSsdFunc VAACalcSadSsd_neon; +VAACalcSadBgdFunc VAACalcSadBgd_neon; +VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_neon; +VAACalcSadFunc VAACalcSad_neon; +VAACalcSadVarFunc VAACalcSadVar_neon; +VAACalcSadSsdFunc VAACalcSadSsd_neon; WELSVP_EXTERN_C_END #endif #ifdef HAVE_NEON_AARCH64 WELSVP_EXTERN_C_BEGIN -VAACalcSadBgdFunc VAACalcSadBgd_AArch64_neon; -VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_AArch64_neon; -VAACalcSadFunc VAACalcSad_AArch64_neon; -VAACalcSadVarFunc VAACalcSadVar_AArch64_neon; -VAACalcSadSsdFunc VAACalcSadSsd_AArch64_neon; +VAACalcSadBgdFunc VAACalcSadBgd_AArch64_neon; +VAACalcSadSsdBgdFunc VAACalcSadSsdBgd_AArch64_neon; +VAACalcSadFunc VAACalcSad_AArch64_neon; +VAACalcSadVarFunc VAACalcSadVar_AArch64_neon; +VAACalcSadSsdFunc VAACalcSadSsd_AArch64_neon; WELSVP_EXTERN_C_END #endif