WebSVN – Kolibri OS – Diff – /programs/develop/libraries/libmpg123/optimize.c

 #define dn_3DNowExt "3DNowExt"
 #define dn_AltiVec "AltiVec"
 #define dn_SSE "SSE"
 #define dn_x86_64 "x86-64"
 #define dn_ARM "ARM"
+#define dn_NEON "NEON"
 static const char* decname[] =
+{
 	"auto"
-	, dn_generic, dn_generic_dither, dn_i386, dn_i486, dn_i586, dn_i586_dither, dn_MMX, dn_3DNow, dn_3DNowExt, dn_AltiVec, dn_SSE, dn_x86_64, dn_ARM
+	, dn_generic, dn_generic_dither, dn_i386, dn_i486, dn_i586, dn_i586_dither, dn_MMX, dn_3DNow, dn_3DNowExt, dn_AltiVec, dn_SSE, dn_x86_64, dn_ARM, dn_NEON
 	, "nodec"
 };
 #if (defined OPT_X86) && (defined OPT_MULTI)
 #include "getcpuflags.h"
-struct cpuflags cpu_flags;
+static struct cpuflags cpu_flags;
 #else
 /* Faking stuff for non-multi builds. The same code for synth function choice is used.
    Just no runtime dependency of result... */
-char cpu_flags;
+#define cpu_flags nothing
 #define cpu_i586(s)     1
 #define cpu_fpu(s)      1
 #define cpu_mmx(s)      1
 #define cpu_3dnow(s)    1
 #	define OUT_SYNTHS(synth_16, synth_8, synth_real, synth_32) { synth_16, IF8(synth_8) IFREAL(synth_real) IF32(synth_32) }
 #else
 #	define OUT_SYNTHS(synth_16, synth_8, synth_real, synth_32) { IF8(synth_8) IFREAL(synth_real) IF32(synth_32) }
 #endif
+/* The call of left and right plain synth, wrapped.
+   This may be replaced by a direct stereo optimized synth. */
+static int synth_stereo_wrap(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr)
+{
+	int clip;
+	clip  = (fr->synth)(bandPtr_l, 0, fr, 0);
+	clip += (fr->synth)(bandPtr_r, 1, fr, 1);
+	return clip;
+}
-const struct synth_s synth_base =
+static const struct synth_s synth_base =
+{
 	{ /* plain */
 		 OUT_SYNTHS(synth_1to1, synth_1to1_8bit, synth_1to1_real, synth_1to1_s32)
 #		ifndef NO_DOWNSAMPLE
 #		ifndef NO_NTOM
 		,OUT_SYNTHS(synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap, synth_stereo_wrap)
 #		endif
 	},
 	{ /* mono2stereo */
-		 OUT_SYNTHS(synth_1to1_mono2stereo, synth_1to1_8bit_mono2stereo, synth_1to1_real_mono2stereo, synth_1to1_s32_mono2stereo)
+		 OUT_SYNTHS(synth_1to1_m2s, synth_1to1_8bit_m2s, synth_1to1_real_m2s, synth_1to1_s32_m2s)
 #		ifndef NO_DOWNSAMPLE
-		,OUT_SYNTHS(synth_2to1_mono2stereo, synth_2to1_8bit_mono2stereo, synth_2to1_real_mono2stereo, synth_2to1_s32_mono2stereo)
+		,OUT_SYNTHS(synth_2to1_m2s, synth_2to1_8bit_m2s, synth_2to1_real_m2s, synth_2to1_s32_m2s)
-		,OUT_SYNTHS(synth_4to1_mono2stereo, synth_4to1_8bit_mono2stereo, synth_4to1_real_mono2stereo, synth_4to1_s32_mono2stereo)
+		,OUT_SYNTHS(synth_4to1_m2s, synth_4to1_8bit_m2s, synth_4to1_real_m2s, synth_4to1_s32_m2s)
 #		endif
 #		ifndef NO_NTOM
-		,OUT_SYNTHS(synth_ntom_mono2stereo, synth_ntom_8bit_mono2stereo, synth_ntom_real_mono2stereo, synth_ntom_s32_mono2stereo)
+		,OUT_SYNTHS(synth_ntom_m2s, synth_ntom_8bit_m2s, synth_ntom_real_m2s, synth_ntom_s32_m2s)
 #		endif
 	},
 	{ /* mono*/
 		 OUT_SYNTHS(synth_1to1_mono, synth_1to1_8bit_mono, synth_1to1_real_mono, synth_1to1_s32_mono)
 #		ifndef NO_DOWNSAMPLE
 enum optdec defdec(void){ return defopt; }
 enum optcla decclass(const enum optdec type)
+{
-	return (type == mmx || type == sse || type == dreidnowext || type == x86_64 ) ? mmxsse : normal;
+	return (type == mmx || type == sse || type == dreidnowext || type == x86_64  || type == neon) ? mmxsse : normal;
+}
 	else if(basic_synth == synth_1to1_x86_64) type = x86_64;
 #endif
 #ifdef OPT_ARM
 	else if(basic_synth == synth_1to1_arm) type = arm;
 #endif
+#ifdef OPT_NEON
+	else if(basic_synth == synth_1to1_neon) type = neon;
+#endif
 #ifdef OPT_GENERIC_DITHER
 	else if(basic_synth == synth_1to1_dither) type = generic_dither;
 #endif
 #ifdef OPT_DITHER /* either i586 or generic! */
 #ifndef NO_DOWNSAMPLE
 	else if(basic_synth == synth_1to1_real_x86_64) type = x86_64;
 #endif
 #ifdef OPT_ALTIVEC
 	else if(basic_synth == synth_1to1_real_altivec) type = altivec;
 #endif
+#ifdef OPT_NEON
+	else if(basic_synth == synth_1to1_real_neon) type = neon;
+#endif
 #endif /* real */
 	else if(basic_synth == synth_1to1_s32_x86_64) type = x86_64;
 #endif
 #ifdef OPT_ALTIVEC
 	else if(basic_synth == synth_1to1_s32_altivec) type = altivec;
 #endif
+#ifdef OPT_NEON
+	else if(basic_synth == synth_1to1_s32_neon) type = neon;
+#endif
 #endif /* 32bit */
 #ifdef OPT_X86
 	else if(find_synth(basic_synth, plain_i386))
 #ifndef NO_REAL
 	else if(fr->af.encoding & MPG123_ENC_FLOAT)
 	basic_format = f_real;
 #endif
 #ifndef NO_32BIT
+	/* 24 bit integer means decoding to 32 bit first. */
-	else if(fr->af.encoding & MPG123_ENC_32)
+	else if(fr->af.encoding & MPG123_ENC_32 || fr->af.encoding & MPG123_ENC_24)
 	basic_format = f_32;
 #endif
 	/* Make sure the chosen format is compiled into this lib. */
 	   && basic_format != f_32
 #	endif
 #	ifdef ACCURATE_ROUNDING
 	   && fr->cpu_opts.type != sse
 	   && fr->cpu_opts.type != x86_64
+	   && fr->cpu_opts.type != neon
 #	endif
+	  )
+	{
 #ifndef NO_LAYER3
 		init_layer3_stuff(fr, init_layer3_gainpow2_mmx);
 	fr->cpu_opts.type = nodec;
 	/* covers any i386+ cpu; they actually differ only in the synth_1to1 function, mostly... */
+#ifdef OPT_X86
 #ifdef OPT_X86
 #ifdef OPT_MULTI
 #ifndef NO_LAYER3
+#if (defined OPT_3DNOW || defined OPT_3DNOWEXT)
-#if (defined OPT_3DNOW || defined OPT_3DNOWEXT)
+	fr->cpu_opts.the_dct36 = dct36;
-	fr->cpu_opts.dct36 = dct36;
+#endif
 #endif
 #endif
 		   && cpu_3dnowext(cpu_flags)
 		   && cpu_mmx(cpu_flags) )
+		{
 			chosen = "3DNowExt";
 			fr->cpu_opts.type = dreidnowext;
+#ifdef OPT_MULTI
 #			ifndef NO_LAYER3
+/* The DCT36 is _bad_, at least compared to gcc 4.4-built C code. */
-			fr->cpu_opts.dct36 = dct36_3dnowext;
+/*			fr->cpu_opts.the_dct36 = dct36_3dnowext; */
+#			endif
-#			endif
+#endif
 #			ifndef NO_16BIT
 			fr->synths.plain[r_1to1][f_16] = synth_1to1_3dnowext;
 #			endif
 			done = 1;
 		if(    !done && (auto_choose || want_dec == dreidnow)
 		    && cpu_3dnow(cpu_flags) && cpu_mmx(cpu_flags) )
+		{
 			chosen = "3DNow";
 			fr->cpu_opts.type = dreidnow;
+#ifdef OPT_MULTI
 #			ifndef NO_LAYER3
+/* The DCT36 is _bad_, at least compared to gcc 4.4-built C code. */
-			fr->cpu_opts.dct36 = dct36_3dnow;
+/*			fr->cpu_opts.the_dct36 = dct36_3dnow; */
+#			endif
-#			endif
+#endif
 #			ifndef NO_16BIT
 			fr->synths.plain[r_1to1][f_16] = synth_1to1_3dnow;
 #			endif
 			done = 1;
 #		ifndef NO_16BIT /* possibility to use a 16->8 wrapper... */
 		if(fr->synths.plain[r_1to1][f_16] != synth_base.plain[r_1to1][f_16])
+		{
 			fr->synths.plain[r_1to1][f_8] = synth_1to1_8bit_wrap;
 			fr->synths.mono[r_1to1][f_8] = synth_1to1_8bit_wrap_mono;
-			fr->synths.mono2stereo[r_1to1][f_8] = synth_1to1_8bit_wrap_mono2stereo;
+			fr->synths.mono2stereo[r_1to1][f_8] = synth_1to1_8bit_wrap_m2s;
+		}
 #		endif
 #		endif
 		for(ri=0; ri
 		for(fi=0; fi
 #		endif
 		done = 1;
+	}
 #	endif
+#	ifdef OPT_NEON
+	if(!done && (auto_choose || want_dec == neon))
+	{
+		chosen = "NEON";
+		fr->cpu_opts.type = neon;
+#		ifndef NO_16BIT
+		fr->synths.plain[r_1to1][f_16] = synth_1to1_neon;
+		fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_neon;
+#		endif
+#		ifndef NO_REAL
+		fr->synths.plain[r_1to1][f_real] = synth_1to1_real_neon;
+		fr->synths.stereo[r_1to1][f_real] = synth_1to1_real_stereo_neon;
+#		endif
+#		ifndef NO_32BIT
+		fr->synths.plain[r_1to1][f_32] = synth_1to1_s32_neon;
+		fr->synths.stereo[r_1to1][f_32] = synth_1to1_s32_stereo_neon;
+#		endif
+		done = 1;
+	}
+#	endif
 #	ifdef OPT_ARM
 	if(!done && (auto_choose || want_dec == arm))
+	{
 		chosen = "ARM";
 	     && fr->cpu_opts.type != generic_dither
 	     && fr->synths.plain[r_1to1][f_16] != synth_base.plain[r_1to1][f_16] )
+	{
 		fr->synths.plain[r_1to1][f_8] = synth_1to1_8bit_wrap;
 		fr->synths.mono[r_1to1][f_8] = synth_1to1_8bit_wrap_mono;
-		fr->synths.mono2stereo[r_1to1][f_8] = synth_1to1_8bit_wrap_mono2stereo;
+		fr->synths.mono2stereo[r_1to1][f_8] = synth_1to1_8bit_wrap_m2s;
+	}
 #	endif
 #	endif
 	NULL,
 	#endif
 	#ifdef OPT_ARM
 	NULL,
 	#endif
+	#ifdef OPT_NEON
+	NULL,
+	#endif
 	#ifdef OPT_GENERIC_FLOAT
 	NULL,
 	#endif
 #	ifdef OPT_GENERIC
 	NULL,
 	dn_x86_64,
 	#endif
 	#ifdef OPT_ARM
 	dn_ARM,
 	#endif
+	#ifdef OPT_NEON
+	dn_NEON,
+	#endif
 	#ifdef OPT_GENERIC
 	dn_generic,
 	#endif
 	#ifdef OPT_GENERIC_DITHER
 	dn_generic_dither,
 	*(d++) = decname[x86_64];
 #endif
 #ifdef OPT_ARM
 	*(d++) = decname[arm];
 #endif
+#ifdef OPT_NEON
+	*(d++) = decname[neon];
+#endif
 #ifdef OPT_GENERIC
 	*(d++) = decname[generic];
 #endif
 #ifdef OPT_GENERIC_DITHER
 	*(d++) = decname[generic_dither];
 	if(mh == NULL) return NULL;
 	return decname[mh->cpu_opts.type];
 }
-const char attribute_align_arg **mpg123_decoders(){ return mpg123_decoder_list; }
+const char attribute_align_arg **mpg123_decoders(void){ return mpg123_decoder_list; }
-const char attribute_align_arg **mpg123_supported_decoders()
+const char attribute_align_arg **mpg123_supported_decoders(void)
+{
 #ifdef OPT_MULTI
 	return mpg123_supported_decoder_list;

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libmpg123/optimize.c – Rev 1905 → 3960