+++ /dev/null
---- avidemux/ADM_colorspace/yv12rgb_altivec.cpp.bak 2006-01-07 23:37:35.000000000 -0500
-+++ avidemux/ADM_colorspace/yv12rgb_altivec.cpp 2006-01-07 23:38:46.000000000 -0500
-@@ -53,9 +53,9 @@
- #define vecbyte vector unsigned char
- #define vecshort vector unsigned short
-
--uint8_t altivecYV12RGB(uint8_t * ptr_y,
-+void altivecYV12RGB(uint8_t * ptr_y,
- uint8_t * ptr_u,
-- uint8_t * ptr_v, uint8_t * ptr2, uint32_t w);
-+ uint8_t * ptr_v, uint8_t * ptr2, int w);
-
- // A pack of constant vectors we will use later
- // we more or less rely on gcc to have good register allocation
-@@ -78,9 +78,9 @@
- // We handle 8 pixels at a time
- // My first altivec code :)
- //____________________________________
--uint8_t altivecYV12RGB(uint8_t * ptr_y,
-+void altivecYV12RGB(uint8_t * ptr_y,
- uint8_t * ptr_u,
-- uint8_t * ptr_v, uint8_t * ptr2, uint32_t w)
-+ uint8_t * ptr_v, uint8_t * ptr2, int w)
- {
-
- vector unsigned char y,y2,u,v;
-@@ -280,7 +280,7 @@
-
- }
-
-- return 1;
-+ return;
- }
- //
-
---- avidemux/ADM_colorspace/yv2bmp.cpp.bak 2006-01-07 23:40:11.000000000 -0500
-+++ avidemux/ADM_colorspace/yv2bmp.cpp 2006-01-07 23:39:24.000000000 -0500
-@@ -29,9 +29,9 @@
- #include "colorspace.h"
- #include "ADM_toolkit/ADM_cpuCap.h"
- #ifdef HAVE_ALTIVEC
--extern uint8_t altivecYV12RGB(uint8_t * ptr_y,
-+extern void altivecYV12RGB(uint8_t * ptr_y,
- uint8_t * ptr_u,
-- uint8_t * ptr_v, uint8_t * ptr2, uint32_t w);
-+ uint8_t * ptr_v, uint8_t * ptr2, int w);
- #endif
-
- static void swapRnB (uint8_t * ptr, uint32_t w);
---- adm_lavcodec/libpostproc/postprocess_altivec_template.c.bak 2006-01-08 01:52:55.000000000 -0500
-+++ adm_lavcodec/libpostproc/postprocess_altivec_template.c 2006-01-08 01:52:14.000000000 -0500
-@@ -1228,12 +1228,12 @@
-
-
-
-- const VECS16 vec_m=(VECS16)(0,1,2,3,3,2,1,0);
-- const VECS16 vec_m2=(VECS16)(0,-1,0,2,0,-1,0,0);
-- const VECS16 vec_sign=(VECS16)(0,1,1,1,-1,-1,-1,0);
-- const VECS16 vec_sign2=(VECS16)(0,-1,-1,-1,1,1,1,0);
-+ const VECS16 vec_m=(VECS16)AVV(0,1,2,3,3,2,1,0);
-+ const VECS16 vec_m2=(VECS16)AVV(0,-1,0,2,0,-1,0,0);
-+ const VECS16 vec_sign=(VECS16)AVV(0,1,1,1,-1,-1,-1,0);
-+ const VECS16 vec_sign2=(VECS16)AVV(0,-1,-1,-1,1,1,1,0);
-
-- const VEC16 vec_const=(VEC16)(4,0x11,0xFFFF,0,0,0,0,0);
-+ const VEC16 vec_const=(VEC16)AVV(4,0x11,0xFFFF,0,0,0,0,0);
-
- const VECS8 neg1=(VECS8)vec_splat(vec_const,2); // -1
- const VEC16 vec_shift=vec_splat(vec_const,0); // 3
---- adm_lavcodec/libpostproc/postprocess_template.c.bak 2006-01-08 01:57:42.000000000 -0500
-+++ adm_lavcodec/libpostproc/postprocess_template.c 2006-01-08 01:54:45.000000000 -0500
-@@ -513,7 +513,7 @@
-
-
-
-- const VEC16 vec_const=(VEC16)(4,0x11,0xFFFF,0,0,0,0,0);
-+ const VEC16 vec_const=(VEC16)AVV(4,0x11,0xFFFF,0,0,0,0,0);
- const VEC8 vec_zero=(VEC8)vec_splat(vec_const,3); //0
- const VEC16 neg1=vec_splat(vec_const,2); //FFFFF
- const VEC16 vec_shift=vec_splat(vec_const,0); //4
---- adm_lavcodec/ppc/fdct_altivec.c.bak 2006-07-08 16:51:08.000000000 -0400
-+++ adm_lavcodec/ppc/fdct_altivec.c 2006-07-08 18:04:23.000000000 -0400
-@@ -18,7 +18,7 @@
- */
-
-
--#include "../common.h"
-+#include "common.h"
- #include "../dsputil.h"
- #include "dsputil_altivec.h"
- #include "gcc_fixes.h"
-@@ -214,8 +214,8 @@
-
- /* setup constants {{{ */
- /* mzero = -0.0 */
-- vu32(mzero) = vec_splat_u32(-1);
-- vu32(mzero) = vec_sl(vu32(mzero), vu32(mzero));
-+ mzero = ((vector float)vec_splat_u32(-1));
-+ mzero = ((vector float)vec_sl(vu32(mzero), vu32(mzero)));
- cp = fdctconsts;
- cnsts0 = vec_ld(0, cp); cp++;
- cnsts1 = vec_ld(0, cp); cp++;
-@@ -227,43 +227,43 @@
- #define MERGE_S16(hl,a,b) vec_merge##hl(vs16(a), vs16(b))
-
- bp = (vector signed short*)block;
-- vs16(b00) = vec_ld(0, bp);
-- vs16(b40) = vec_ld(16*4, bp);
-- vs16(b01) = MERGE_S16(h, b00, b40);
-- vs16(b11) = MERGE_S16(l, b00, b40);
-+ b00 = ((vector float)vec_ld(0, bp));
-+ b40 = ((vector float)vec_ld(16*4, bp));
-+ b01 = ((vector float)MERGE_S16(h, b00, b40));
-+ b11 = ((vector float)MERGE_S16(l, b00, b40));
- bp++;
-- vs16(b10) = vec_ld(0, bp);
-- vs16(b50) = vec_ld(16*4, bp);
-- vs16(b21) = MERGE_S16(h, b10, b50);
-- vs16(b31) = MERGE_S16(l, b10, b50);
-+ b10 = ((vector float)vec_ld(0, bp));
-+ b50 = ((vector float)vec_ld(16*4, bp));
-+ b21 = ((vector float)MERGE_S16(h, b10, b50));
-+ b31 = ((vector float)MERGE_S16(l, b10, b50));
- bp++;
-- vs16(b20) = vec_ld(0, bp);
-- vs16(b60) = vec_ld(16*4, bp);
-- vs16(b41) = MERGE_S16(h, b20, b60);
-- vs16(b51) = MERGE_S16(l, b20, b60);
-+ b20 = ((vector float)vec_ld(0, bp));
-+ b60 = ((vector float)vec_ld(16*4, bp));
-+ b41 = ((vector float)MERGE_S16(h, b20, b60));
-+ b51 = ((vector float)MERGE_S16(l, b20, b60));
- bp++;
-- vs16(b30) = vec_ld(0, bp);
-- vs16(b70) = vec_ld(16*4, bp);
-- vs16(b61) = MERGE_S16(h, b30, b70);
-- vs16(b71) = MERGE_S16(l, b30, b70);
--
-- vs16(x0) = MERGE_S16(h, b01, b41);
-- vs16(x1) = MERGE_S16(l, b01, b41);
-- vs16(x2) = MERGE_S16(h, b11, b51);
-- vs16(x3) = MERGE_S16(l, b11, b51);
-- vs16(x4) = MERGE_S16(h, b21, b61);
-- vs16(x5) = MERGE_S16(l, b21, b61);
-- vs16(x6) = MERGE_S16(h, b31, b71);
-- vs16(x7) = MERGE_S16(l, b31, b71);
--
-- vs16(b00) = MERGE_S16(h, x0, x4);
-- vs16(b10) = MERGE_S16(l, x0, x4);
-- vs16(b20) = MERGE_S16(h, x1, x5);
-- vs16(b30) = MERGE_S16(l, x1, x5);
-- vs16(b40) = MERGE_S16(h, x2, x6);
-- vs16(b50) = MERGE_S16(l, x2, x6);
-- vs16(b60) = MERGE_S16(h, x3, x7);
-- vs16(b70) = MERGE_S16(l, x3, x7);
-+ b30 = ((vector float)vec_ld(0, bp));
-+ b70 = ((vector float)vec_ld(16*4, bp));
-+ b61 = ((vector float)MERGE_S16(h, b30, b70));
-+ b71 = ((vector float)MERGE_S16(l, b30, b70));
-+
-+ x0 = ((vector float)MERGE_S16(h, b01, b41));
-+ x1 = ((vector float)MERGE_S16(l, b01, b41));
-+ x2 = ((vector float)MERGE_S16(h, b11, b51));
-+ x3 = ((vector float)MERGE_S16(l, b11, b51));
-+ x4 = ((vector float)MERGE_S16(h, b21, b61));
-+ x5 = ((vector float)MERGE_S16(l, b21, b61));
-+ x6 = ((vector float)MERGE_S16(h, b31, b71));
-+ x7 = ((vector float)MERGE_S16(l, b31, b71));
-+
-+ b00 = ((vector float)MERGE_S16(h, x0, x4));
-+ b10 = ((vector float)MERGE_S16(l, x0, x4));
-+ b20 = ((vector float)MERGE_S16(h, x1, x5));
-+ b30 = ((vector float)MERGE_S16(l, x1, x5));
-+ b40 = ((vector float)MERGE_S16(h, x2, x6));
-+ b50 = ((vector float)MERGE_S16(l, x2, x6));
-+ b60 = ((vector float)MERGE_S16(h, x3, x7));
-+ b70 = ((vector float)MERGE_S16(l, x3, x7));
-
- #undef MERGE_S16
- /* }}} */
-@@ -275,32 +275,32 @@
- */
- #if 1
- /* fdct rows {{{ */
-- vs16(x0) = vec_add(vs16(b00), vs16(b70));
-- vs16(x7) = vec_sub(vs16(b00), vs16(b70));
-- vs16(x1) = vec_add(vs16(b10), vs16(b60));
-- vs16(x6) = vec_sub(vs16(b10), vs16(b60));
-- vs16(x2) = vec_add(vs16(b20), vs16(b50));
-- vs16(x5) = vec_sub(vs16(b20), vs16(b50));
-- vs16(x3) = vec_add(vs16(b30), vs16(b40));
-- vs16(x4) = vec_sub(vs16(b30), vs16(b40));
-+ x0 = ((vector float)vec_add(vs16(b00), vs16(b70)));
-+ x7 = ((vector float)vec_sub(vs16(b00), vs16(b70)));
-+ x1 = ((vector float)vec_add(vs16(b10), vs16(b60)));
-+ x6 = ((vector float)vec_sub(vs16(b10), vs16(b60)));
-+ x2 = ((vector float)vec_add(vs16(b20), vs16(b50)));
-+ x5 = ((vector float)vec_sub(vs16(b20), vs16(b50)));
-+ x3 = ((vector float)vec_add(vs16(b30), vs16(b40)));
-+ x4 = ((vector float)vec_sub(vs16(b30), vs16(b40)));
-
-- vs16(b70) = vec_add(vs16(x0), vs16(x3));
-- vs16(b10) = vec_add(vs16(x1), vs16(x2));
-+ b70 = ((vector float)vec_add(vs16(x0), vs16(x3)));
-+ b10 = ((vector float)vec_add(vs16(x1), vs16(x2)));
-
-- vs16(b00) = vec_add(vs16(b70), vs16(b10));
-- vs16(b40) = vec_sub(vs16(b70), vs16(b10));
-+ b00 = ((vector float)vec_add(vs16(b70), vs16(b10)));
-+ b40 = ((vector float)vec_sub(vs16(b70), vs16(b10)));
-
- #define CTF0(n) \
-- vs32(b##n##1) = vec_unpackl(vs16(b##n##0)); \
-- vs32(b##n##0) = vec_unpackh(vs16(b##n##0)); \
-+ b##n##1 = ((vector float)vec_unpackl(vs16(b##n##0))); \
-+ b##n##0 = ((vector float)vec_unpackh(vs16(b##n##0))); \
- b##n##1 = vec_ctf(vs32(b##n##1), 0); \
- b##n##0 = vec_ctf(vs32(b##n##0), 0);
-
- CTF0(0);
- CTF0(4);
-
-- vs16(b20) = vec_sub(vs16(x0), vs16(x3));
-- vs16(b60) = vec_sub(vs16(x1), vs16(x2));
-+ b20 = ((vector float)vec_sub(vs16(x0), vs16(x3)));
-+ b60 = ((vector float)vec_sub(vs16(x1), vs16(x2)));
-
- CTF0(2);
- CTF0(6);
-@@ -321,8 +321,8 @@
- b61 = vec_madd(cnst, b61, x1);
-
- #define CTFX(x,b) \
-- vs32(b##0) = vec_unpackh(vs16(x)); \
-- vs32(b##1) = vec_unpackl(vs16(x)); \
-+ b##0 = ((vector float)vec_unpackh(vs16(x))); \
-+ b##1 = ((vector float)vec_unpackl(vs16(x))); \
- b##0 = vec_ctf(vs32(b##0), 0); \
- b##1 = vec_ctf(vs32(b##1), 0); \
-
-@@ -473,9 +473,9 @@
- #define CTS(n) \
- b##n##0 = vec_round(b##n##0); \
- b##n##1 = vec_round(b##n##1); \
-- vs32(b##n##0) = vec_cts(b##n##0, 0); \
-- vs32(b##n##1) = vec_cts(b##n##1, 0); \
-- vs16(b##n##0) = vec_pack(vs32(b##n##0), vs32(b##n##1)); \
-+ b##n##0 = ((vector float)vec_cts(b##n##0, 0)); \
-+ b##n##1 = ((vector float)vec_cts(b##n##1, 0)); \
-+ b##n##0 = ((vector float)vec_pack(vs32(b##n##0), vs32(b##n##1))); \
- vec_st(vs16(b##n##0), 0, bp);
-
- bp = (vector signed short*)block;
+++ /dev/null
---- avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h.orig 2006-03-20 20:45:07.000000000 +0100
-+++ avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h 2006-03-20 20:45:23.000000000 +0100
-@@ -12,7 +12,7 @@
- class AccelRender
- {
- public:
-- AccelRender::AccelRender( void);
-+ AccelRender( void);
- virtual uint8_t init(GtkWidget * window, uint32_t w, uint32_t h)=0;
- virtual uint8_t end(void)=0;
- virtual uint8_t display(uint8_t *ptr, uint32_t w, uint32_t h)=0;
---- avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h.orig 2006-03-20 20:37:14.000000000 +0100
-+++ avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h 2006-03-20 20:37:36.000000000 +0100
-@@ -38,9 +38,9 @@
-
- uint32_t _type;
-
-- uint32_t picHeader::read32(FILE *fd);
-- uint16_t picHeader::read16(FILE *fd);
-- uint8_t picHeader::read8(FILE *fd);
-+ uint32_t read32(FILE *fd);
-+ uint16_t read16(FILE *fd);
-+ uint8_t read8(FILE *fd);
-
- public:
- // static int checkFourCC(uint8_t *in, uint8_t *fourcc);
---- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp.orig 2006-03-20 20:43:19.000000000 +0100
-+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp 2006-03-20 20:43:40.000000000 +0100
-@@ -55,8 +55,8 @@
- void update(void);
- public:
-
-- DGbob::DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);
-- DGbob::~DGbob(void);
-+ DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);
-+ ~DGbob(void);
- uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
- ADMImage *data,uint32_t *flags);
-
---- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp.orig 2006-03-20 20:42:14.000000000 +0100
-+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp 2006-03-20 20:42:31.000000000 +0100
-@@ -147,8 +147,8 @@
-
- public:
-
-- Decimate::Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);
-- Decimate::~Decimate(void);
-+ Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);
-+ ~Decimate(void);
- uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
- ADMImage *data,uint32_t *flags);
-
---- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h.orig 2006-03-20 20:39:18.000000000 +0100
-+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h 2006-03-20 20:40:49.000000000 +0100
-@@ -112,32 +112,32 @@
-
- public:
-
-- void Telecide::CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV,
-+ void CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV,
- unsigned char *prp, unsigned char *prpU, unsigned char *prpV);
-- void Telecide::Show(ADMImage *dst, int frame);
-- void Telecide::Debug(int frame);
-+ void Show(ADMImage *dst, int frame);
-+ void Debug(int frame);
-
-- Telecide::Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);
-+ Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);
-
-- Telecide::~Telecide();
-+ ~Telecide();
-
-- void Telecide::PutChosen(int frame, unsigned int chosen);
-+ void PutChosen(int frame, unsigned int chosen);
-
-
-- void Telecide::CacheInsert(int frame, unsigned int p, unsigned int pblock,
-+ void CacheInsert(int frame, unsigned int p, unsigned int pblock,
- unsigned int c, unsigned int cblock);
-
-- bool Telecide::CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
-+ bool CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
- unsigned int *c, unsigned int *cblock);
-
-- bool Telecide::PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
-+ bool PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
-
-- struct PREDICTION *Telecide::PredictSoftYUY2(int frame);
-+ struct PREDICTION *PredictSoftYUY2(int frame);
-
-- void Telecide::WriteHints(unsigned char *dst, bool film, bool inpattern);
-- virtual uint8_t Telecide::getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
-+ void WriteHints(unsigned char *dst, bool film, bool inpattern);
-+ virtual uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
- ADMImage *data,uint32_t *flags);
-- char *Telecide::printConf( void );
-- uint8_t Telecide::configure(AVDMGenericVideoStream *in);
-- uint8_t Telecide::getCoupledConf( CONFcouple **couples);
-+ char *printConf( void );
-+ uint8_t configure(AVDMGenericVideoStream *in);
-+ uint8_t getCoupledConf( CONFcouple **couples);
- };
projects / gentoo.git / commitdiff