+++ /dev/null
---- transcode-1.0.5/import/nuv/RTjpegN.c.orig 2008-03-31 20:04:58.657895227 +0200
-+++ transcode-1.0.5/import/nuv/RTjpegN.c 2008-03-31 20:19:48.096766118 +0200
-@@ -51,7 +51,7 @@
- 62, 55,
- 63 };
-
--static const __u64 RTjpeg_aan_tab[64]={
-+static const uint64_t RTjpeg_aan_tab[64]={
- 4294967296ULL, 5957222912ULL, 5611718144ULL, 5050464768ULL, 4294967296ULL, 3374581504ULL, 2324432128ULL, 1184891264ULL,
- 5957222912ULL, 8263040512ULL, 7783580160ULL, 7005009920ULL, 5957222912ULL, 4680582144ULL, 3224107520ULL, 1643641088ULL,
- 5611718144ULL, 7783580160ULL, 7331904512ULL, 6598688768ULL, 5611718144ULL, 4408998912ULL, 3036936960ULL, 1548224000ULL,
-@@ -63,16 +63,16 @@
- };
-
- #ifndef MMX
--static __s32 RTjpeg_ws[64+31];
-+static int32_t RTjpeg_ws[64+31];
- #endif
--__u8 RTjpeg_alldata[2*64+4*64+4*64+4*64+4*64+32];
-+uint8_t RTjpeg_alldata[2*64+4*64+4*64+4*64+4*64+32];
-
--__s16 *block; // rh
--__s16 *RTjpeg_block;
--__s32 *RTjpeg_lqt;
--__s32 *RTjpeg_cqt;
--__u32 *RTjpeg_liqt;
--__u32 *RTjpeg_ciqt;
-+int16_t *block; // rh
-+int16_t *RTjpeg_block;
-+int32_t *RTjpeg_lqt;
-+int32_t *RTjpeg_cqt;
-+uint32_t *RTjpeg_liqt;
-+uint32_t *RTjpeg_ciqt;
-
- unsigned char RTjpeg_lb8;
- unsigned char RTjpeg_cb8;
-@@ -80,14 +80,14 @@
- int RTjpeg_Ywidth, RTjpeg_Cwidth;
- int RTjpeg_Ysize, RTjpeg_Csize;
-
--__s16 *RTjpeg_old=NULL;
-+int16_t *RTjpeg_old=NULL;
-
- #ifdef MMX
- mmx_t RTjpeg_lmask;
- mmx_t RTjpeg_cmask;
- #else
--__u16 RTjpeg_lmask;
--__u16 RTjpeg_cmask;
-+uint16_t RTjpeg_lmask;
-+uint16_t RTjpeg_cmask;
- #endif
- int RTjpeg_mtest=0;
-
-@@ -130,10 +130,10 @@
- /* Block to Stream (encoding) */
- /* */
-
--int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
-+int RTjpeg_b2s(int16_t *data, int8_t *strm, uint8_t bt8)
- {
- register int ci, co=1;
-- register __s16 ZZvalue;
-+ register int16_t ZZvalue;
- register unsigned char bitten;
- register unsigned char bitoff;
-
-@@ -154,7 +154,7 @@
-
- // first byte allways written
- strm[0]=
-- (__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
-+ (uint8_t)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
-
-
- ci=63;
-@@ -270,11 +270,11 @@
-
- if(ZZvalue>0)
- {
-- strm[co++]=(__s8)(ZZvalue>127)?127:ZZvalue;
-+ strm[co++]=(int8_t)(ZZvalue>127)?127:ZZvalue;
- }
- else
- {
-- strm[co++]=(__s8)(ZZvalue<-128)?-128:ZZvalue;
-+ strm[co++]=(int8_t)(ZZvalue<-128)?-128:ZZvalue;
- }
-
- }
-@@ -300,7 +300,7 @@
- /* Stream to Block (decoding) */
- /* */
-
--int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
-+int RTjpeg_s2b(int16_t *data, int8_t *strm, uint8_t bt8, uint32_t *qtbl)
- {
- int ci;
- register int co;
-@@ -310,7 +310,7 @@
-
- /* first byte always read */
- i=RTjpeg_ZZ[0];
-- data[i]=((__u8)strm[0])*qtbl[i];
-+ data[i]=((uint8_t)strm[0])*qtbl[i];
-
- /* we start at the behind */
-
-@@ -445,10 +445,10 @@
-
- #else
-
--int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
-+int RTjpeg_b2s(int16_t *data, int8_t *strm, uint8_t bt8)
- {
- register int ci, co=1, tmp;
-- register __s16 ZZvalue;
-+ register int16_t ZZvalue;
-
- #ifdef SHOWBLOCK
-
-@@ -460,7 +460,7 @@
-
- #endif
-
-- (__u8)strm[0]=(__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
-+ (uint8_t)strm[0]=(uint8_t)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
-
- for(ci=1; ci<=bt8; ci++)
- {
-@@ -468,11 +468,11 @@
-
- if(ZZvalue>0)
- {
-- strm[co++]=(__s8)(ZZvalue>127)?127:ZZvalue;
-+ strm[co++]=(int8_t)(ZZvalue>127)?127:ZZvalue;
- }
- else
- {
-- strm[co++]=(__s8)(ZZvalue<-128)?-128:ZZvalue;
-+ strm[co++]=(int8_t)(ZZvalue<-128)?-128:ZZvalue;
- }
- }
-
-@@ -482,11 +482,11 @@
-
- if(ZZvalue>0)
- {
-- strm[co++]=(__s8)(ZZvalue>63)?63:ZZvalue;
-+ strm[co++]=(int8_t)(ZZvalue>63)?63:ZZvalue;
- }
- else if(ZZvalue<0)
- {
-- strm[co++]=(__s8)(ZZvalue<-64)?-64:ZZvalue;
-+ strm[co++]=(int8_t)(ZZvalue<-64)?-64:ZZvalue;
- }
- else /* compress zeros */
- {
-@@ -497,20 +497,20 @@
- }
- while((ci<64)&&(data[RTjpeg_ZZ[ci]]==0));
-
-- strm[co++]=(__s8)(63+(ci-tmp));
-+ strm[co++]=(int8_t)(63+(ci-tmp));
- ci--;
- }
- }
- return (int)co;
- }
-
--int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
-+int RTjpeg_s2b(int16_t *data, int8_t *strm, uint8_t bt8, uint32_t *qtbl)
- {
- int ci=1, co=1, tmp;
- register int i;
-
- i=RTjpeg_ZZ[0];
-- data[i]=((__u8)strm[0])*qtbl[i];
-+ data[i]=((uint8_t)strm[0])*qtbl[i];
-
- for(co=1; co<=bt8; co++)
- {
-@@ -540,19 +540,19 @@
- void RTjpeg_quant_init(void)
- {
- int i;
-- __s16 *qtbl;
-+ int16_t *qtbl;
-
-- qtbl=(__s16 *)RTjpeg_lqt;
-- for(i=0; i<64; i++)qtbl[i]=(__s16)RTjpeg_lqt[i];
-+ qtbl=(int16_t *)RTjpeg_lqt;
-+ for(i=0; i<64; i++)qtbl[i]=(int16_t)RTjpeg_lqt[i];
-
-- qtbl=(__s16 *)RTjpeg_cqt;
-- for(i=0; i<64; i++)qtbl[i]=(__s16)RTjpeg_cqt[i];
-+ qtbl=(int16_t *)RTjpeg_cqt;
-+ for(i=0; i<64; i++)qtbl[i]=(int16_t)RTjpeg_cqt[i];
- }
-
- static mmx_t RTjpeg_ones=(mmx_t)(long long)0x0001000100010001LL;
- static mmx_t RTjpeg_half=(mmx_t)(long long)0x7fff7fff7fff7fffLL;
-
--void RTjpeg_quant(__s16 *block, __s32 *qtbl)
-+void RTjpeg_quant(int16_t *block, int32_t *qtbl)
- {
- int i;
- mmx_t *bl, *ql;
-@@ -593,12 +593,12 @@
- {
- }
-
--void RTjpeg_quant(__s16 *block, __s32 *qtbl)
-+void RTjpeg_quant(int16_t *block, int32_t *qtbl)
- {
- int i;
-
- for(i=0; i<64; i++)
-- block[i]=(__s16)((block[i]*qtbl[i]+32767)>>16);
-+ block[i]=(int16_t)((block[i]*qtbl[i]+32767)>>16);
- }
- #endif
-
-@@ -614,14 +614,14 @@
-
- #else
-
--#define FIX_0_382683433 ((__s32) 98) /* FIX(0.382683433) */
--#define FIX_0_541196100 ((__s32) 139) /* FIX(0.541196100) */
--#define FIX_0_707106781 ((__s32) 181) /* FIX(0.707106781) */
--#define FIX_1_306562965 ((__s32) 334) /* FIX(1.306562965) */
--
--#define DESCALE10(x) (__s16)( ((x)+128) >> 8)
--#define DESCALE20(x) (__s16)(((x)+32768) >> 16)
--#define D_MULTIPLY(var,const) ((__s32) ((var) * (const)))
-+#define FIX_0_382683433 ((int32_t) 98) /* FIX(0.382683433) */
-+#define FIX_0_541196100 ((int32_t) 139) /* FIX(0.541196100) */
-+#define FIX_0_707106781 ((int32_t) 181) /* FIX(0.707106781) */
-+#define FIX_1_306562965 ((int32_t) 334) /* FIX(1.306562965) */
-+
-+#define DESCALE10(x) (int16_t)( ((x)+128) >> 8)
-+#define DESCALE20(x) (int16_t)(((x)+32768) >> 16)
-+#define D_MULTIPLY(var,const) ((int32_t) ((var) * (const)))
- #endif
-
- void RTjpeg_dct_init(void)
-@@ -630,20 +630,20 @@
-
- for(i=0; i<64; i++)
- {
-- RTjpeg_lqt[i]=(((__u64)RTjpeg_lqt[i]<<32)/RTjpeg_aan_tab[i]);
-- RTjpeg_cqt[i]=(((__u64)RTjpeg_cqt[i]<<32)/RTjpeg_aan_tab[i]);
-+ RTjpeg_lqt[i]=(((uint64_t)RTjpeg_lqt[i]<<32)/RTjpeg_aan_tab[i]);
-+ RTjpeg_cqt[i]=(((uint64_t)RTjpeg_cqt[i]<<32)/RTjpeg_aan_tab[i]);
- }
- }
-
--void RTjpeg_dctY(__u8 *idata, __s16 *odata, int rskip)
-+void RTjpeg_dctY(uint8_t *idata, int16_t *odata, int rskip)
- {
- #ifndef MMX
-- __s32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-- __s32 tmp10, tmp11, tmp12, tmp13;
-- __s32 z1, z2, z3, z4, z5, z11, z13;
-- __u8 *idataptr;
-- __s16 *odataptr;
-- __s32 *wsptr;
-+ int32_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-+ int32_t tmp10, tmp11, tmp12, tmp13;
-+ int32_t z1, z2, z3, z4, z5, z11, z13;
-+ uint8_t *idataptr;
-+ int16_t *odataptr;
-+ int32_t *wsptr;
- int ctr;
-
- idataptr = idata;
-@@ -1540,17 +1540,17 @@
- #endif
- }
-
--#define FIX_1_082392200 ((__s32) 277) /* FIX(1.082392200) */
--#define FIX_1_414213562 ((__s32) 362) /* FIX(1.414213562) */
--#define FIX_1_847759065 ((__s32) 473) /* FIX(1.847759065) */
--#define FIX_2_613125930 ((__s32) 669) /* FIX(2.613125930) */
-+#define FIX_1_082392200 ((int32_t) 277) /* FIX(1.082392200) */
-+#define FIX_1_414213562 ((int32_t) 362) /* FIX(1.414213562) */
-+#define FIX_1_847759065 ((int32_t) 473) /* FIX(1.847759065) */
-+#define FIX_2_613125930 ((int32_t) 669) /* FIX(2.613125930) */
-
--#define DESCALE(x) (__s16)( ((x)+4) >> 3)
-+#define DESCALE(x) (int16_t)( ((x)+4) >> 3)
-
- /* clip yuv to 16..235 (should be 16..240 for cr/cb but ... */
-
- #define RL(x) ((x)>235) ? 235 : (((x)<16) ? 16 : (x))
--#define MULTIPLY(var,const) (((__s32) ((var) * (const)) + 128)>>8)
-+#define MULTIPLY(var,const) (((int32_t) ((var) * (const)) + 128)>>8)
-
- void RTjpeg_idct_init(void)
- {
-@@ -1558,12 +1558,12 @@
-
- for(i=0; i<64; i++)
- {
-- RTjpeg_liqt[i]=((__u64)RTjpeg_liqt[i]*RTjpeg_aan_tab[i])>>32;
-- RTjpeg_ciqt[i]=((__u64)RTjpeg_ciqt[i]*RTjpeg_aan_tab[i])>>32;
-+ RTjpeg_liqt[i]=((uint64_t)RTjpeg_liqt[i]*RTjpeg_aan_tab[i])>>32;
-+ RTjpeg_ciqt[i]=((uint64_t)RTjpeg_ciqt[i]*RTjpeg_aan_tab[i])>>32;
- }
- }
-
--void RTjpeg_idct(__u8 *odata, __s16 *data, int rskip)
-+void RTjpeg_idct(uint8_t *odata, int16_t *data, int rskip)
- {
- #ifdef MMX
-
-@@ -2557,15 +2557,15 @@
- movq_r2m(mm3, *(dataptr));
-
- #else
-- __s32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-- __s32 tmp10, tmp11, tmp12, tmp13;
-- __s32 z5, z10, z11, z12, z13;
-- __s16 *inptr;
-- __s32 *wsptr;
-- __u8 *outptr;
-+ int32_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-+ int32_t tmp10, tmp11, tmp12, tmp13;
-+ int32_t z5, z10, z11, z12, z13;
-+ int16_t *inptr;
-+ int32_t *wsptr;
-+ uint8_t *outptr;
- int ctr;
-- __s32 dcval;
-- __s32 workspace[64];
-+ int32_t dcval;
-+ int32_t workspace[64];
-
- inptr = data;
- wsptr = workspace;
-@@ -2625,14 +2625,14 @@
- tmp5 = tmp11 - tmp6;
- tmp4 = tmp10 + tmp5;
-
-- wsptr[0] = (__s32) (tmp0 + tmp7);
-- wsptr[56] = (__s32) (tmp0 - tmp7);
-- wsptr[8] = (__s32) (tmp1 + tmp6);
-- wsptr[48] = (__s32) (tmp1 - tmp6);
-- wsptr[16] = (__s32) (tmp2 + tmp5);
-- wsptr[40] = (__s32) (tmp2 - tmp5);
-- wsptr[32] = (__s32) (tmp3 + tmp4);
-- wsptr[24] = (__s32) (tmp3 - tmp4);
-+ wsptr[0] = (int32_t) (tmp0 + tmp7);
-+ wsptr[56] = (int32_t) (tmp0 - tmp7);
-+ wsptr[8] = (int32_t) (tmp1 + tmp6);
-+ wsptr[48] = (int32_t) (tmp1 - tmp6);
-+ wsptr[16] = (int32_t) (tmp2 + tmp5);
-+ wsptr[40] = (int32_t) (tmp2 - tmp5);
-+ wsptr[32] = (int32_t) (tmp3 + tmp4);
-+ wsptr[24] = (int32_t) (tmp3 - tmp4);
-
- inptr++;
- wsptr++;
-@@ -2709,15 +2709,15 @@
- dptr=dptr>>5;
- dptr=dptr<<5; /* cache align data */
-
-- RTjpeg_block=(__s16 *)dptr;
-- dptr+=sizeof(__s16)*64;
-- RTjpeg_lqt=(__s32 *)dptr;
-- dptr+=sizeof(__s32)*64;
-- RTjpeg_cqt=(__s32 *)dptr;
-- dptr+=sizeof(__s32)*64;
-- RTjpeg_liqt=(__u32 *)dptr;
-- dptr+=sizeof(__u32)*64;
-- RTjpeg_ciqt=(__u32 *)dptr;
-+ RTjpeg_block=(int16_t *)dptr;
-+ dptr+=sizeof(int16_t)*64;
-+ RTjpeg_lqt=(int32_t *)dptr;
-+ dptr+=sizeof(int32_t)*64;
-+ RTjpeg_cqt=(int32_t *)dptr;
-+ dptr+=sizeof(int32_t)*64;
-+ RTjpeg_liqt=(uint32_t *)dptr;
-+ dptr+=sizeof(uint32_t)*64;
-+ RTjpeg_ciqt=(uint32_t *)dptr;
- }
-
- /*
-@@ -2731,18 +2731,18 @@
- Q -> quality factor (192=best, 32=worst)
- */
-
--void RTjpeg_init_Q(__u8 Q)
-+void RTjpeg_init_Q(uint8_t Q)
- {
- int i;
-- __u64 qual;
-+ uint64_t qual;
-
-- qual=(__u64)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
-+ qual=(uint64_t)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
-
- for(i=0; i<64; i++)
- {
-- RTjpeg_lqt[i]=(__s32)((qual/((__u64)RTjpeg_lum_quant_tbl[i]<<16))>>3);
-+ RTjpeg_lqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_lum_quant_tbl[i]<<16))>>3);
- if(RTjpeg_lqt[i]==0)RTjpeg_lqt[i]=1;
-- RTjpeg_cqt[i]=(__s32)((qual/((__u64)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
-+ RTjpeg_cqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
- if(RTjpeg_cqt[i]==0)RTjpeg_cqt[i]=1;
- RTjpeg_liqt[i]=(1<<16)/(RTjpeg_lqt[i]<<3);
- RTjpeg_ciqt[i]=(1<<16)/(RTjpeg_cqt[i]<<3);
-@@ -2776,10 +2776,10 @@
-
- */
-
--void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q)
-+void RTjpeg_init_compress(uint32_t *buf, int width, int height, uint8_t Q)
- {
- int i;
-- __u64 qual;
-+ uint64_t qual;
-
- RTjpeg_init_data();
-
-@@ -2790,13 +2790,13 @@
- RTjpeg_Cwidth = RTjpeg_width>>4;
- RTjpeg_Csize= (width>>1) * height;
-
-- qual=(__u64)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
-+ qual=(uint64_t)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
-
- for(i=0; i<64; i++)
- {
-- RTjpeg_lqt[i]=(__s32)((qual/((__u64)RTjpeg_lum_quant_tbl[i]<<16))>>3);
-+ RTjpeg_lqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_lum_quant_tbl[i]<<16))>>3);
- if(RTjpeg_lqt[i]==0)RTjpeg_lqt[i]=1;
-- RTjpeg_cqt[i]=(__s32)((qual/((__u64)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
-+ RTjpeg_cqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
- if(RTjpeg_cqt[i]==0)RTjpeg_cqt[i]=1;
- RTjpeg_liqt[i]=(1<<16)/(RTjpeg_lqt[i]<<3);
- RTjpeg_ciqt[i]=(1<<16)/(RTjpeg_cqt[i]<<3);
-@@ -2820,7 +2820,7 @@
- buf[64+i]=RTjpeg_ciqt[i];
- }
-
--void RTjpeg_init_decompress(__u32 *buf, int width, int height)
-+void RTjpeg_init_decompress(uint32_t *buf, int width, int height)
- {
- int i;
-
-@@ -2851,12 +2851,12 @@
- // RTjpeg_color_init();
- }
-
--int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp)
-+int RTjpeg_compressYUV420(int8_t *sp, unsigned char *bp)
- {
-- __s8 * sb;
-- register __s8 * bp1 = bp + (RTjpeg_width<<3);
-- register __s8 * bp2 = bp + RTjpeg_Ysize;
-- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
-+ int8_t * sb;
-+ register uint8_t * bp1 = bp + (RTjpeg_width<<3);
-+ register uint8_t * bp2 = bp + RTjpeg_Ysize;
-+ register uint8_t * bp3 = bp2 + (RTjpeg_Csize>>1);
- register int i, j, k;
-
- #ifdef MMX
-@@ -2905,11 +2905,11 @@
- return (sp-sb);
- }
-
--int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp)
-+int RTjpeg_compressYUV422(int8_t *sp, unsigned char *bp)
- {
-- __s8 * sb;
-- register __s8 * bp2 = bp + RTjpeg_Ysize;
-- register __s8 * bp3 = bp2 + RTjpeg_Csize;
-+ int8_t * sb;
-+ register uint8_t * bp2 = bp + RTjpeg_Ysize;
-+ register uint8_t * bp3 = bp2 + RTjpeg_Csize;
- register int i, j, k;
-
- #ifdef MMX
-@@ -2949,9 +2949,9 @@
- return (sp-sb);
- }
-
--int RTjpeg_compress8(__s8 *sp, unsigned char *bp)
-+int RTjpeg_compress8(int8_t *sp, unsigned char *bp)
- {
-- __s8 * sb;
-+ int8_t * sb;
- int i, j;
-
- #ifdef MMX
-@@ -2977,10 +2977,10 @@
- return (sp-sb);
- }
-
--void RTjpeg_decompressYUV422(__s8 *sp, __u8 *bp)
-+void RTjpeg_decompressYUV422(int8_t *sp, uint8_t *bp)
- {
-- register __s8 * bp2 = bp + RTjpeg_Ysize;
-- register __s8 * bp3 = bp2 + (RTjpeg_Csize);
-+ register uint8_t * bp2 = bp + RTjpeg_Ysize;
-+ register uint8_t * bp3 = bp2 + (RTjpeg_Csize);
- int i, j,k;
-
- #ifdef MMX
-@@ -3025,11 +3025,11 @@
- #endif
- }
-
--void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp)
-+void RTjpeg_decompressYUV420(int8_t *sp, uint8_t *bp)
- {
-- register __s8 * bp1 = bp + (RTjpeg_width<<3);
-- register __s8 * bp2 = bp + RTjpeg_Ysize;
-- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
-+ register uint8_t * bp1 = bp + (RTjpeg_width<<3);
-+ register uint8_t * bp2 = bp + RTjpeg_Ysize;
-+ register uint8_t * bp3 = bp2 + (RTjpeg_Csize>>1);
- int i, j,k;
-
- #ifdef MMX
-@@ -3087,7 +3087,7 @@
- #endif
- }
-
--void RTjpeg_decompress8(__s8 *sp, __u8 *bp)
-+void RTjpeg_decompress8(int8_t *sp, uint8_t *bp)
- {
- int i, j;
-
-@@ -3126,7 +3126,7 @@
- tmp=(unsigned long)RTjpeg_old;
- tmp+=32;
- tmp=tmp>>5;
-- RTjpeg_old=(__s16 *)(tmp<<5);
-+ RTjpeg_old=(int16_t *)(tmp<<5);
- }
- if (!RTjpeg_old)
- {
-@@ -3138,7 +3138,7 @@
-
- #ifdef MMX
-
--int RTjpeg_bcomp(__s16 *old, mmx_t *mask)
-+int RTjpeg_bcomp(int16_t *old, mmx_t *mask)
- {
- int i;
- mmx_t *mold=(mmx_t *)old;
-@@ -3176,7 +3176,7 @@
- if(result.q)
- {
- // if(!RTjpeg_mtest)
--// for(i=0; i<16; i++)((__u64 *)old)[i]=((__u64 *)RTjpeg_block)[i];
-+// for(i=0; i<16; i++)((uint64_t *)old)[i]=((uint64_t *)RTjpeg_block)[i];
- return 0;
- }
- // printf(".");
-@@ -3184,7 +3184,7 @@
- }
-
- #else
--int RTjpeg_bcomp(__s16 *old, __u16 *mask)
-+int RTjpeg_bcomp(int16_t *old, uint16_t *mask)
- {
- int i;
-
-@@ -3192,7 +3192,7 @@
- if(abs(old[i]-RTjpeg_block[i])>*mask)
- {
- if(!RTjpeg_mtest)
-- for(i=0; i<16; i++)((__u64 *)old)[i]=((__u64 *)RTjpeg_block)[i];
-+ for(i=0; i<16; i++)((uint64_t *)old)[i]=((uint64_t *)RTjpeg_block)[i];
- return 0;
- }
- return 1;
-@@ -3204,19 +3204,19 @@
- RTjpeg_mtest=i;
- }
-
--int RTjpeg_mcompressYUV420(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask)
-+int RTjpeg_mcompressYUV420(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask)
- {
-- __s8 * sb;
--//rh __s16 *block;
-- register __s8 * bp1 = bp + (RTjpeg_width<<3);
-- register __s8 * bp2 = bp + RTjpeg_Ysize;
-- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
-+ int8_t * sb;
-+//rh int16_t *block;
-+ register uint8_t * bp1 = bp + (RTjpeg_width<<3);
-+ register uint8_t * bp2 = bp + RTjpeg_Ysize;
-+ register uint8_t * bp3 = bp2 + (RTjpeg_Csize>>1);
- register int i, j, k;
-
- #ifdef MMX
- emms();
-- RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask);
-- RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask);
-+ RTjpeg_lmask=(mmx_t)(((uint64_t)lmask<<48)|((uint64_t)lmask<<32)|((uint64_t)lmask<<16)|lmask);
-+ RTjpeg_cmask=(mmx_t)(((uint64_t)cmask<<48)|((uint64_t)cmask<<32)|((uint64_t)cmask<<16)|cmask);
- #else
- RTjpeg_lmask=lmask;
- RTjpeg_cmask=cmask;
-@@ -3233,7 +3233,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
- if(RTjpeg_bcomp(block, &RTjpeg_lmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
- block+=64;
-@@ -3242,7 +3242,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
- if(RTjpeg_bcomp(block, &RTjpeg_lmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
- block+=64;
-@@ -3251,7 +3251,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
- if(RTjpeg_bcomp(block, &RTjpeg_lmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
- block+=64;
-@@ -3260,7 +3260,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
- if(RTjpeg_bcomp(block, &RTjpeg_lmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
- block+=64;
-@@ -3269,7 +3269,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
- if(RTjpeg_bcomp(block, &RTjpeg_cmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
- block+=64;
-@@ -3278,7 +3278,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
- if(RTjpeg_bcomp(block, &RTjpeg_cmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
- block+=64;
-@@ -3296,18 +3296,18 @@
- }
-
-
--int RTjpeg_mcompressYUV422(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask)
-+int RTjpeg_mcompressYUV422(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask)
- {
-- __s8 * sb;
-- __s16 *block;
-- register __s8 * bp2;
-- register __s8 * bp3;
-+ int8_t * sb;
-+ int16_t *block;
-+ register uint8_t * bp2;
-+ register uint8_t * bp3;
- register int i, j, k;
-
- #ifdef MMX
- emms();
-- RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask);
-- RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask);
-+ RTjpeg_lmask=(mmx_t)(((int64_t)lmask<<48)|((int64_t)lmask<<32)|((int64_t)lmask<<16)|lmask);
-+ RTjpeg_cmask=(mmx_t)(((int64_t)cmask<<48)|((int64_t)cmask<<32)|((int64_t)cmask<<16)|cmask);
- #else
- RTjpeg_lmask=lmask;
- RTjpeg_cmask=cmask;
-@@ -3328,7 +3328,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
- if(RTjpeg_bcomp(block, &RTjpeg_lmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
- block+=64;
-@@ -3337,7 +3337,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
- if(RTjpeg_bcomp(block, &RTjpeg_lmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
- block+=64;
-@@ -3346,7 +3346,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
- if(RTjpeg_bcomp(block, &RTjpeg_cmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
- block+=64;
-@@ -3355,7 +3355,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
- if(RTjpeg_bcomp(block, &RTjpeg_cmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- }
- else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
- block+=64;
-@@ -3372,15 +3372,15 @@
- return (sp-sb);
- }
-
--int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask)
-+int RTjpeg_mcompress8(int8_t *sp, unsigned char *bp, uint16_t lmask)
- {
-- __s8 * sb;
-- __s16 *block;
-+ int8_t * sb;
-+ int16_t *block;
- int i, j;
-
- #ifdef MMX
- emms();
-- RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask);
-+ RTjpeg_lmask=(mmx_t)(((uint64_t)lmask<<48)|((uint64_t)lmask<<32)|((uint64_t)lmask<<16)|lmask);
- #else
- RTjpeg_lmask=lmask;
- #endif
-@@ -3397,7 +3397,7 @@
- RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
- if(RTjpeg_bcomp(block, &RTjpeg_lmask))
- {
-- *((__u8 *)sp++)=255;
-+ *((uint8_t *)sp++)=255;
- // printf("* %d ", sp[-1]);
- } else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
- block+=64;
-@@ -3420,12 +3420,12 @@
- #define KcbB 132252
- #define Ky 76284
-
--void RTjpeg_yuv422rgb(__u8 *buf, __u8 *rgb, int stride)
-+void RTjpeg_yuv422rgb(uint8_t *buf, uint8_t *rgb, int stride)
- {
- int tmp;
- int i, j;
-- __s32 y, crR, crG, cbG, cbB;
-- __u8 *bufcr, *bufcb, *bufy, *bufoute;
-+ int32_t y, crR, crG, cbG, cbB;
-+ uint8_t *bufcr, *bufcb, *bufy, *bufoute;
- int yskip;
-
- yskip=RTjpeg_width;
-@@ -3468,12 +3468,12 @@
- }
-
-
--void RTjpeg_yuv420rgb(__u8 *buf, __u8 *rgb, int stride)
-+void RTjpeg_yuv420rgb(uint8_t *buf, uint8_t *rgb, int stride)
- {
- int tmp;
- int i, j;
-- __s32 y, crR, crG, cbG, cbB;
-- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
-+ int32_t y, crR, crG, cbG, cbB;
-+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
- int oskip, yskip;
-
- if(stride==0)
-@@ -3542,12 +3542,12 @@
- }
-
-
--void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb, int stride)
-+void RTjpeg_yuvrgb32(uint8_t *buf, uint8_t *rgb, int stride)
- {
- int tmp;
- int i, j;
-- __s32 y, crR, crG, cbG, cbB;
-- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
-+ int32_t y, crR, crG, cbG, cbB;
-+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
- int oskip, yskip;
-
- if(stride==0)
-@@ -3618,12 +3618,12 @@
- }
- }
-
--void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb, int stride)
-+void RTjpeg_yuvrgb24(uint8_t *buf, uint8_t *rgb, int stride)
- {
- int tmp;
- int i, j;
-- __s32 y, crR, crG, cbG, cbB;
-- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
-+ int32_t y, crR, crG, cbG, cbB;
-+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
- int oskip, yskip;
-
- if(stride==0)
-@@ -3691,12 +3691,12 @@
- }
- }
-
--void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb, int stride)
-+void RTjpeg_yuvrgb16(uint8_t *buf, uint8_t *rgb, int stride)
- {
- int tmp;
- int i, j;
-- __s32 y, crR, crG, cbG, cbB;
-- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
-+ int32_t y, crR, crG, cbG, cbB;
-+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
- int oskip, yskip;
- unsigned char r, g, b;
-
-@@ -3788,7 +3788,7 @@
-
- /* fix stride */
-
--void RTjpeg_yuvrgb8(__u8 *buf, __u8 *rgb, int stride)
-+void RTjpeg_yuvrgb8(uint8_t *buf, uint8_t *rgb, int stride)
- {
- bcopy(buf, rgb, RTjpeg_width*RTjpeg_height);
- }
---- transcode-1.0.5/import/nuv/RTjpegN.h.orig 2008-03-31 20:05:02.657620336 +0200
-+++ transcode-1.0.5/import/nuv/RTjpegN.h 2008-03-31 20:14:43.617692272 +0200
-@@ -21,38 +21,29 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- */
-+#include <stdint.h>
-
--#ifndef _I386_TYPES_H
--typedef unsigned char __u8;
--typedef unsigned short __u16;
--typedef unsigned long __u32;
--typedef unsigned long long __u64;
--typedef signed char __s8;
--typedef signed short __s16;
--typedef signed long __s32;
--#endif
--
--extern void RTjpeg_init_Q(__u8 Q);
--extern void RTjpeg_init_compress(long unsigned int *buf, int width, int height, __u8 Q);
--extern void RTjpeg_init_decompress(long unsigned int *buf, int width, int height);
--extern int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp);
--extern int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp);
--extern void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp);
--extern void RTjpeg_decompressYUV422(__s8 *sp, __u8 *bp);
--extern int RTjpeg_compress8(__s8 *sp, unsigned char *bp);
--extern void RTjpeg_decompress8(__s8 *sp, __u8 *bp);
-+extern void RTjpeg_init_Q(uint8_t Q);
-+extern void RTjpeg_init_compress(uint32_t *buf, int width, int height, uint8_t Q);
-+extern void RTjpeg_init_decompress(uint32_t *buf, int width, int height);
-+extern int RTjpeg_compressYUV420(int8_t *sp, unsigned char *bp);
-+extern int RTjpeg_compressYUV422(int8_t *sp, unsigned char *bp);
-+extern void RTjpeg_decompressYUV420(int8_t *sp, uint8_t *bp);
-+extern void RTjpeg_decompressYUV422(int8_t *sp, uint8_t *bp);
-+extern int RTjpeg_compress8(int8_t *sp, unsigned char *bp);
-+extern void RTjpeg_decompress8(int8_t *sp, uint8_t *bp);
-
- extern void RTjpeg_init_mcompress(void);
--extern int RTjpeg_mcompressYUV420(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask);
--extern int RTjpeg_mcompressYUV422(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask);
--extern int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask);
-+extern int RTjpeg_mcompressYUV420(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask);
-+extern int RTjpeg_mcompressYUV422(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask);
-+extern int RTjpeg_mcompress8(int8_t *sp, unsigned char *bp, uint16_t lmask);
- extern void RTjpeg_set_test(int i);
-
--extern void RTjpeg_yuv420rgb(__u8 *buf, __u8 *rgb, int stride);
--extern void RTjpeg_yuv422rgb(__u8 *buf, __u8 *rgb, int stride);
--extern void RTjpeg_yuvrgb8(__u8 *buf, __u8 *rgb, int stride);
--extern void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb, int stride);
--extern void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb, int stride);
--extern void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb, int stride);
-+extern void RTjpeg_yuv420rgb(uint8_t *buf, uint8_t *rgb, int stride);
-+extern void RTjpeg_yuv422rgb(uint8_t *buf, uint8_t *rgb, int stride);
-+extern void RTjpeg_yuvrgb8(uint8_t *buf, uint8_t *rgb, int stride);
-+extern void RTjpeg_yuvrgb16(uint8_t *buf, uint8_t *rgb, int stride);
-+extern void RTjpeg_yuvrgb24(uint8_t *buf, uint8_t *rgb, int stride);
-+extern void RTjpeg_yuvrgb32(uint8_t *buf, uint8_t *rgb, int stride);
-
-
projects / packages / transcode.git / commitdiff