Nicolas Chauvet
15 years ago
parent
a3b4d36f78
commit
f777f2f034
@ -1,30 +0,0 @@
|
|||||||
diff -up x264-20090319/common/ppc/pixel.c.ppc x264-20090319/common/ppc/pixel.c
|
|
||||||
--- x264-20090319/common/ppc/pixel.c.ppc 2009-03-26 21:12:11.000000000 +0100
|
|
||||||
+++ x264-20090319/common/ppc/pixel.c 2009-03-26 23:14:50.000000000 +0100
|
|
||||||
@@ -1865,7 +1865,7 @@ static int pixel_sa8d_16x16_altivec( uin
|
|
||||||
|
|
||||||
#define VEC_LOAD_HIGH( p, num ) \
|
|
||||||
vec_u8_t pix8_##num = vec_ld( stride*num, p ); \
|
|
||||||
- vec_s16_t pix16_s##num = vec_perm(pix8_##num, zero_u8v, perm); \
|
|
||||||
+ vec_s16_t pix16_s##num = (vec_s16_t)vec_perm(pix8_##num, zero_u8v, perm); \
|
|
||||||
vec_s16_t pix16_d##num;
|
|
||||||
|
|
||||||
static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix, int stride, const vec_u8_t perm )
|
|
||||||
@@ -1905,7 +1905,7 @@ static uint64_t pixel_hadamard_ac_altive
|
|
||||||
vec_u16_t addabs67 = vec_add( VEC_ABSOLUTE(pix16_d6), VEC_ABSOLUTE(pix16_d7) );
|
|
||||||
|
|
||||||
vec_u16_t sum4_v = vec_add(vec_add(addabs01, addabs23), vec_add(addabs45, addabs67));
|
|
||||||
- vec_ste(vec_sums(vec_sum4s(sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
|
|
||||||
+ vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
|
|
||||||
|
|
||||||
vec_s16_t tmpi0 = vec_add(pix16_d0, pix16_d4);
|
|
||||||
vec_s16_t tmpi4 = vec_sub(pix16_d0, pix16_d4);
|
|
||||||
@@ -1933,7 +1933,7 @@ static uint64_t pixel_hadamard_ac_altive
|
|
||||||
VEC_ABSOLUTE( vec_sub(pix16_d3, pix16_d7) ) );
|
|
||||||
|
|
||||||
vec_u16_t sum8_v = vec_add( vec_add(addsum04, addsum15), vec_add(addsum26, addsum37) );
|
|
||||||
- vec_ste(vec_sums( vec_sum4s(sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
|
|
||||||
+ vec_ste(vec_sums( vec_sum4s((vec_s16_t)sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
|
|
||||||
|
|
||||||
int sum8 = sum8_tab[3];
|
|
||||||
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
diff -up x264-20090310/configure.r x264-20090310/configure
|
|
||||||
--- x264-20090310/configure.r 2009-03-10 23:48:14.000000000 +0100
|
|
||||||
+++ x264-20090310/configure 2009-03-11 01:40:31.000000000 +0100
|
|
||||||
@@ -42,7 +42,7 @@ as_check() {
|
|
||||||
return $TMP
|
|
||||||
}
|
|
||||||
|
|
||||||
-rm -f config.h config.mak x264.pc conftest*
|
|
||||||
+rm -f config.mak x264.pc conftest*
|
|
||||||
|
|
||||||
prefix='/usr/local'
|
|
||||||
exec_prefix='${prefix}'
|
|
||||||
@@ -236,6 +236,7 @@ case $host_cpu in
|
|
||||||
ARCH="X86"
|
|
||||||
AS="yasm"
|
|
||||||
ASFLAGS="$ASFLAGS -O2"
|
|
||||||
+ LDFLAGS="$LDFLAGS -m32"
|
|
||||||
if [ "$SYS" = MACOSX ]; then
|
|
||||||
ASFLAGS="$ASFLAGS -f macho -DPREFIX"
|
|
||||||
elif [ "$SYS" = MINGW ]; then
|
|
||||||
@@ -466,8 +471,6 @@ if [ "$shared" = "yes" ]; then
|
|
||||||
echo 'default: $(SONAME)' >> config.mak
|
|
||||||
fi
|
|
||||||
|
|
||||||
-./version.sh
|
|
||||||
-
|
|
||||||
pclibs="-L$libdir -lx264 $libpthread"
|
|
||||||
|
|
||||||
cat > x264.pc << EOF
|
|
||||||
diff -up x264-20090310/Makefile.r x264-20090310/Makefile
|
|
||||||
--- x264-20090310/Makefile.r 2009-03-10 23:48:14.000000000 +0100
|
|
||||||
+++ x264-20090310/Makefile 2009-03-11 01:39:35.000000000 +0100
|
|
||||||
@@ -77,14 +77,25 @@ libx264.a: .depend $(OBJS) $(OBJASM)
|
|
||||||
$(AR) rc libx264.a $(OBJS) $(OBJASM)
|
|
||||||
$(RANLIB) libx264.a
|
|
||||||
|
|
||||||
+libx264.so: $(SONAME)
|
|
||||||
+ ln -sf $(SONAME) libx264.$(SOSUFFIX)
|
|
||||||
+
|
|
||||||
$(SONAME): .depend $(OBJS) $(OBJASM)
|
|
||||||
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
|
|
||||||
|
|
||||||
+ifeq ($(SONAME),)
|
|
||||||
x264$(EXE): $(OBJCLI) libx264.a
|
|
||||||
$(CC) -o $@ $+ $(LDFLAGS)
|
|
||||||
|
|
||||||
checkasm: tools/checkasm.o libx264.a
|
|
||||||
$(CC) -o $@ $+ $(LDFLAGS)
|
|
||||||
+else
|
|
||||||
+x264$(EXE): $(OBJCLI) libx264.so
|
|
||||||
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
|
|
||||||
+
|
|
||||||
+checkasm: tools/checkasm.o $(SONAME)
|
|
||||||
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
|
|
||||||
+endif
|
|
||||||
|
|
||||||
%.o: %.asm
|
|
||||||
$(AS) $(ASFLAGS) -o $@ $<
|
|
||||||
@@ -147,10 +158,12 @@ install: x264$(EXE) $(SONAME)
|
|
||||||
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
|
|
||||||
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
|
|
||||||
install -m 644 x264.h $(DESTDIR)$(includedir)
|
|
||||||
+ifeq ($(SONAME),)
|
|
||||||
install -m 644 libx264.a $(DESTDIR)$(libdir)
|
|
||||||
+ $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
|
|
||||||
+endif
|
|
||||||
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
|
|
||||||
install x264$(EXE) $(DESTDIR)$(bindir)
|
|
||||||
- $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
|
|
||||||
ifeq ($(SYS),MINGW)
|
|
||||||
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
|
|
||||||
else
|
|
||||||
Loading…
Reference in new issue