RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-24 12:22:25 +00:00
Code Issues Releases Wiki Activity

Refactor AltiVec macros as done for FFmpeg.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26027 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-02-18 23:32:17 +00:00
parent c7577cd703
commit 55001d69f2
2 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
liba52/imdct.c
View File

@ -383,11 +383,16 @@ void imdct_do_512 (sample_t * data, sample_t * delay, sample_t bias)
#define WORD_s3 0x1c,0x1d,0x1e,0x1f #define WORD_s3 0x1c,0x1d,0x1e,0x1f
#ifdef __APPLE_CC__ #ifdef __APPLE_CC__
#define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) #define AVV(x...) (x)
#else #else
#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} #define AVV(x...) {x}
#endif #endif
#define vcprm(a,b,c,d) (const vector unsigned char)AVV(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d)
#define vcii(a,b,c,d) (const vector float)AVV(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
#define FOUROF(a) AVV(a,a,a,a)
// vcprmle is used to keep the same index as in the SSE version. // vcprmle is used to keep the same index as in the SSE version.
// it's the same as vcprm, with the index inversed // it's the same as vcprm, with the index inversed
// ('le' is Little Endian) // ('le' is Little Endian)
@ -398,18 +403,6 @@ void imdct_do_512 (sample_t * data, sample_t * delay, sample_t bias)
#define FLOAT_n -1. #define FLOAT_n -1.
#define FLOAT_p 1. #define FLOAT_p 1.
#ifdef __APPLE_CC__
#define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
#else
#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d}
#endif
#ifdef __APPLE_CC__
#define FOUROF(a) (a)
#else
#define FOUROF(a) {a,a,a,a}
#endif
void void
imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias) imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias)

35
liba52/liba52_changes.diff
View File

@ -1428,9 +1428,9 @@
+} +}
+ +
+#endif // ARCH_X86 || ARCH_X86_64 +#endif // ARCH_X86 || ARCH_X86_64
--- liba52/imdct.c 2006-06-12 15:18:27.000000000 +0200 --- liba52/imdct.c 2008-02-19 00:18:33.000000000 +0100
+++ liba52/imdct.c 2006-06-12 19:18:39.000000000 +0200 +++ liba52/imdct.c 2008-02-19 00:16:40.000000000 +0100
@@ -26,6 +26,11 @@ @@ -22,6 +26,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@ -1542,7 +1542,7 @@
{ {
int i, k; int i, k;
sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2; sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2;
@@ -285,6 +365,714 @@ @@ -285,6 +365,707 @@
} }
} }
@ -1564,11 +1564,16 @@
+#define WORD_s3 0x1c,0x1d,0x1e,0x1f +#define WORD_s3 0x1c,0x1d,0x1e,0x1f
+ +
+#ifdef __APPLE_CC__ +#ifdef __APPLE_CC__
+#define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) +#define AVV(x...) (x)
+#else +#else
+#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} +#define AVV(x...) {x}
+#endif +#endif
+ +
+#define vcprm(a,b,c,d) (const vector unsigned char)AVV(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d)
+#define vcii(a,b,c,d) (const vector float)AVV(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
+
+#define FOUROF(a) AVV(a,a,a,a)
+
+// vcprmle is used to keep the same index as in the SSE version. +// vcprmle is used to keep the same index as in the SSE version.
+// it's the same as vcprm, with the index inversed +// it's the same as vcprm, with the index inversed
+// ('le' is Little Endian) +// ('le' is Little Endian)
@ -1579,18 +1584,6 @@
+#define FLOAT_n -1. +#define FLOAT_n -1.
+#define FLOAT_p 1. +#define FLOAT_p 1.
+ +
+#ifdef __APPLE_CC__
+#define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
+#else
+#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d}
+#endif
+
+#ifdef __APPLE_CC__
+#define FOUROF(a) (a)
+#else
+#define FOUROF(a) {a,a,a,a}
+#endif
+
+ +
+void +void
+imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias) +imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias)
@ -2257,7 +2250,7 @@
void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias) void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias)
{ {
int i, k; int i, k;
@@ -364,7 +1152,7 @@ @@ -364,7 +1145,7 @@
void a52_imdct_init (uint32_t mm_accel) void a52_imdct_init (uint32_t mm_accel)
{ {
@ -2266,7 +2259,7 @@
double sum; double sum;
/* compute imdct window - kaiser-bessel derived window, alpha = 5.0 */ /* compute imdct window - kaiser-bessel derived window, alpha = 5.0 */
@@ -416,6 +1204,99 @@ @@ -416,6 +1197,99 @@
post2[i].real = cos ((M_PI / 128) * (i + 0.5)); post2[i].real = cos ((M_PI / 128) * (i + 0.5));
post2[i].imag = sin ((M_PI / 128) * (i + 0.5)); post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
} }
@ -2366,7 +2359,7 @@
#ifdef LIBA52_DJBFFT #ifdef LIBA52_DJBFFT
if (mm_accel & MM_ACCEL_DJBFFT) { if (mm_accel & MM_ACCEL_DJBFFT) {
@@ -426,7 +1307,5 @@ @@ -426,7 +1300,5 @@
#endif #endif
{ {
fprintf (stderr, "No accelerated IMDCT transform found\n"); fprintf (stderr, "No accelerated IMDCT transform found\n");