Author: thl Update of /cvs/free/rpms/transcode/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31455 Modified Files: .cvsignore sources Added Files: transcode-1.0.2-lzo2.patch transcode-1.0.4.external_dv.patch transcode-1.0.5-ImageMagick.patch transcode-1.0.5-dvdread.patch transcode-1.0.5-ffmpeg.patch transcode-1.0.5-nuv.patch transcode-pvmbin.patch transcode.spec Log Message: initial import from livna transcode-1.0.2-lzo2.patch: --- NEW FILE transcode-1.0.2-lzo2.patch --- --- transcode-1.0.2/import/import_lzo.c~ 2005-07-04 10:09:33.000000000 +0300 +++ transcode-1.0.2/import/import_lzo.c 2006-07-26 20:50:50.000000000 +0300 @@ -22,10 +22,12 @@ */ #define MOD_NAME "import_lzo.so" -#define MOD_VERSION "v0.0.3 (2002-11-26)" +#define MOD_VERSION "v0.1.0 (2005-10-16)" #define MOD_CODEC "(video) LZO" #include "transcode.h" +#include "magic.h" +#include "export/tc_lzo.h" static int verbose_flag = TC_QUIET; static int capability_flag = TC_CAP_PCM | TC_CAP_YUV | TC_CAP_RGB | @@ -34,15 +36,14 @@ #define MOD_PRE lzo #include "import_def.h" -#include <lzo1x.h> -#if (LZO_VERSION > 0x1070) -# include <lzoutil.h> -#endif +#include <lzo/lzo1x.h> +#include <lzo/lzoutil.h> static avi_t *avifile1=NULL; static avi_t *avifile2=NULL; +static uint32_t video_codec; static int audio_codec; static int aframe_count=0, vframe_count=0; @@ -103,6 +104,14 @@ fps = AVI_frame_rate(avifile2); codec = AVI_video_compressor(avifile2); + if (strcmp(codec,"LZO1") == 0) { + video_codec = TC_CODEC_LZO1; + } else if (strcmp(codec,"LZO2") == 0) { + video_codec = TC_CODEC_LZO2; + } else { + fprintf(stderr, "[%s] Unsupported video codec %s", MOD_NAME, codec); + return(TC_IMPORT_ERROR); + } fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n", MOD_NAME, codec, fps, width, height); @@ -142,7 +151,7 @@ { int key; - + lzo_uint size; long bytes_read=0; if(param->flag == TC_VIDEO) { @@ -160,7 +169,24 @@ return(TC_IMPORT_ERROR); } - r = lzo1x_decompress(out, out_len, param->buffer, &param->size, wrkmem); + if (video_codec == TC_CODEC_LZO1) { + r = lzo1x_decompress(out, out_len, param->buffer, &size, wrkmem); + } else { + tc_lzo_header_t *h = (tc_lzo_header_t *)out; + uint8_t *compdata = out + sizeof(*h); + int compsize = out_len - sizeof(*h); + if (h->magic != video_codec) { + fprintf(stderr, "[%s] frame with invalid magic 0x%08X\n", MOD_NAME, h->magic); + return (TC_IMPORT_ERROR); + } + if (h->flags & TC_LZO_NOT_COMPRESSIBLE) { + tc_memcpy(param->buffer, compdata, compsize); + size = compsize; + r = LZO_E_OK; + } else { + r = lzo1x_decompress(compdata, compsize, param->buffer, &size, wrkmem); + } + } if (r == LZO_E_OK) { if(verbose & TC_DEBUG) printf("decompressed %lu bytes into %lu bytes\n", @@ -172,6 +198,7 @@ return(TC_IMPORT_ERROR); } + param->size = size; //transcode v.0.5.0-pre8 addition if(key) param->attributes |= TC_FRAME_IS_KEYFRAME; --- transcode-1.0.2/import/decode_lzo.c~ 2005-07-04 10:09:33.000000000 +0300 +++ transcode-1.0.2/import/decode_lzo.c 2006-07-26 20:50:55.000000000 +0300 @@ -27,10 +27,8 @@ #ifdef HAVE_LZO -#include <lzo1x.h> -#if (LZO_VERSION > 0x1070) -# include <lzoutil.h> -#endif +#include <lzo/lzo1x.h> +#include <lzo/lzoutil.h> #include "export/tc_lzo.h" @@ -100,8 +98,13 @@ goto decoder_error; } - - r = lzo1x_decompress(inbuf, bytes, out, &out_len, wrkmem); + if (h.flags & TC_LZO_NOT_COMPRESSIBLE) { + tc_memcpy(out, inbuf, bytes); + out_len = bytes; + r = LZO_E_OK; + } else { + r = lzo1x_decompress(inbuf, bytes, out, &out_len, wrkmem); + } if (r == LZO_E_OK) { if(verbose & TC_DEBUG) --- transcode-1.0.2/import/extract_lzo.c~ 2005-07-04 10:09:33.000000000 +0300 +++ transcode-1.0.2/import/extract_lzo.c 2006-07-26 20:50:52.000000000 +0300 @@ -27,10 +27,8 @@ #ifdef HAVE_LZO -#include <lzo1x.h> -#if (LZO_VERSION > 0x1070) -# include <lzoutil.h> -#endif +#include <lzo/lzo1x.h> +#include <lzo/lzoutil.h> #define BUFFER_SIZE SIZE_RGB_FRAME<<1 --- transcode-1.0.2/configure.in~ 2005-10-30 06:57:45.000000000 +0200 +++ transcode-1.0.2/configure.in 2006-07-26 20:51:02.000000000 +0300 @@ -1018,7 +1018,7 @@ dnl dnl LZO dnl -TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo, lzo_version, lzo, +TC_PKG_CHECK(lzo, no, LZO, no, [lzo/lzo1x.h], lzo2, lzo_version, lzo, [http://www.oberhumer.com/opensource/lzo/]) TC_PKG_HAVE(lzo, LZO) --- transcode-1.0.2/export/tc_lzo.h~ 2005-07-04 10:15:57.000000000 +0300 +++ transcode-1.0.2/export/tc_lzo.h 2006-07-26 20:50:58.000000000 +0300 @@ -1,7 +1,6 @@ #ifndef TC_LZO_H #define TC_LZO_H -#define TC_LZO_MAGIC 0x4C5A4F32 /* LZO2 */ #define TC_LZO_FORMAT_YV12 1 #define TC_LZO_FORMAT_RGB24 2 @@ -14,6 +13,7 @@ unsigned int flags; unsigned char method; /* compression method */ unsigned char level; /* compression level */ + short pad; } tc_lzo_header_t; #endif /* TC_LZO_H */ --- transcode-1.0.2/export/export_lzo.c~ 2005-07-04 10:09:31.000000000 +0300 +++ transcode-1.0.2/export/export_lzo.c 2006-07-26 20:51:00.000000000 +0300 @@ -29,20 +29,13 @@ #include "aud_aux.h" #include "import/magic.h" -#include <lzo1x.h> -#if (LZO_VERSION > 0x1070) -# include <lzoutil.h> -#endif +#include <lzo/lzo1x.h> +#include <lzo/lzoutil.h> -#define LZO2 1 -#undef LZO2 - -#ifdef LZO2 #include "tc_lzo.h" -#endif #define MOD_NAME "export_lzo.so" -#define MOD_VERSION "v0.0.6 (2003-07-24)" +#define MOD_VERSION "v0.1.0 (2005-10-15)" #define MOD_CODEC "(video) LZO real-time compression | (audio) MPEG/AC3/PCM" static int verbose_flag=TC_QUIET; @@ -129,23 +122,14 @@ //force keyframe force_kf=1; -#ifdef LZO2 AVI_set_video(vob->avifile_out, vob->ex_v_width, vob->ex_v_height, vob->ex_fps, "LZO2"); -#else - AVI_set_video(vob->avifile_out, vob->ex_v_width, vob->ex_v_height, vob->ex_fps, "LZO1"); -#endif if (vob->avi_comment_fd>0) AVI_set_comment_fd(vob->avifile_out, vob->avi_comment_fd); if(!info_shown && verbose_flag) -#ifdef LZO2 fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n", MOD_NAME, "LZO2", vob->ex_fps, vob->ex_v_width, vob->ex_v_height); -#else - fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n", - MOD_NAME, "LZO1", vob->ex_fps, vob->ex_v_width, vob->ex_v_height); -#endif info_shown=1; @@ -183,9 +167,7 @@ int key; -#ifdef LZO2 tc_lzo_header_t h; -#endif if(param->flag == TC_VIDEO) { @@ -197,7 +179,6 @@ * compress from `in' to `out' with LZO1X-1 */ -#ifdef LZO2 r = lzo1x_1_compress(param->buffer, param->size, out+sizeof(h), &out_len, wrkmem); h.magic = TC_CODEC_LZO2; h.size = out_len; @@ -205,12 +186,9 @@ h.level = 1; h.flags = 0; h.flags |= ((codec==CODEC_RGB)?TC_LZO_FORMAT_RGB24:TC_LZO_FORMAT_YV12); + h.pad = 0; - // XXX tc_memcpy (out, &h, sizeof(h)); -#else - r = lzo1x_1_compress(param->buffer, param->size, out, &out_len, wrkmem); -#endif if (r == LZO_E_OK) { if(verbose & TC_DEBUG) printf("compressed %lu bytes into %lu bytes\n", @@ -225,17 +203,15 @@ /* check for an incompressible block */ if (out_len >= param->size) { if(verbose & TC_DEBUG) printf("[%s] block contains incompressible data\n", MOD_NAME); -#ifdef LZO2 h.flags |= TC_LZO_NOT_COMPRESSIBLE; -#endif + tc_memcpy(out+sizeof(h), param->buffer, param->size); + out_len = param->size; } //0.5.0-pre8: key = ((param->attributes & TC_FRAME_IS_KEYFRAME) || force_kf) ? 1:0; -#ifdef LZO2 out_len += sizeof(h); -#endif //0.6.2: switch outfile on "C" and -J pv //0.6.2: enforce auto-split at 2G (or user value) for normal AVI files transcode-1.0.4.external_dv.patch: --- NEW FILE transcode-1.0.4.external_dv.patch --- diff -up transcode-1.0.4/filter/preview/Makefile.am.original transcode-1.0.4/filter/preview/Makefile.am --- transcode-1.0.4/filter/preview/Makefile.am.original 2007-09-28 22:19:51.000000000 +0300 +++ transcode-1.0.4/filter/preview/Makefile.am 2007-09-28 22:23:12.000000000 +0300 @@ -53,7 +53,6 @@ filter_pv_la_LIBADD = \ EXTRA_DIST = \ display.h \ - dv_types.h \ filter_preview.h \ font_xpm.h \ pv.h Only in transcode-1.0.4.original/filter/preview: dv_types.h transcode-1.0.5-ImageMagick.patch: --- NEW FILE transcode-1.0.5-ImageMagick.patch --- diff -up transcode-1.0.5/configure.in.orig transcode-1.0.5/configure.in --- transcode-1.0.5/configure.in.orig 2008-07-05 21:28:03.000000000 +0300 +++ transcode-1.0.5/configure.in 2008-07-05 21:30:32.000000000 +0300 @@ -1235,7 +1235,7 @@ dnl IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS -lz -lm" dnl MagickWand libraries/headers always (?) are a superset of MagickCore ones. TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, Wand-config, [magick/api.h], - Magick, InitializeMagick, Wand, [http://www.imagemagick.org/]) + MagickWand, InitializeMagick, Wand, [http://www.imagemagick.org/]) TC_PKG_HAVE(imagemagick, IMAGEMAGICK) if test x"$have_imagemagick" = x"yes" ; then AC_CHECK_HEADER([wand/magick-wand.h], transcode-1.0.5-dvdread.patch: --- NEW FILE transcode-1.0.5-dvdread.patch --- diff -up transcode-1.0.5/configure.in.libdvdread transcode-1.0.5/configure.in --- transcode-1.0.5/configure.in.libdvdread 2008-07-05 21:33:59.000000000 +0300 +++ transcode-1.0.5/configure.in 2008-07-05 21:34:00.000000000 +0300 @@ -947,7 +947,7 @@ if test x"$have_libdvdread" = x"yes" ; t libdvdread_inc="no" save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $libdvdread_ii" - AC_CHECK_HEADER([dvdread/dvd_reader.h], + AC_CHECK_HEADER([libdvdread/dvd_reader.h], [AC_DEFINE([HAVE_LIBDVDREAD_INC], [1], [have libdvdread includes in separate path]) libdvdread_inc="yes"]) --- transcode-1.0.5/import/dvd_reader.c.libdvdread 2008-07-05 21:41:22.000000000 +0300 +++ transcode-1.0.5/import/dvd_reader.c 2008-07-05 21:41:37.000000000 +0300 @@ -31,11 +31,11 @@ #ifdef HAVE_LIBDVDREAD #ifdef HAVE_LIBDVDREAD_INC -#include <dvdread/dvd_reader.h> -#include <dvdread/ifo_types.h> -#include <dvdread/ifo_read.h> -#include <dvdread/nav_read.h> -#include <dvdread/nav_print.h> +#include <libdvdread/dvd_reader.h> +#include <libdvdread/ifo_types.h> +#include <libdvdread/ifo_read.h> +#include <libdvdread/nav_read.h> +#include <libdvdread/nav_print.h> #else #include <dvd_reader.h> #include <ifo_types.h> diff -up transcode-1.0.5/import/iodump.c.libdvdread transcode-1.0.5/import/iodump.c --- transcode-1.0.5/import/iodump.c.libdvdread 2008-07-05 21:43:27.000000000 +0300 +++ transcode-1.0.5/import/iodump.c 2008-07-05 21:43:52.000000000 +0300 @@ -31,7 +31,7 @@ #ifdef HAVE_LIBDVDREAD #ifdef HAVE_LIBDVDREAD_INC -#include <dvdread/dvd_reader.h> +#include <libdvdread/dvd_reader.h> #else #include <dvd_reader.h> #endif transcode-1.0.5-ffmpeg.patch: --- NEW FILE transcode-1.0.5-ffmpeg.patch --- diff -up transcode-1.0.5/acinclude.m4.orig transcode-1.0.5/acinclude.m4 diff -up transcode-1.0.5/configure.in.orig transcode-1.0.5/configure.in --- transcode-1.0.5/configure.in.orig 2008-07-03 20:02:33.000000000 +0300 +++ transcode-1.0.5/configure.in 2008-07-05 12:14:24.000000000 +0300 @@ -611,14 +611,14 @@ AC_ARG_ENABLE(libavcodec-static, esac], [enable_libavcodec_static=no]) LIBAVCODEC_EXTRA_LIBS="$LIBAVCODEC_EXTRA_LIBS $($PKG_CONFIG --libs libavcodec)" -TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/avcodec.h], - avcodec, avcodec_thread_init, FFMpeg, [http://www.ffmpeg.org/]) +TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/libavcodec/avcodec.h], + avcodec, avcodec_thread_init, libavcodec, [http://www.ffmpeg.org/]) if test x"$have_libavcodec" = x"yes" ; then save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $LIBAVCODEC_CFLAGS" AC_TRY_RUN([ #include <stdio.h> -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> int main() { @@ -640,8 +640,8 @@ main() ], [LIBAVCODEC_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`" LIBAVCODEC_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"], - [TC_PKG_ERROR(libavcodec, ffmpeg/avcodec.h, required, libavcodec, [http://www.ffmpeg.org], - [cannot compile ffmpeg/avcodec.h])], + [TC_PKG_ERROR(libavcodec, libavcodec/avcodec.h, required, libavcodec, [http://www.ffmpeg.org], + [cannot compile libavcodec/avcodec.h])], [echo $ac_n "cross compiling; assumed OK... $ac_c" LIBAVCODEC_VERSION="" LIBAVCODEC_BUILD=""]) @@ -820,7 +820,7 @@ AM_CONDITIONAL(HAVE_IBP, test x"$have_ib dnl dnl libpostproc dnl -TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, postprocess.h, +TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, libpostproc/postprocess.h, postproc, pp_postprocess, libpostproc, [http://www.ffmpeg.org/]) TC_PKG_HAVE(libpostproc, LIBPOSTPROC) diff -up transcode-1.0.5/export/export_ffmpeg.c.orig transcode-1.0.5/export/export_ffmpeg.c --- transcode-1.0.5/export/export_ffmpeg.c.orig 2008-07-03 20:37:46.000000000 +0300 +++ transcode-1.0.5/export/export_ffmpeg.c 2008-07-03 20:38:05.000000000 +0300 @@ -36,7 +36,7 @@ #include "vid_aux.h" // FIXME #undef EMULATE_FAST_INT -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> #if !defined(INFINITY) && defined(HUGE_VAL) #define INFINITY HUGE_VAL diff -up transcode-1.0.5/export/ffmpeg_cfg.h.orig transcode-1.0.5/export/ffmpeg_cfg.h --- transcode-1.0.5/export/ffmpeg_cfg.h.orig 2008-07-03 20:37:00.000000000 +0300 +++ transcode-1.0.5/export/ffmpeg_cfg.h 2008-07-03 20:37:20.000000000 +0300 @@ -2,7 +2,7 @@ #define __FFMPEG_CFG_H #include "libioaux/configs.h" -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> //char *lavc_param_vcodec = "mpeg4"; //extern int lavc_param_vbitrate; diff -up transcode-1.0.5/filter/filter_resample.c.orig transcode-1.0.5/filter/filter_resample.c --- transcode-1.0.5/filter/filter_resample.c.orig 2008-07-03 20:38:33.000000000 +0300 +++ transcode-1.0.5/filter/filter_resample.c 2008-07-03 20:38:50.000000000 +0300 @@ -30,7 +30,7 @@ #include "filter.h" #include "optstr.h" -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> static char * resample_buffer = NULL; static int bytes_per_sample; diff -up transcode-1.0.5/filter/pp/filter_pp.c.orig transcode-1.0.5/filter/pp/filter_pp.c --- transcode-1.0.5/filter/pp/filter_pp.c.orig 2008-07-05 12:28:19.000000000 +0300 +++ transcode-1.0.5/filter/pp/filter_pp.c 2008-07-05 12:28:48.000000000 +0300 @@ -35,7 +35,7 @@ #include <ctype.h> #include <inttypes.h> -#include "postprocess.h" +#include "libpostproc/postprocess.h" static pp_mode_t *mode[MAX_FILTER]; static pp_context_t *context[MAX_FILTER]; diff -up transcode-1.0.5/import/decode_lavc.c.orig transcode-1.0.5/import/decode_lavc.c --- transcode-1.0.5/import/decode_lavc.c.orig 2008-07-03 20:39:16.000000000 +0300 +++ transcode-1.0.5/import/decode_lavc.c 2008-07-03 20:39:44.000000000 +0300 @@ -31,7 +31,7 @@ #ifdef EMULATE_FAST_INT #undef EMULATE_FAST_INT #endif -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> #include "yuv2rgb.h" #define READ_BUFFER_SIZE (10*1024*1024) diff -up transcode-1.0.5/import/import_ffmpeg.c.orig transcode-1.0.5/import/import_ffmpeg.c --- transcode-1.0.5/import/import_ffmpeg.c.orig 2008-07-03 20:40:05.000000000 +0300 +++ transcode-1.0.5/import/import_ffmpeg.c 2008-07-03 20:40:25.000000000 +0300 @@ -38,7 +38,7 @@ static int capability_flag = TC_CAP_YUV // FIXME #undef EMULATE_FAST_INT -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> #include "libvo/yuv2rgb.h" #include "avilib/avilib.h" diff -up transcode-1.0.5/src/transcode.c.orig transcode-1.0.5/src/transcode.c --- transcode-1.0.5/src/transcode.c.orig 2008-01-05 16:37:15.000000000 +0200 +++ transcode-1.0.5/src/transcode.c 2008-07-03 20:41:27.000000000 +0300 @@ -4609,7 +4609,7 @@ int main(int argc, char *argv[]) { // unneeded object files from a .a file. #if 0 -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> void dummy_avcodec(void) { AVCodecContext *ctx = NULL; diff -up transcode-1.0.5/export/aud_aux.c.orig transcode-1.0.5/export/aud_aux.c --- transcode-1.0.5/export/aud_aux.c.orig 2008-07-05 23:14:48.000000000 +0300 +++ transcode-1.0.5/export/aud_aux.c 2008-07-05 23:15:33.000000000 +0300 @@ -31,7 +31,7 @@ #include <inttypes.h> #include <assert.h> -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> #include "aud_aux.h" #include "ac3.h" transcode-1.0.5-nuv.patch: --- NEW FILE transcode-1.0.5-nuv.patch --- diff -up transcode-1.0.5/import/nuv/RTjpegN.c.types transcode-1.0.5/import/nuv/RTjpegN.c --- transcode-1.0.5/import/nuv/RTjpegN.c.types 2004-10-18 02:01:08.000000000 +0300 +++ transcode-1.0.5/import/nuv/RTjpegN.c 2008-01-13 19:21:45.000000000 +0200 @@ -51,7 +51,7 @@ static const unsigned char RTjpeg_ZZ[64] 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 @@ static const __u64 RTjpeg_aan_tab[64]={ }; #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_width, RTjpeg_height; 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 @@ static const unsigned char RTjpeg_chrom_ /* 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 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm, // 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 @@ HIRNWEH: 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 @@ fprintf(stdout, "\n\n"); /* 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 @@ int RTjpeg_s2b(__s16 *data, __s8 *strm, /* 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 @@ fprintf(stdout, "\n\n"); #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 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm, #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 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm, 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 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm, 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 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm, } 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 @@ int RTjpeg_s2b(__s16 *data, __s8 *strm, 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_init(void) { } -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 @@ static mmx_t RTjpeg_zero =(mmx_t)(long l #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 @@ void RTjpeg_dct_init(void) 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 @@ void RTjpeg_dctY(__u8 *idata, __s16 *oda #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 @@ void RTjpeg_idct_init(void) 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 @@ static mmx_t fix_108n184 = (mmx_t)(long 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 @@ static mmx_t fix_108n184 = (mmx_t)(long 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 @@ void RTjpeg_init_data(void) 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 @@ Input: buf -> pointer to 128 ints for qu 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 @@ Input: buf -> pointer to 128 ints for qu */ -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 @@ void RTjpeg_init_compress(__u32 *buf, in 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 @@ void RTjpeg_init_compress(__u32 *buf, in 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 @@ void RTjpeg_init_decompress(__u32 *buf, // 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 int8_t * bp1 = bp + (RTjpeg_width<<3); + register int8_t * bp2 = bp + RTjpeg_Ysize; + register int8_t * bp3 = bp2 + (RTjpeg_Csize>>1); register int i, j, k; #ifdef MMX @@ -2905,11 +2905,11 @@ int RTjpeg_compressYUV420(__s8 *sp, unsi 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 int8_t * bp2 = bp + RTjpeg_Ysize; + register int8_t * bp3 = bp2 + RTjpeg_Csize; register int i, j, k; #ifdef MMX @@ -2949,9 +2949,9 @@ int RTjpeg_compressYUV422(__s8 *sp, unsi 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 @@ int RTjpeg_compress8(__s8 *sp, unsigned 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 int8_t * bp2 = bp + RTjpeg_Ysize; + register int8_t * bp3 = bp2 + (RTjpeg_Csize); int i, j,k; #ifdef MMX @@ -3025,11 +3025,11 @@ void RTjpeg_decompressYUV422(__s8 *sp, _ #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 int8_t * bp1 = bp + (RTjpeg_width<<3); + register int8_t * bp2 = bp + RTjpeg_Ysize; + register int8_t * bp3 = bp2 + (RTjpeg_Csize>>1); int i, j,k; #ifdef MMX @@ -3087,7 +3087,7 @@ void RTjpeg_decompressYUV420(__s8 *sp, _ #endif } -void RTjpeg_decompress8(__s8 *sp, __u8 *bp) +void RTjpeg_decompress8(int8_t *sp, uint8_t *bp) { int i, j; @@ -3126,7 +3126,7 @@ void RTjpeg_init_mcompress(void) 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 @@ void RTjpeg_init_mcompress(void) #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 @@ int RTjpeg_bcomp(__s16 *old, mmx_t *mask 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 @@ int RTjpeg_bcomp(__s16 *old, mmx_t *mask } #else -int RTjpeg_bcomp(__s16 *old, __u16 *mask) +int RTjpeg_bcomp(int16_t *old, uint16_t *mask) { int i; @@ -3192,7 +3192,7 @@ int RTjpeg_bcomp(__s16 *old, __u16 *mask 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 @@ void RTjpeg_set_test(int i) 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 int8_t * bp1 = bp + (RTjpeg_width<<3); + register int8_t * bp2 = bp + RTjpeg_Ysize; + register int8_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 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns 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_mcompressYUV420(__s8 *sp, uns } -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 int8_t * bp2; + register int8_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)(((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; @@ -3328,7 +3328,7 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns 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 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns 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 @@ int RTjpeg_mcompress8(__s8 *sp, unsigned 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 @@ void RTjpeg_color_init(void) #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_yuv422rgb(__u8 *buf, __u8 *r } -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_yuv420rgb(__u8 *buf, __u8 *r } -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_yuvrgb32(__u8 *buf, __u8 *rg } } -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_yuvrgb24(__u8 *buf, __u8 *rg } } -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 @@ void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rg /* 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); } diff -up transcode-1.0.5/import/nuv/RTjpegN.h.types transcode-1.0.5/import/nuv/RTjpegN.h --- transcode-1.0.5/import/nuv/RTjpegN.h.types 2003-03-08 15:42:48.000000000 +0200 +++ transcode-1.0.5/import/nuv/RTjpegN.h 2008-01-13 19:26:18.000000000 +0200 @@ -22,37 +22,29 @@ */ -#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 + #include <stdint.h> -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); diff -up transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c.types transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c --- transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c.types 2008-01-13 19:30:54.000000000 +0200 +++ transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c 2008-01-13 19:31:55.000000000 +0200 @@ -467,9 +467,9 @@ unsigned char *decode_vid_frame(struct r // rtjpeg decompression if (compoff) { - RTjpeg_decompressYUV420((__s8 *)strm, rtjpeg_vid_buf); + RTjpeg_decompressYUV420((int8_t *)strm, rtjpeg_vid_buf); } else { - RTjpeg_decompressYUV420((__s8 *)buf2, rtjpeg_vid_buf); + RTjpeg_decompressYUV420((int8_t *)buf2, rtjpeg_vid_buf); } return(rtjpeg_vid_buf); diff -up transcode-1.0.5/import/nuv/README.rtjpeg.types transcode-1.0.5/import/nuv/README.rtjpeg --- transcode-1.0.5/import/nuv/README.rtjpeg.types 2003-03-08 15:42:48.000000000 +0200 +++ transcode-1.0.5/import/nuv/README.rtjpeg 2008-01-13 18:59:23.000000000 +0200 @@ -82,7 +82,7 @@ RTjpeg Functions: ================= (some functions may not yet be implemented for all module types) -extern void RTjpeg_init_Q(__u8 Q); +extern void RTjpeg_init_Q(uint8_t Q); ---------------------------------- Change the quality factor for future compressions/decompressions to Q. Q=255 ==> IJG jpeg 75% (max) @@ -90,7 +90,7 @@ Q=128 ==> IJG jpeg 50% Q=32 (min usable) Q=1 (abstract art) -extern void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q); +extern void RTjpeg_init_compress(uint32_t *buf, int width, int height, uint8_t Q); ---------------------------------------------------------------------------- Initialise the compressor. *buf is a pointer to 128 ints. The de-quantizer values are stored in this @@ -100,13 +100,13 @@ between versions (although it is probabl height is the height of the Y component of the image. Q is the quality factor (see above) -extern void RTjpeg_init_decompress(__u32 *buf, int width, int height); +extern void RTjpeg_init_decompress(uint32_t *buf, int width, int height); ---------------------------------------------------------------------- Initialise decompressor (and color convertor). *buf is a pointer to the 128 ints produced by init_compress. width and height, as before. -extern int RTjpeg_compress(__s8 *sp, unsigned char *bp); +extern int RTjpeg_compress(int8_t *sp, unsigned char *bp); -------------------------------------------------------- Compress the image. *sp is a pointer to the output data (for safety, this buffer should be as @@ -114,7 +114,7 @@ Compress the image. *bp is a pointer to the input data (YUV420P format). RETURN: the number of bytes actually used for the output stream. -extern void RTjpeg_decompress(__s8 *sp, __u8 *bp); +extern void RTjpeg_decompress(int8_t *sp, uint8_t *bp); -------------------------------------------------- Decompress the image. as before (no RETURN). @@ -123,7 +123,7 @@ extern void RTjpeg_init_mcompress(void); ---------------------------------------- Initialise interframe compression. -extern int RTjpeg_mcompress(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask); +extern int RTjpeg_mcompress(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask); ----------------------------------------------------------------------------------- Perform interframe compression. *sp, *bp as for compress @@ -141,32 +141,32 @@ copy of the reference image. This is us test multiple compression factors for compressed block size. Remember to call mcompress with test mode = 0 BEFORE transmitting an encoded block.) -extern void RTjpeg_yuvrgb(__u8 *buf, __u8 *rgb); +extern void RTjpeg_yuvrgb(uint8_t *buf, uint8_t *rgb); ------------------------------------------------ Convert decompressed YUV420P data to RGB data *buf pointer to YUV420P data *rgb pointer to RGB data -extern void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb); +extern void RTjpeg_yuvrgb32(uint8_t *buf, uint8_t *rgb); -------------------------------------------------- convert to RGB32 data (display order) -extern void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb); +extern void RTjpeg_yuvrgb24(uint8_t *buf, uint8_t *rgb); -------------------------------------------------- convert to RGB24 (display order) -extern void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb); +extern void RTjpeg_yuvrgb16(uint8_t *buf, uint8_t *rgb); -------------------------------------------------- convert to RGB 565 -extern void RTjpeg_yuvrgb8(__u8 *buf, __u8 *rgb); +extern void RTjpeg_yuvrgb8(uint8_t *buf, uint8_t *rgb); ------------------------------------------------- convert to grey-scale (grin) -extern void RTjpeg_double32(__u32 *buf); -extern void RTjpeg_double24(__u8 *buf); -extern void RTjpeg_double16(__u16 *buf); -extern void RTjpeg_double8(__u8 *buf); +extern void RTjpeg_double32(uint32_t *buf); +extern void RTjpeg_double24(uint8_t *buf); +extern void RTjpeg_double16(uint16_t *buf); +extern void RTjpeg_double8(uint8_t *buf); -------------------------------------- convert the image pointed to by *buf to double size (size is determined by with and height from init_decompress). transcode-pvmbin.patch: --- NEW FILE transcode-pvmbin.patch --- --- transcode-1.0.0/pvm3/Makefile.in.pvmbin 2005-07-12 10:40:55.000000000 +0300 +++ transcode-1.0.0/pvm3/Makefile.in 2005-07-21 19:41:14.000000000 +0300 @@ -763,11 +763,6 @@ uninstall-info-am uninstall-pkgLTLIBRARIES -install-data-local: - @$(NORMAL_INSTALL) - if test ! -e $(bindir)/pvmgs; then \ - ln -s $(PVM3_PVMGS) $(bindir)/pvmgs; \ - fi; # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- transcode-1.0.0/pvm3/Makefile.am.pvmbin 2005-07-12 10:25:16.000000000 +0300 +++ transcode-1.0.0/pvm3/Makefile.am 2005-07-21 19:41:35.000000000 +0300 @@ -43,8 +43,3 @@ pvm_version.h \ vob_pack_unpack.h -install-data-local: - @$(NORMAL_INSTALL) - if test ! -e $(bindir)/pvmgs; then \ - ln -s $(PVM3_PVMGS) $(bindir)/pvmgs; \ - fi; --- NEW FILE transcode.spec --- # TODO (sometime, maybe): # - avifile (ick): http://avifile.sourceforge.net/ # - LoRS/IBP: http://loci.cs.utk.edu/ # I bet this _will_ change in the future. %define pvmdir %{_datadir}/pvm3 Name: transcode Version: 1.0.5 Release: 4%{?dist} Summary: Video stream processing tool Group: Applications/Multimedia License: GPLv2+ URL: http://www.transcoding.org/ Source0: http://fromani.exit1.org/%{name}-%{version}.tar.bz2 Patch0: %{name}-pvmbin.patch Patch2: %{name}-1.0.2-lzo2.patch Patch3: transcode-1.0.4.external_dv.patch Patch6: transcode-1.0.5-nuv.patch Patch7: transcode-1.0.5-ffmpeg.patch Patch8: transcode-1.0.5-dvdread.patch Patch9: transcode-1.0.5-ImageMagick.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel BuildRequires: libvorbis-devel BuildRequires: libdvdread-devel >= 4.1.3 BuildRequires: a52dec-devel BuildRequires: libxml2-devel BuildRequires: libjpeg-devel BuildRequires: lzo-devel >= 2 BuildRequires: mjpegtools-devel BuildRequires: libdv-devel BuildRequires: xvidcore-devel BuildRequires: libquicktime-devel >= 0.9.8 BuildRequires: lame-devel >= 3.89 BuildRequires: SDL-devel >= 1.1.6 BuildRequires: ffmpeg-devel >= 0.4.9-0.46.20080614 BuildRequires: mpeg2dec-devel >= 0.4.0-0.lvn.3.b BuildRequires: pvm BuildRequires: libtheora-devel BuildRequires: libXv-devel BuildRequires: libXaw-devel BuildRequires: libXpm-devel BuildRequires: freetype-devel %ifarch %{ix86} BuildRequires: nasm %endif BuildRequires: ImageMagick-devel >= 6.4.0.10 BuildRequires: libmpeg3-devel # libtool + autotools for patch2, autoreconf BuildRequires: libtool Requires: xvidcore %description transcode is a text console video-stream processing tool. It supports elementary video and audio frame transformations. Some example modules are included to enable import of MPEG-1/2, Digital Video, and other formats. It also includes export modules for writing to AVI files with DivX, OpenDivX, XviD, Digital Video or other codecs. Direct DVD transcoding is also supported. A set of tools is available to extract and decode the sources into raw video/audio streams for import and to enable post-processing of AVI files. %prep %setup -q %patch0 -p1 -b .pvmbin %patch2 -p1 -b .lzo %patch3 -p1 -b .external_dv rm filter/preview/dv_types.h %patch6 -p1 -b .types %patch7 -p1 -b .ffmpeg %patch8 -p1 -b .libdvdread %patch9 -p1 -b .ImageMagick %build autoreconf # for patch2, and fixes standard rpaths on lib64 archs for file in docs/{man/*.1,export_mp2.txt,export_mpeg.txt,filter_dnr.txt} \ AUTHORS ChangeLog README docs/README.vcd ; do iconv -f iso-8859-1 -t utf-8 $file > $file.utf8 && mv -f $file.utf8 $file done %configure \ --disable-dependency-tracking \ --with-x \ --enable-netstream \ --enable-v4l \ --enable-oss \ --enable-libpostproc \ --enable-freetype2 \ --enable-ogg \ --enable-vorbis \ --enable-theora \ --enable-pvm3 \ --with-pvm3-libs=`ls -1d %{pvmdir}/lib/LINUX*` \ --with-pvm3-includes=%{pvmdir}/include \ --enable-libdv \ --enable-libquicktime \ --enable-lzo \ --enable-a52 \ --enable-a52-default-decoder \ --enable-libxml2 \ --enable-mjpegtools \ --enable-sdl \ --enable-imagemagick \ --enable-libmpeg3 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __documentation make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_docdir}/transcode/ __documentation rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README* TODO __documentation/* %{_bindir}/* %{_libdir}/%{name} %{_mandir}/man1/*.1* %changelog * Thu Aug 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.5-4 - rebuild * Thu Jul 3 2008 <david(a)juran.se&gt; - 1.0.5-3 - updated for new ffmpeg directory layout - updated for new libdvdread directory layout - libMagick split in libMagicCore and libMagicWand * Thu Jan 10 2008 David Juran <david(a)juran.se&gt; - 1.0.5-1 - Upgrade to 1.0.5 - exchanve nuv patch to the one from HEAD - drop dep-cleanup patch as it's no longer needed - drop shared-libmpeg3 patch as it's no longer needed * Sun Dec 9 2007 David Juran <david(a)juran.se&gt; - 1.0.4-7 - Fix build error in nuv import * Sun Dec 9 2007 David Juran <david(a)juran.se&gt; - 1.0.4-6 - Rebuild for new libdvdread * Tue Oct 16 2007 David Juran <david(a)juran.se&gt; - 1.0.4-5 - use shared libmpeg3 - use a52dec default decoder as recommended - License is GPLv2+ * Mon Oct 8 2007 David Juran <david(a)juran.se&gt; - 1.0.4-4 - enable libmpeg3 for rpmfusion * Sat Sep 29 2007 David Juran <david(a)juran.se&gt; - 1.0.4-3 - Drop indirect dependencies * Fri Sep 28 2007 David Juran <david(a)juran.se&gt; - 1.0.4-2 - Get rid of glib dependency * Mon Sep 24 2007 David Juran <david(a)juran.se&gt; - 1.0.4-1 - updated to 1.0.4 * Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.3-1 - 1.0.3. - Convert more docs to UTF-8. * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.0.2-12 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Mon Sep 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-11 - Fix build with recent ffmpeg. - Don't build with libfame. - Specfile cleanup. * Wed Jul 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-10 - Backport upstream changes for lzo2, require it. - Apply upstream fix for compare filter never returning (#987). - Avoid standard rpaths on lib64 archs. * Wed Jul 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-4 - Rebuild for new ImageMagick (#1066). - Fix some cosmetic rpmlint warnings. * Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-3 - Rebuild for new ffmpeg. * Tue Mar 14 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.2-2 - drop "0.lvn" from release * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Thu Jan 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-0.lvn.2 - 1.0.2, libquicktime detection/build fixed upstream. - Rebuild against new ffmpeg. - Drop zero Epochs. - Adapt to modular X. * Sat Oct 8 2005 Dams <anvil[AT]livna.org> - 0:1.0.0-0.lvn.4 - Really rebuilding against new mjpegtools * Mon Sep 26 2005 Thorsten Leemhuis <fedoral[AT]leemhuis.info> - 0:1.0.0-0.lvn.3 - Rebuilt against new mjpegtools * Tue Aug 30 2005 Dams <anvil[AT]livna.org> - 0:1.0.0-0.lvn.2 - Rebuilt against new mjpegtools * Thu Jul 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.1 - 1.0.0, no more SSE/gcc4 special casing needed, pvmlink patch applied upstream * Tue Jul 5 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.0.4.rc1 - 1.0.0rc1, gcc4 patch no longer needed (but SSE/gcc4 problems persist). - Add upstream patch to fix PVM linking. - Clean up obsolete pre-FC2 support. * Sat Jun 18 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0.0-0.lvn.0.3.beta3 - Add "--without sse" rpmbuild option, needed with gcc4. * Mon Jun 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0.0-0.lvn.0.2.beta3 - Add gcc4.patch from plf-package with a small addition from cvs * Sun May 1 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0.0-0.lvn.0.1.beta3 - 1.0.0beta3. - Enable PVM support. * Sun Feb 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.14-0.lvn.5 - Requires: xvidcore. * Thu Jan 13 2005 Dams <anvil[AT]livna.org> - 0:0.6.14-0.lvn.4 - buildroot -> RPM_BUILD_ROOT, for consistency * Sun Jan 02 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.14-0.lvn.3 - Use --with-mod-path={_libdir}/transcode on x86_64 - use make install DESTDIR=%%{buildroot} instead makeinstall; adjust doc-install * Thu Dec 23 2004 Dams <anvil[AT]livna.org> - 0:0.6.14-0.lvn.2 - Workaround for bad Magick-config * Tue Dec 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.14-0.lvn.1 - Update to 0.6.14. - Build with whatever the compiler supports; CPU features detected at runtime. - Build with dependency tracking disabled. * Thu Jul 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.5 - Remove ffmpeg-devel and libpostproc-devel build deps, transcode uses its internal ones. * Tue Jul 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.4 - Make xvid4 (XviD 1.0.x) the default xvid export module. - Convert man pages to UTF-8. * Sun Jul 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.3 - Build with theora by default, use "--without theora" to disable. - BuildRequire libexif-devel to work around yet another missing dependency in ImageMagick-devel. - Replace hardcoded i686 BuildArch with i686+ ExclusiveArchs. - Enable MMX and CMOV (also) when built on ia64 and x86_64. - Enable SSE by default (only) on ia64 and x86_64; use "--with sse" to enable it on other archs. - Rebuild with libfame 0.9.1. - First cut at building with pvm support (incomplete, disabled). * Sat May 8 2004 Dams <anvil[AT]livna.org> - 0:0.6.12-0.lvn.2 - Added url in Source0 * Fri Jan 9 2004 Dams <anvil[AT]livna.org> 0:0.6.12-0.lvn.1 - Updated to 0.6.12 * Sun Nov 9 2003 Dams <anvil[AT]livna.org> 0:0.6.11-0.lvn.1 - Updated to 0.6.11 - exclude -> rm * Mon Sep 29 2003 Dams <anvil[AT]livna.org> 0:0.6.10-0.fdr.2 - BuildArch i686 * Tue Sep 9 2003 Dams <anvil[AT]livna.org> 0:0.6.10-0.fdr.1 - Updated to 0.6.10 - Updated doc files - Dropped Patch1 and Patch2 (applied upstream) * Thu Aug 14 2003 Dams <anvil[AT]livna.org> 0:0.6.9-0.fdr.1 - Updated to 0.6.9 * Thu Jul 31 2003 Dams <anvil[AT]livna.org> 0:0.6.8-0.fdr.2 - Applied filter_resample-segfault-fix-0.6.8 patch from upstream * Tue Jul 8 2003 Dams <anvil[AT]livna.org> 0:0.6.8-0.fdr.1 - Updated to 0.6.8 - Removed glib/gtk+ version in BuildReqs * Mon Jun 2 2003 Warren Togami <warren(a)togami.com&gt; 0:0.6.7-0.fdr.3 - Remove smp_flags due to build failure * Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.7-0.fdr.2 - Enabled text filter * Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.1 - Updated to 0.6.7 - Updated BuildRequires * Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.3 - Removed URL in Source0 * Thu May 22 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.2 - Changed URL in Source0 * Thu May 22 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.1 - Updated to 0.6.6 - Updated doc entry - Slightly modified ifarch condition for nasm * Sat May 10 2003 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.2 - Re-added ffmpeg-devel BuildRequires - Added libquicktime-devel libpostproc-devel and nasm BuildRequires * Sat May 10 2003 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.1 - Updated to 0.6.4 - Added missing BuildRequires - exclude some ".la" files - buildroot -> RPM_BUILD_ROOT * Wed Apr 23 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/transcode/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:55:16 -0000 1.1 +++ .cvsignore 7 Aug 2008 18:09:52 -0000 1.2 @@ -0,0 +1 @@ +transcode-1.0.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/transcode/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:55:16 -0000 1.1 +++ sources 7 Aug 2008 18:09:52 -0000 1.2 @@ -0,0 +1 @@ +124a6055d304fa2d8577d7380e2bcb0c transcode-1.0.5.tar.bz2