From dca49663cd17b18c466af1c2a00cf7536edaaf1c Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 22 Dec 2007 19:16:01 +0000 Subject: cosmetics: Remove trailing whitespace, reformat one comment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25512 b3059339-0415-0410-9bf9-f77b7e298cf2 --- liba52/resample.c | 4 ++-- liba52/resample_altivec.c | 2 +- liba52/resample_mmx.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'liba52') diff --git a/liba52/resample.c b/liba52/resample.c index c1bc190cc3..97eb928e97 100644 --- a/liba52/resample.c +++ b/liba52/resample.c @@ -69,14 +69,14 @@ void* tmp; } } #endif - + tmp=a52_resample_C(flags,chans); if(tmp){ if(a52_resample==NULL) fprintf(stderr, "No accelerated resampler found\n"); a52_resample=tmp; return tmp; } - + fprintf(stderr, "Unimplemented resampler for mode 0x%X -> %d channels conversion - Contact MPlayer developers!\n", flags, chans); return NULL; } diff --git a/liba52/resample_altivec.c b/liba52/resample_altivec.c index 24c911af6b..1328a2a021 100644 --- a/liba52/resample_altivec.c +++ b/liba52/resample_altivec.c @@ -71,7 +71,7 @@ static int a52_resample_STEREO_to_2_altivec(float * _f, int16_t * s16){ for (i = 0; i < 256; i+= 8) { f0 = vec_ld(0, f); f4 = vec_ld(16, f); - + f256 = vec_ld(1024, f); f260 = vec_ld(1040, f); diff --git a/liba52/resample_mmx.c b/liba52/resample_mmx.c index 3cc05c3e14..a08a7a8b0c 100644 --- a/liba52/resample_mmx.c +++ b/liba52/resample_mmx.c @@ -22,11 +22,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* optimization TODO / NOTES - movntq is slightly faster (0.5% with the current test.c benchmark) - (but that is just test.c so that needs to be tested in reality) - and it would mean (C / MMX2 / MMX / 3DNOW) versions -*/ +/* optimization TODO / NOTES + * movntq is slightly faster (0.5% with the current test.c benchmark) + * (but that is just test.c so that needs to be tested in reality) + * and it would mean (C / MMX2 / MMX / 3DNOW) versions. + */ #include "a52_internal.h" @@ -165,7 +165,7 @@ static int a52_resample_3F_to_5_MMX(float * _f, int16_t * s16){ "packssdw %%mm3, %%mm2 \n\t" "movq %%mm0, 24(%0, %%"REG_D") \n\t" "movq %%mm2, 32(%0, %%"REG_D") \n\t" - + "add $16, %%"REG_S" \n\t" " jnz 1b \n\t" "emms \n\t" @@ -258,7 +258,7 @@ static int a52_resample_3F_2R_to_5_MMX(float * _f, int16_t * s16){ "movq %%mm0, (%0, %%"REG_D") \n\t" "movq %%mm2, 8(%0, %%"REG_D") \n\t" "movq %%mm4, 16(%0, %%"REG_D") \n\t" - + "movd 3080(%1, %%"REG_S"), %%mm0\n\t" "punpckldq 4104(%1, %%"REG_S"), %%mm0\n\t" "movd 1032(%1, %%"REG_S"), %%mm1\n\t" @@ -275,7 +275,7 @@ static int a52_resample_3F_2R_to_5_MMX(float * _f, int16_t * s16){ "packssdw %%mm3, %%mm2 \n\t" "movq %%mm0, 24(%0, %%"REG_D") \n\t" "movq %%mm2, 32(%0, %%"REG_D") \n\t" - + "add $16, %%"REG_S" \n\t" " jnz 1b \n\t" "emms \n\t" @@ -334,12 +334,12 @@ static int a52_resample_STEREO_LFE_to_6_MMX(float * _f, int16_t * s16){ "1: \n\t" "movq 1024(%1, %%"REG_S"), %%mm0\n\t" "movq 2048(%1, %%"REG_S"), %%mm1\n\t" - "movq (%1, %%"REG_S"), %%mm5 \n\t" + "movq (%1, %%"REG_S"), %%mm5 \n\t" "psubd %%mm7, %%mm0 \n\t" "psubd %%mm7, %%mm1 \n\t" "psubd %%mm7, %%mm5 \n\t" "lea (%%"REG_S", %%"REG_S", 2), %%"REG_D"\n\t" - + "pxor %%mm4, %%mm4 \n\t" "packssdw %%mm5, %%mm0 \n\t" // FfAa "packssdw %%mm4, %%mm1 \n\t" // 00Bb @@ -349,7 +349,7 @@ static int a52_resample_STEREO_LFE_to_6_MMX(float * _f, int16_t * s16){ "punpckldq %%mm4, %%mm3 \n\t" // f0XX "punpckldq %%mm6, %%mm0 \n\t" // 00ba "punpckhdq %%mm1, %%mm3 \n\t" // BAf0 - + "movq %%mm0, (%0, %%"REG_D") \n\t" // 00ba "punpckhdq %%mm4, %%mm0 \n\t" // F000 "movq %%mm3, 8(%0, %%"REG_D") \n\t" // BAf0 @@ -373,13 +373,13 @@ static int a52_resample_3F_LFE_to_6_MMX(float * _f, int16_t * s16){ "movq 1024(%1, %%"REG_S"), %%mm0\n\t" "movq 3072(%1, %%"REG_S"), %%mm1\n\t" "movq 2048(%1, %%"REG_S"), %%mm4\n\t" - "movq (%1, %%"REG_S"), %%mm5 \n\t" + "movq (%1, %%"REG_S"), %%mm5 \n\t" "psubd %%mm7, %%mm0 \n\t" "psubd %%mm7, %%mm1 \n\t" "psubd %%mm7, %%mm4 \n\t" "psubd %%mm7, %%mm5 \n\t" "lea (%%"REG_S", %%"REG_S", 2), %%"REG_D"\n\t" - + "packssdw %%mm4, %%mm0 \n\t" // EeAa "packssdw %%mm5, %%mm1 \n\t" // FfBb "movq %%mm0, %%mm2 \n\t" // EeAa @@ -388,7 +388,7 @@ static int a52_resample_3F_LFE_to_6_MMX(float * _f, int16_t * s16){ "movq %%mm0, %%mm1 \n\t" // BAba "punpckldq %%mm6, %%mm0 \n\t" // 00ba "punpckhdq %%mm1, %%mm1 \n\t" // BABA - + "movq %%mm0, (%0, %%"REG_D") \n\t" "punpckhdq %%mm2, %%mm0 \n\t" // FE00 "punpckldq %%mm1, %%mm2 \n\t" // BAfe @@ -414,14 +414,14 @@ static int a52_resample_2F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ "movq 2048(%1, %%"REG_S"), %%mm1\n\t" "movq 3072(%1, %%"REG_S"), %%mm2\n\t" "movq 4096(%1, %%"REG_S"), %%mm3\n\t" - "movq (%1, %%"REG_S"), %%mm5 \n\t" + "movq (%1, %%"REG_S"), %%mm5 \n\t" "psubd %%mm7, %%mm0 \n\t" "psubd %%mm7, %%mm1 \n\t" "psubd %%mm7, %%mm2 \n\t" "psubd %%mm7, %%mm3 \n\t" "psubd %%mm7, %%mm5 \n\t" "lea (%%"REG_S", %%"REG_S", 2), %%"REG_D"\n\t" - + "packssdw %%mm2, %%mm0 \n\t" // CcAa "packssdw %%mm3, %%mm1 \n\t" // DdBb "packssdw %%mm5, %%mm5 \n\t" // FfFf @@ -436,7 +436,7 @@ static int a52_resample_2F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ "punpckhdq %%mm1, %%mm1 \n\t" // BABA "punpckldq %%mm1, %%mm4 \n\t" // BAf0 "punpckhdq %%mm3, %%mm2 \n\t" // F0DC - + "movq %%mm0, (%0, %%"REG_D") \n\t" "movq %%mm4, 8(%0, %%"REG_D") \n\t" "movq %%mm2, 16(%0, %%"REG_D") \n\t" @@ -461,7 +461,7 @@ static int a52_resample_3F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ "movq 4096(%1, %%"REG_S"), %%mm2\n\t" "movq 5120(%1, %%"REG_S"), %%mm3\n\t" "movq 2048(%1, %%"REG_S"), %%mm4\n\t" - "movq (%1, %%"REG_S"), %%mm5 \n\t" + "movq (%1, %%"REG_S"), %%mm5 \n\t" "psubd %%mm7, %%mm0 \n\t" "psubd %%mm7, %%mm1 \n\t" "psubd %%mm7, %%mm2 \n\t" @@ -469,7 +469,7 @@ static int a52_resample_3F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ "psubd %%mm7, %%mm4 \n\t" "psubd %%mm7, %%mm5 \n\t" "lea (%%"REG_S", %%"REG_S", 2), %%"REG_D"\n\t" - + "packssdw %%mm2, %%mm0 \n\t" // CcAa "packssdw %%mm3, %%mm1 \n\t" // DdBb "packssdw %%mm4, %%mm4 \n\t" // EeEe @@ -484,7 +484,7 @@ static int a52_resample_3F_2R_LFE_to_6_MMX(float * _f, int16_t * s16){ "punpckhdq %%mm1, %%mm1 \n\t" // BABA "punpckldq %%mm1, %%mm4 \n\t" // BAfe "punpckhdq %%mm3, %%mm2 \n\t" // FEDC - + "movq %%mm0, (%0, %%"REG_D") \n\t" "movq %%mm4, 8(%0, %%"REG_D") \n\t" "movq %%mm2, 16(%0, %%"REG_D") \n\t" -- cgit v1.2.3