virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Rong Yan
2014-11-07 09:07:29 +00:00
committed by Michael Niedermayer
parent 6a6c16cbcc
commit 79e0255956
1 changed files with 71 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
libavcodec/ppc/hpeldsp_altivec.c
View File

@@ -36,7 +36,6 @@
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
/* next one assumes that ((line_size % 16) == 0) */ /* next one assumes that ((line_size % 16) == 0) */
#if HAVE_VSX
void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
{ {
register vector unsigned char pixelsv1; register vector unsigned char pixelsv1;
@@ -55,74 +54,29 @@ void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t li
// -funroll-loops w/ this is bad - 74 cycles again. // -funroll-loops w/ this is bad - 74 cycles again.
// all this is on a 7450, tuning for the 7450 // all this is on a 7450, tuning for the 7450
for (i = 0; i < h; i += 4) { for (i = 0; i < h; i += 4) {
pixelsv1 = vec_vsx_ld( 0, pixels); pixelsv1 = unaligned_load( 0, pixels);
pixelsv1B = vec_vsx_ld(line_size, pixels); pixelsv1B = unaligned_load(line_size, pixels);
pixelsv1C = vec_vsx_ld(line_size_2, pixels); pixelsv1C = unaligned_load(line_size_2, pixels);
pixelsv1D = vec_vsx_ld(line_size_3, pixels); pixelsv1D = unaligned_load(line_size_3, pixels);
vec_vsx_st(pixelsv1, 0, (unsigned char*)block); VEC_ST(pixelsv1, 0, (unsigned char*)block);
vec_vsx_st(pixelsv1B, line_size, (unsigned char*)block); VEC_ST(pixelsv1B, line_size, (unsigned char*)block);
vec_vsx_st(pixelsv1C, line_size_2, (unsigned char*)block); VEC_ST(pixelsv1C, line_size_2, (unsigned char*)block);
vec_st(pixelsv1D, line_size_3, (unsigned char*)block); VEC_ST(pixelsv1D, line_size_3, (unsigned char*)block);
pixels+=line_size_4; pixels+=line_size_4;
block +=line_size_4; block +=line_size_4;
} }
} }
#else
void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
{
register vector unsigned char pixelsv1, pixelsv2;
register vector unsigned char pixelsv1B, pixelsv2B;
register vector unsigned char pixelsv1C, pixelsv2C;
register vector unsigned char pixelsv1D, pixelsv2D;
register vector unsigned char perm = vec_lvsl(0, pixels);
int i;
register ptrdiff_t line_size_2 = line_size << 1;
register ptrdiff_t line_size_3 = line_size + line_size_2;
register ptrdiff_t line_size_4 = line_size << 2;
// hand-unrolling the loop by 4 gains about 15%
// mininum execution time goes from 74 to 60 cycles
// it's faster than -funroll-loops, but using
// -funroll-loops w/ this is bad - 74 cycles again.
// all this is on a 7450, tuning for the 7450
for (i = 0; i < h; i += 4) {
pixelsv1 = vec_ld( 0, pixels);
pixelsv2 = vec_ld(15, pixels);
pixelsv1B = vec_ld(line_size, pixels);
pixelsv2B = vec_ld(15 + line_size, pixels);
pixelsv1C = vec_ld(line_size_2, pixels);
pixelsv2C = vec_ld(15 + line_size_2, pixels);
pixelsv1D = vec_ld(line_size_3, pixels);
pixelsv2D = vec_ld(15 + line_size_3, pixels);
vec_st(vec_perm(pixelsv1, pixelsv2, perm),
0, (unsigned char*)block);
vec_st(vec_perm(pixelsv1B, pixelsv2B, perm),
line_size, (unsigned char*)block);
vec_st(vec_perm(pixelsv1C, pixelsv2C, perm),
line_size_2, (unsigned char*)block);
vec_st(vec_perm(pixelsv1D, pixelsv2D, perm),
line_size_3, (unsigned char*)block);
pixels+=line_size_4;
block +=line_size_4;
}
}
#endif /* HAVE_VSX */
/* next one assumes that ((line_size % 16) == 0) */ /* next one assumes that ((line_size % 16) == 0) */
#define op_avg(a,b) a = ( ((a)|(b)) - ((((a)^(b))&0xFEFEFEFEUL)>>1) ) #define op_avg(a,b) a = ( ((a)|(b)) - ((((a)^(b))&0xFEFEFEFEUL)>>1) )
void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
{ {
register vector unsigned char pixelsv1, pixelsv2, pixelsv, blockv; register vector unsigned char pixelsv, blockv;
register vector unsigned char perm = vec_lvsl(0, pixels);
int i;
int i;
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
pixelsv1 = vec_ld( 0, pixels);
pixelsv2 = vec_ld(16,pixels);
blockv = vec_ld(0, block); blockv = vec_ld(0, block);
pixelsv = vec_perm(pixelsv1, pixelsv2, perm); pixelsv = VEC_LD( 0, pixels);
blockv = vec_avg(blockv,pixelsv); blockv = vec_avg(blockv,pixelsv);
vec_st(blockv, 0, (unsigned char*)block); vec_st(blockv, 0, (unsigned char*)block);
pixels+=line_size; pixels+=line_size;
@@ -142,9 +96,7 @@ static void avg_pixels8_altivec(uint8_t * block, const uint8_t * pixels, ptrdiff
int rightside = ((unsigned long)block & 0x0000000F); int rightside = ((unsigned long)block & 0x0000000F);
blockv = vec_ld(0, block); blockv = vec_ld(0, block);
pixelsv1 = vec_ld( 0, pixels); pixelsv = VEC_LD( 0, pixels);
pixelsv2 = vec_ld(16, pixels);
pixelsv = vec_perm(pixelsv1, pixelsv2, vec_lvsl(0, pixels));
if (rightside) { if (rightside) {
pixelsv = vec_perm(blockv, pixelsv, vcprm(0,1,s0,s1)); pixelsv = vec_perm(blockv, pixelsv, vcprm(0,1,s0,s1));
@@ -166,21 +118,16 @@ static void put_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
{ {
register int i; register int i;
register vector unsigned char pixelsv1, pixelsv2, pixelsavg; register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
register vector unsigned char blockv, temp1, temp2; register vector unsigned char blockv;
register vector unsigned short pixelssum1, pixelssum2, temp3; register vector unsigned short pixelssum1, pixelssum2, temp3;
register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
temp1 = vec_ld(0, pixels); pixelsv1 = VEC_LD(0, pixels);
temp2 = vec_ld(16, pixels); pixelsv2 = VEC_LD(1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels)); pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) { pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
}
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelssum1 = vec_add((vector unsigned short)pixelsv1, pixelssum1 = vec_add((vector unsigned short)pixelsv1,
(vector unsigned short)pixelsv2); (vector unsigned short)pixelsv2);
pixelssum1 = vec_add(pixelssum1, vctwo); pixelssum1 = vec_add(pixelssum1, vctwo);
@@ -189,17 +136,10 @@ static void put_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
int rightside = ((unsigned long)block & 0x0000000F); int rightside = ((unsigned long)block & 0x0000000F);
blockv = vec_ld(0, block); blockv = vec_ld(0, block);
temp1 = vec_ld(line_size, pixels); pixelsv1 = unaligned_load(line_size, pixels);
temp2 = vec_ld(line_size + 16, pixels); pixelsv2 = unaligned_load(line_size+1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels)); pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) { pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
}
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelssum2 = vec_add((vector unsigned short)pixelsv1, pixelssum2 = vec_add((vector unsigned short)pixelsv1,
(vector unsigned short)pixelsv2); (vector unsigned short)pixelsv2);
temp3 = vec_add(pixelssum1, pixelssum2); temp3 = vec_add(pixelssum1, pixelssum2);
@@ -225,22 +165,16 @@ static void put_no_rnd_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels
{ {
register int i; register int i;
register vector unsigned char pixelsv1, pixelsv2, pixelsavg; register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
register vector unsigned char blockv, temp1, temp2; register vector unsigned char blockv;
register vector unsigned short pixelssum1, pixelssum2, temp3; register vector unsigned short pixelssum1, pixelssum2, temp3;
register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1); register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
temp1 = vec_ld(0, pixels); pixelsv1 = VEC_LD(0, pixels);
temp2 = vec_ld(16, pixels); pixelsv2 = VEC_LD(1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels)); pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) { pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
}
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelssum1 = vec_add((vector unsigned short)pixelsv1, pixelssum1 = vec_add((vector unsigned short)pixelsv1,
(vector unsigned short)pixelsv2); (vector unsigned short)pixelsv2);
pixelssum1 = vec_add(pixelssum1, vcone); pixelssum1 = vec_add(pixelssum1, vcone);
@@ -249,17 +183,10 @@ static void put_no_rnd_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels
int rightside = ((unsigned long)block & 0x0000000F); int rightside = ((unsigned long)block & 0x0000000F);
blockv = vec_ld(0, block); blockv = vec_ld(0, block);
temp1 = vec_ld(line_size, pixels); pixelsv1 = unaligned_load(line_size, pixels);
temp2 = vec_ld(line_size + 16, pixels); pixelsv2 = unaligned_load(line_size+1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels)); pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) { pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
}
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelssum2 = vec_add((vector unsigned short)pixelsv1, pixelssum2 = vec_add((vector unsigned short)pixelsv1,
(vector unsigned short)pixelsv2); (vector unsigned short)pixelsv2);
temp3 = vec_add(pixelssum1, pixelssum2); temp3 = vec_add(pixelssum1, pixelssum2);
@@ -285,24 +212,18 @@ static void put_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pixels, pt
{ {
register int i; register int i;
register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4; register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4;
register vector unsigned char blockv, temp1, temp2; register vector unsigned char blockv;
register vector unsigned short temp3, temp4, register vector unsigned short temp3, temp4,
pixelssum1, pixelssum2, pixelssum3, pixelssum4; pixelssum1, pixelssum2, pixelssum3, pixelssum4;
register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
temp1 = vec_ld(0, pixels); pixelsv1 = VEC_LD(0, pixels);
temp2 = vec_ld(16, pixels); pixelsv2 = VEC_LD(1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels)); pixelsv3 = VEC_MERGEL(vczero, pixelsv1);
if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) { pixelsv4 = VEC_MERGEL(vczero, pixelsv2);
pixelsv2 = temp2; pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
} else { pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
}
pixelsv3 = vec_mergel(vczero, pixelsv1);
pixelsv4 = vec_mergel(vczero, pixelsv2);
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelssum3 = vec_add((vector unsigned short)pixelsv3, pixelssum3 = vec_add((vector unsigned short)pixelsv3,
(vector unsigned short)pixelsv4); (vector unsigned short)pixelsv4);
pixelssum3 = vec_add(pixelssum3, vctwo); pixelssum3 = vec_add(pixelssum3, vctwo);
@@ -313,20 +234,13 @@ static void put_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pixels, pt
for (i = 0; i < h ; i++) { for (i = 0; i < h ; i++) {
blockv = vec_ld(0, block); blockv = vec_ld(0, block);
temp1 = vec_ld(line_size, pixels); pixelsv1 = unaligned_load(line_size, pixels);
temp2 = vec_ld(line_size + 16, pixels); pixelsv2 = unaligned_load(line_size+1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
}
pixelsv3 = vec_mergel(vczero, pixelsv1);
pixelsv4 = vec_mergel(vczero, pixelsv2);
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelsv3 = VEC_MERGEL(vczero, pixelsv1);
pixelsv4 = VEC_MERGEL(vczero, pixelsv2);
pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelssum4 = vec_add((vector unsigned short)pixelsv3, pixelssum4 = vec_add((vector unsigned short)pixelsv3,
(vector unsigned short)pixelsv4); (vector unsigned short)pixelsv4);
pixelssum2 = vec_add((vector unsigned short)pixelsv1, pixelssum2 = vec_add((vector unsigned short)pixelsv1,
@@ -353,25 +267,19 @@ static void put_no_rnd_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pix
{ {
register int i; register int i;
register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4; register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4;
register vector unsigned char blockv, temp1, temp2; register vector unsigned char blockv;
register vector unsigned short temp3, temp4, register vector unsigned short temp3, temp4,
pixelssum1, pixelssum2, pixelssum3, pixelssum4; pixelssum1, pixelssum2, pixelssum3, pixelssum4;
register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1); register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
temp1 = vec_ld(0, pixels); pixelsv1 = VEC_LD(0, pixels);
temp2 = vec_ld(16, pixels); pixelsv2 = VEC_LD(1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels)); pixelsv3 = VEC_MERGEL(vczero, pixelsv1);
if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) { pixelsv4 = VEC_MERGEL(vczero, pixelsv2);
pixelsv2 = temp2; pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
} else { pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
}
pixelsv3 = vec_mergel(vczero, pixelsv1);
pixelsv4 = vec_mergel(vczero, pixelsv2);
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelssum3 = vec_add((vector unsigned short)pixelsv3, pixelssum3 = vec_add((vector unsigned short)pixelsv3,
(vector unsigned short)pixelsv4); (vector unsigned short)pixelsv4);
pixelssum3 = vec_add(pixelssum3, vcone); pixelssum3 = vec_add(pixelssum3, vcone);
@@ -380,22 +288,13 @@ static void put_no_rnd_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pix
pixelssum1 = vec_add(pixelssum1, vcone); pixelssum1 = vec_add(pixelssum1, vcone);
for (i = 0; i < h ; i++) { for (i = 0; i < h ; i++) {
blockv = vec_ld(0, block); pixelsv1 = unaligned_load(line_size, pixels);
pixelsv2 = unaligned_load(line_size+1, pixels);
temp1 = vec_ld(line_size, pixels);
temp2 = vec_ld(line_size + 16, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
}
pixelsv3 = vec_mergel(vczero, pixelsv1);
pixelsv4 = vec_mergel(vczero, pixelsv2);
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelsv3 = VEC_MERGEL(vczero, pixelsv1);
pixelsv4 = VEC_MERGEL(vczero, pixelsv2);
pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelssum4 = vec_add((vector unsigned short)pixelsv3, pixelssum4 = vec_add((vector unsigned short)pixelsv3,
(vector unsigned short)pixelsv4); (vector unsigned short)pixelsv4);
pixelssum2 = vec_add((vector unsigned short)pixelsv1, pixelssum2 = vec_add((vector unsigned short)pixelsv1,
@@ -410,7 +309,7 @@ static void put_no_rnd_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pix
blockv = vec_packsu(temp3, temp4); blockv = vec_packsu(temp3, temp4);
vec_st(blockv, 0, block); VEC_ST(blockv, 0, block);
block += line_size; block += line_size;
pixels += line_size; pixels += line_size;
@@ -422,7 +321,7 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
{ {
register int i; register int i;
register vector unsigned char pixelsv1, pixelsv2, pixelsavg; register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
register vector unsigned char blockv, temp1, temp2, blocktemp; register vector unsigned char blockv, blocktemp;
register vector unsigned short pixelssum1, pixelssum2, temp3; register vector unsigned short pixelssum1, pixelssum2, temp3;
register const vector unsigned char vczero = (const vector unsigned char) register const vector unsigned char vczero = (const vector unsigned char)
@@ -430,16 +329,10 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
register const vector unsigned short vctwo = (const vector unsigned short) register const vector unsigned short vctwo = (const vector unsigned short)
vec_splat_u16(2); vec_splat_u16(2);
temp1 = vec_ld(0, pixels); pixelsv1 = VEC_LD(0, pixels);
temp2 = vec_ld(16, pixels); pixelsv2 = VEC_LD(1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels)); pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) { pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
}
pixelsv1 = vec_mergeh(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2);
pixelssum1 = vec_add((vector unsigned short)pixelsv1, pixelssum1 = vec_add((vector unsigned short)pixelsv1,
(vector unsigned short)pixelsv2); (vector unsigned short)pixelsv2);
pixelssum1 = vec_add(pixelssum1, vctwo); pixelssum1 = vec_add(pixelssum1, vctwo);
@@ -448,17 +341,11 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
int rightside = ((unsigned long)block & 0x0000000F); int rightside = ((unsigned long)block & 0x0000000F);
blockv = vec_ld(0, block); blockv = vec_ld(0, block);
temp1 = vec_ld(line_size, pixels); pixelsv1 = unaligned_load(line_size, pixels);
temp2 = vec_ld(line_size + 16, pixels); pixelsv2 = unaligned_load(line_size+1, pixels);
pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
pixelsv2 = temp2;
} else {
pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
}
pixelsv1 = vec_mergeh(vczero, pixelsv1); pixelsv1 = VEC_MERGEH(vczero, pixelsv1);
pixelsv2 = vec_mergeh(vczero, pixelsv2); pixelsv2 = VEC_MERGEH(vczero, pixelsv2);
pixelssum2 = vec_add((vector unsigned short)pixelsv1, pixelssum2 = vec_add((vector unsigned short)pixelsv1,
(vector unsigned short)pixelsv2); (vector unsigned short)pixelsv2);
temp3 = vec_add(pixelssum1, pixelssum2); temp3 = vec_add(pixelssum1, pixelssum2);