April 2006 - ffmpeg-cvslog - lists.ffmpeg.org

CVS: ffmpeg/libavcodec kmvc.c, NONE, 1.1 Makefile, 1.250, 1.251 allcodecs.c, 1.134, 1.135 avcodec.h, 1.461, 1.462
by kostya＠mplayerhq.hu 03 Apr '07

03 Apr '07

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv12938/libavcodec Modified Files: Makefile allcodecs.c avcodec.h Added Files: kmvc.c Log Message: KMVC (used in Worms games) decoder. Works fine with samples from MPHQ --- NEW FILE: kmvc.c --- /* * KMVC decoder * Copyright (c) 2006 Konstantin Shishkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ /** * @file kmvc.c * Karl Morton's Video Codec decoder */ #include <stdio.h> #include <stdlib.h> #include "common.h" #include "avcodec.h" #define KMVC_KEYFRAME 0x80 #define KMVC_PALETTE 0x40 #define KMVC_METHOD 0x0F /* * Decoder context */ typedef struct KmvcContext { AVCodecContext *avctx; AVFrame pic; int setpal; int palsize; uint32_t pal[256]; uint8_t *cur, *prev; uint8_t *frm0, *frm1; } KmvcContext; typedef struct BitBuf { int bits; int bitbuf; } BitBuf; #define BLK(data, x, y) data[(x) + (y) * 320] #define kmvc_init_getbits(bb, src) bb.bits = 7; bb.bitbuf = *src++; #define kmvc_getbit(bb, src, res) {\ res = 0; \ if (bb.bitbuf & (1 << bb.bits)) res = 1; \ bb.bits--; \ if(bb.bits == -1) { \ bb.bitbuf = *src++; \ bb.bits = 7; \ } \ } static void kmvc_decode_intra_8x8(KmvcContext * ctx, uint8_t * src, int w, int h) { BitBuf bb; int res, val; int i, j; int bx, by; int l0x, l1x, l0y, l1y; int mx, my; kmvc_init_getbits(bb, src); for (by = 0; by < h; by += 8) for (bx = 0; bx < w; bx += 8) { kmvc_getbit(bb, src, res); if (!res) { // fill whole 8x8 block val = *src++; for (i = 0; i < 64; i++) BLK(ctx->cur, bx + (i & 0x7), by + (i >> 3)) = val; } else { // handle four 4x4 subblocks for (i = 0; i < 4; i++) { l0x = bx + (i & 1) * 4; l0y = by + (i & 2) * 2; kmvc_getbit(bb, src, res); if (!res) { kmvc_getbit(bb, src, res); if (!res) { // fill whole 4x4 block val = *src++; for (j = 0; j < 16; j++) BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = val; } else { // copy block from already decoded place val = *src++; mx = val & 0xF; my = val >> 4; for (j = 0; j < 16; j++) BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = BLK(ctx->cur, l0x + (j & 3) - mx, l0y + (j >> 2) - my); } } else { // descend to 2x2 sub-sub-blocks for (j = 0; j < 4; j++) { l1x = l0x + (j & 1) * 2; l1y = l0y + (j & 2); kmvc_getbit(bb, src, res); if (!res) { kmvc_getbit(bb, src, res); if (!res) { // fill whole 2x2 block val = *src++; BLK(ctx->cur, l1x, l1y) = val; BLK(ctx->cur, l1x + 1, l1y) = val; BLK(ctx->cur, l1x, l1y + 1) = val; BLK(ctx->cur, l1x + 1, l1y + 1) = val; } else { // copy block from already decoded place val = *src++; mx = val & 0xF; my = val >> 4; BLK(ctx->cur, l1x, l1y) = BLK(ctx->cur, l1x - mx, l1y - my); BLK(ctx->cur, l1x + 1, l1y) = BLK(ctx->cur, l1x + 1 - mx, l1y - my); BLK(ctx->cur, l1x, l1y + 1) = BLK(ctx->cur, l1x - mx, l1y + 1 - my); BLK(ctx->cur, l1x + 1, l1y + 1) = BLK(ctx->cur, l1x + 1 - mx, l1y + 1 - my); } } else { // read values for block BLK(ctx->cur, l1x, l1y) = *src++; BLK(ctx->cur, l1x + 1, l1y) = *src++; BLK(ctx->cur, l1x, l1y + 1) = *src++; BLK(ctx->cur, l1x + 1, l1y + 1) = *src++; } } } } } } } static void kmvc_decode_inter_8x8(KmvcContext * ctx, uint8_t * src, int w, int h) { BitBuf bb; int res, val; int i, j; int bx, by; int l0x, l1x, l0y, l1y; int mx, my; kmvc_init_getbits(bb, src); for (by = 0; by < h; by += 8) for (bx = 0; bx < w; bx += 8) { kmvc_getbit(bb, src, res); if (!res) { kmvc_getbit(bb, src, res); if (!res) { // fill whole 8x8 block val = *src++; for (i = 0; i < 64; i++) BLK(ctx->cur, bx + (i & 0x7), by + (i >> 3)) = val; } else { // copy block from previous frame for (i = 0; i < 64; i++) BLK(ctx->cur, bx + (i & 0x7), by + (i >> 3)) = BLK(ctx->prev, bx + (i & 0x7), by + (i >> 3)); } } else { // handle four 4x4 subblocks for (i = 0; i < 4; i++) { l0x = bx + (i & 1) * 4; l0y = by + (i & 2) * 2; kmvc_getbit(bb, src, res); if (!res) { kmvc_getbit(bb, src, res); if (!res) { // fill whole 4x4 block val = *src++; for (j = 0; j < 16; j++) BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = val; } else { // copy block val = *src++; mx = (val & 0xF) - 8; my = (val >> 4) - 8; for (j = 0; j < 16; j++) BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = BLK(ctx->prev, l0x + (j & 3) + mx, l0y + (j >> 2) + my); } } else { // descend to 2x2 sub-sub-blocks for (j = 0; j < 4; j++) { l1x = l0x + (j & 1) * 2; l1y = l0y + (j & 2); kmvc_getbit(bb, src, res); if (!res) { kmvc_getbit(bb, src, res); if (!res) { // fill whole 2x2 block val = *src++; BLK(ctx->cur, l1x, l1y) = val; BLK(ctx->cur, l1x + 1, l1y) = val; BLK(ctx->cur, l1x, l1y + 1) = val; BLK(ctx->cur, l1x + 1, l1y + 1) = val; } else { // copy block val = *src++; mx = (val & 0xF) - 8; my = (val >> 4) - 8; BLK(ctx->cur, l1x, l1y) = BLK(ctx->prev, l1x + mx, l1y + my); BLK(ctx->cur, l1x + 1, l1y) = BLK(ctx->prev, l1x + 1 + mx, l1y + my); BLK(ctx->cur, l1x, l1y + 1) = BLK(ctx->prev, l1x + mx, l1y + 1 + my); BLK(ctx->cur, l1x + 1, l1y + 1) = BLK(ctx->prev, l1x + 1 + mx, l1y + 1 + my); } } else { // read values for block BLK(ctx->cur, l1x, l1y) = *src++; BLK(ctx->cur, l1x + 1, l1y) = *src++; BLK(ctx->cur, l1x, l1y + 1) = *src++; BLK(ctx->cur, l1x + 1, l1y + 1) = *src++; } } } } } } } static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, uint8_t * buf, int buf_size) { KmvcContext *const ctx = (KmvcContext *) avctx->priv_data; uint8_t *out, *src; int i; int header; int blocksize; if (ctx->pic.data[0]) avctx->release_buffer(avctx, &ctx->pic); ctx->pic.reference = 1; ctx->pic.buffer_hints = FF_BUFFER_HINTS_VALID; if (avctx->get_buffer(avctx, &ctx->pic) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } header = buf[0]; buf++; if (header & KMVC_KEYFRAME) { ctx->pic.key_frame = 1; ctx->pic.pict_type = FF_I_TYPE; } else { ctx->pic.key_frame = 0; ctx->pic.pict_type = FF_P_TYPE; } if (header & KMVC_PALETTE) { ctx->pic.palette_has_changed = 1; // palette starts from index 1 and has 127 entries for (i = 1; i <= ctx->palsize; i++) { ctx->pal[i] = (buf[0] << 16) | (buf[1] << 8) | buf[2]; buf += 3; } } if (ctx->setpal) { ctx->setpal = 0; ctx->pic.palette_has_changed = 1; } /* make the palette available on the way out */ memcpy(ctx->pic.data[1], ctx->pal, 1024); blocksize = *buf++; if (blocksize != 8) { av_log(avctx, AV_LOG_ERROR, "Block size = %i\n", blocksize); return -1; } memset(ctx->cur, 0, 320 * 200); switch (header & KMVC_METHOD) { case 3: kmvc_decode_intra_8x8(ctx, buf, avctx->width, avctx->height); break; case 4: kmvc_decode_inter_8x8(ctx, buf, avctx->width, avctx->height); break; default: av_log(avctx, AV_LOG_ERROR, "Unknown compression method %i\n", header & KMVC_METHOD); return -1; } out = ctx->pic.data[0]; src = ctx->cur; for (i = 0; i < avctx->height; i++) { memcpy(out, src, avctx->width); src += 320; out += ctx->pic.linesize[0]; } /* flip buffers */ if (ctx->cur == ctx->frm0) { ctx->cur = ctx->frm1; ctx->prev = ctx->frm0; } else { ctx->cur = ctx->frm0; ctx->prev = ctx->frm1; } *data_size = sizeof(AVFrame); *(AVFrame *) data = ctx->pic; /* always report that the buffer was completely consumed */ return buf_size; } /* * Init kmvc decoder */ static int decode_init(AVCodecContext * avctx) { KmvcContext *const c = (KmvcContext *) avctx->priv_data; int i; c->avctx = avctx; avctx->has_b_frames = 0; c->pic.data[0] = NULL; if (avctx->width > 320 || avctx->height > 200) { av_log(avctx, AV_LOG_ERROR, "KMVC supports frames <= 320x200\n"); return -1; } c->frm0 = av_mallocz(320 * 200); c->frm1 = av_mallocz(320 * 200); c->cur = c->frm0; c->prev = c->frm1; for (i = 0; i < 256; i++) { c->pal[i] = i * 0x10101; } if (avctx->extradata_size < 12) { av_log(NULL, 0, "Extradata missing, decoding may not work properly...\n"); c->palsize = 127; } else { c->palsize = LE_16(avctx->extradata + 10); } if (avctx->extradata_size == 1036) { // palette in extradata uint8_t *src = avctx->extradata + 12; for (i = 0; i < c->palsize; i++) { c->pal[i] = LE_32(src); src += 4; } c->setpal = 1; } avctx->pix_fmt = PIX_FMT_PAL8; return 0; } /* * Uninit kmvc decoder */ static int decode_end(AVCodecContext * avctx) { KmvcContext *const c = (KmvcContext *) avctx->priv_data; if (c->frm0) av_free(c->frm0); if (c->frm1) av_free(c->frm1); if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); return 0; } AVCodec kmvc_decoder = { "kmvc", CODEC_TYPE_VIDEO, CODEC_ID_KMVC, sizeof(KmvcContext), decode_init, NULL, decode_end, decode_frame }; Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.250 retrieving revision 1.251 diff -u -d -r1.250 -r1.251 --- Makefile 29 Mar 2006 10:59:09 -0000 1.250 +++ Makefile 7 Apr 2006 16:59:57 -0000 1.251 @@ -98,6 +98,9 @@ ifeq ($(CONFIG_INTERPLAY_VIDEO_DECODER),yes) OBJS+= interplayvideo.o endif +ifeq ($(CONFIG_KMVC_DECODER),yes) + OBJS+= kmvc.o +endif ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),) OBJS+= lcl.o endif Index: allcodecs.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- allcodecs.c 31 Mar 2006 13:06:24 -0000 1.134 +++ allcodecs.c 7 Apr 2006 16:59:57 -0000 1.135 @@ -289,6 +289,9 @@ #ifdef CONFIG_LOCO_DECODER register_avcodec(&loco_decoder); #endif //CONFIG_LOCO_DECODER +#ifdef CONFIG_KMVC_DECODER + register_avcodec(&kmvc_decoder); +#endif //CONFIG_KMVC_DECODER #ifdef CONFIG_WNV1_DECODER register_avcodec(&wnv1_decoder); #endif //CONFIG_WNV1_DECODER Index: avcodec.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v retrieving revision 1.461 retrieving revision 1.462 diff -u -d -r1.461 -r1.462 --- avcodec.h 5 Apr 2006 18:56:22 -0000 1.461 +++ avcodec.h 7 Apr 2006 16:59:57 -0000 1.462 @@ -21,8 +21,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(8<<8)+0) -#define LIBAVCODEC_VERSION 51.8.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(9<<8)+0) +#define LIBAVCODEC_VERSION 51.9.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -120,6 +120,7 @@ CODEC_ID_AVS, CODEC_ID_SMACKVIDEO, CODEC_ID_NUV, + CODEC_ID_KMVC, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE= 0x10000,

5 7

CVS: ffmpeg/libavformat tta.c, NONE, 1.1 Makefile, 1.121, 1.122 allformats.c, 1.57, 1.58 avformat.h, 1.141, 1.142
by alex＠mplayerhq.hu 30 Mar '07

30 Mar '07

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv22032 Modified Files: Makefile allformats.c avformat.h Added Files: tta.c Log Message: tta demuxer, also usable for moving tta audio data into an other container --- NEW FILE: tta.c --- /* * TTA demuxer * Copyright (c) 2006 Alex Beregszaszi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "avformat.h" #define ALT_BITSREAM_READER_LE #include "bitstream.h" typedef struct { int totalframes, currentframe; uint32_t *seektable; } TTAContext; static int tta_probe(AVProbeData *p) { const uint8_t *d = p->buf; if (p->buf_size < 4) return 0; if (d[0] == 'T' && d[1] == 'T' && d[2] == 'A' && d[3] == '1') return 80; return 0; } static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) { TTAContext *c = s->priv_data; AVStream *st; int i, channels, bps, samplerate, datalen, framelen, start; start = url_ftell(&s->pb); if (get_le32(&s->pb) != ff_get_fourcc("TTA1")) return -1; // not tta file url_fskip(&s->pb, 2); // FIXME: flags channels = get_le16(&s->pb); bps = get_le16(&s->pb); samplerate = get_le32(&s->pb); datalen = get_le32(&s->pb); url_fskip(&s->pb, 4); // header crc framelen = 1.04489795918367346939 * samplerate; c->totalframes = datalen / framelen + ((datalen % framelen) ? 1 : 0); c->currentframe = 0; c->seektable = av_mallocz(sizeof(uint32_t)*c->totalframes); if (!c->seektable) return AVERROR_NOMEM; for (i = 0; i < c->totalframes; i++) c->seektable[i] = get_le32(&s->pb); url_fskip(&s->pb, 4); // seektable crc st = av_new_stream(s, 0); // av_set_pts_info(st, 32, 1, 1000); if (!st) return AVERROR_NOMEM; st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_TTA; st->codec->channels = channels; st->codec->sample_rate = samplerate; st->codec->bits_per_sample = bps; st->codec->extradata_size = url_ftell(&s->pb) - start; st->codec->extradata = av_mallocz(st->codec->extradata_size); url_fseek(&s->pb, start, SEEK_SET); // or SEEK_CUR and -size ? :) get_buffer(&s->pb, st->codec->extradata, st->codec->extradata_size); return 0; } static int tta_read_packet(AVFormatContext *s, AVPacket *pkt) { TTAContext *c = s->priv_data; int ret, size; // FIXME! if (c->currentframe > c->totalframes) size = 0; else size = c->seektable[c->currentframe]; c->currentframe++; if (av_new_packet(pkt, size) < 0) return AVERROR_IO; pkt->pos = url_ftell(&s->pb); pkt->stream_index = 0; ret = get_buffer(&s->pb, pkt->data, size); if (ret <= 0) { av_free_packet(pkt); return AVERROR_IO; } pkt->size = ret; // av_log(s, AV_LOG_INFO, "TTA packet #%d desired size: %d read size: %d at pos %d\n", // c->currentframe, size, ret, pkt->pos); return 0; //ret; } static int tta_read_close(AVFormatContext *s) { TTAContext *c = s->priv_data; if (c->seektable) av_free(c->seektable); return 0; } AVInputFormat tta_iformat = { "tta", "true-audio", sizeof(TTAContext), tta_probe, tta_read_header, tta_read_packet, tta_read_close, .extensions = "tta", }; int tta_init(void) { av_register_input_format(&tta_iformat); return 0; } Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v retrieving revision 1.121 retrieving revision 1.122 diff -u -d -r1.121 -r1.122 --- Makefile 11 Feb 2006 20:51:26 -0000 1.121 +++ Makefile 12 Feb 2006 02:18:37 -0000 1.122 @@ -23,7 +23,7 @@ nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \ sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \ ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o aiff.o \ - voc.o + voc.o tta.o # muxers ifeq ($(CONFIG_MUXERS),yes) Index: allformats.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- allformats.c 10 Feb 2006 01:24:32 -0000 1.57 +++ allformats.c 12 Feb 2006 02:18:37 -0000 1.58 @@ -116,6 +116,7 @@ nsvdec_init(); daud_init(); voc_init(); + tta_init(); #ifdef CONFIG_MUXERS /* image formats */ Index: avformat.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -r1.141 -r1.142 --- avformat.h 10 Feb 2006 01:24:32 -0000 1.141 +++ avformat.h 12 Feb 2006 02:18:37 -0000 1.142 @@ -555,6 +555,9 @@ /* voc.c */ int voc_init(void); +/* tta.c */ +int tta_init(void); + /* adts.c */ int ff_adts_init(void);

2 1

CVS: ffmpeg/libavcodec Makefile, 1.243, 1.244 dsputil.h, 1.128, 1.129 fft.c, 1.10, 1.11
by corey＠mplayerhq.hu 14 May '06

14 May '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv22424/libavcodec Modified Files: Makefile dsputil.h fft.c Log Message: 3DNow! & Extended 3DNow! versions of FFT Patch by Zuxy Meng, zuxy <<dot>> meng >>at<< gmail <<dot>> com Minor non-functional diff-related fixes by me. Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.243 retrieving revision 1.244 diff -u -d -r1.243 -r1.244 --- Makefile 17 Feb 2006 03:17:42 -0000 1.243 +++ Makefile 8 Mar 2006 04:13:55 -0000 1.244 @@ -330,7 +330,7 @@ i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ i386/idct_mmx.o i386/motion_est_mmx.o \ i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \ - i386/vp3dsp_sse2.o + i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o ifeq ($(CONFIG_GPL),yes) OBJS += i386/idct_mmx_xvid.o endif @@ -338,6 +338,10 @@ i386/fft_sse.o: CFLAGS+= -msse depend: CFLAGS+= -msse endif +ifdef TARGET_BUILTIN_3DNOW +i386/fft_3dn.o: CFLAGS+= -m3dnow +i386/fft_3dn2.o: CFLAGS+= -march=athlon +endif endif # armv4l specific stuff Index: dsputil.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.h,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- dsputil.h 10 Feb 2006 06:55:24 -0000 1.128 +++ dsputil.h 8 Mar 2006 04:13:55 -0000 1.129 @@ -564,6 +564,8 @@ void ff_fft_permute(FFTContext *s, FFTComplex *z); void ff_fft_calc_c(FFTContext *s, FFTComplex *z); void ff_fft_calc_sse(FFTContext *s, FFTComplex *z); +void ff_fft_calc_3dn(FFTContext *s, FFTComplex *z); +void ff_fft_calc_3dn2(FFTContext *s, FFTComplex *z); void ff_fft_calc_altivec(FFTContext *s, FFTComplex *z); static inline void ff_fft_calc(FFTContext *s, FFTComplex *z) Index: fft.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/fft.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- fft.c 12 Jan 2006 22:43:15 -0000 1.10 +++ fft.c 8 Mar 2006 04:13:55 -0000 1.11 @@ -57,12 +57,12 @@ s->exptab1 = NULL; /* compute constant table for HAVE_SSE version */ -#if (defined(HAVE_MMX) && defined(HAVE_BUILTIN_VECTOR)) || defined(HAVE_ALTIVEC) +#if (defined(HAVE_MMX) && (defined(HAVE_BUILTIN_VECTOR) || defined(HAVE_MM3DNOW))) || defined(HAVE_ALTIVEC) { int has_vectors = 0; #if defined(HAVE_MMX) - has_vectors = mm_support() & MM_SSE; + has_vectors = mm_support() & (MM_3DNOW | MM_3DNOWEXT | MM_SSE | MM_SSE2); #endif #if defined(HAVE_ALTIVEC) && !defined(ALTIVEC_USE_REFERENCE_C_CODE) has_vectors = mm_support() & MM_ALTIVEC; @@ -94,8 +94,24 @@ } while (nblocks != 0); av_freep(&s->exptab); #if defined(HAVE_MMX) - s->fft_calc = ff_fft_calc_sse; -#else +#ifdef HAVE_MM3DNOW + if (has_vectors & MM_3DNOWEXT) + /* 3DNowEx for Athlon(XP) */ + s->fft_calc = ff_fft_calc_3dn2; + else if (has_vectors & MM_3DNOW) + /* 3DNow! for K6-2/3 */ + s->fft_calc = ff_fft_calc_3dn; +#endif +#ifdef HAVE_BUILTIN_VECTOR + if (has_vectors & MM_SSE2) + /* SSE for P4/K8 */ + s->fft_calc = ff_fft_calc_sse; + else if ((has_vectors & MM_SSE) && + s->fft_calc == ff_fft_calc_c) + /* SSE for P3 */ + s->fft_calc = ff_fft_calc_sse; +#endif +#else /* HAVE_MMX */ s->fft_calc = ff_fft_calc_altivec; #endif }

3 2

CVS: ffmpeg/libavcodec h264.c,1.202,1.203
by lorenm＠mplayerhq.hu 30 Apr '06

30 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv19267 Modified Files: h264.c Log Message: warn on interlaced streams Index: h264.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v retrieving revision 1.202 retrieving revision 1.203 diff -u -d -r1.202 -r1.203 --- h264.c 29 Apr 2006 00:43:15 -0000 1.202 +++ h264.c 30 Apr 2006 19:31:45 -0000 1.203 @@ -7284,6 +7284,8 @@ sps->frame_mbs_only_flag= get_bits1(&s->gb); if(!sps->frame_mbs_only_flag) + av_log(h->s.avctx, AV_LOG_ERROR, "interlacing is not supported, picture will probably be garbage\n"); + if(!sps->frame_mbs_only_flag) sps->mb_aff= get_bits1(&s->gb); else sps->mb_aff= 0;

1 0

CVS: ffmpeg/libavutil common.h,1.163,1.164
by aurel＠mplayerhq.hu 30 Apr '06

30 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg/libavutil In directory mail:/var2/tmp/cvs-serv603/libavutil Modified Files: common.h Log Message: clip_uint8 should return an uint8_t instead of an int (patch by Panagiotis Issaris < takis.issaris _at_ uhasselt.be >) Index: common.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v retrieving revision 1.163 retrieving revision 1.164 diff -u -d -r1.163 -r1.164 --- common.h 1 Apr 2006 22:29:20 -0000 1.163 +++ common.h 30 Apr 2006 17:49:11 -0000 1.164 @@ -437,7 +437,7 @@ return a; } -static inline int clip_uint8(int a) +static inline uint8_t clip_uint8(int a) { if (a&(~255)) return (-a)>>31; else return a;

1 0

CVS: ffmpeg/libavcodec cabac.h, 1.13, 1.14 h264.c, 1.201, 1.202
by lorenm＠mplayerhq.hu 29 Apr '06

29 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv6466 Modified Files: cabac.h h264.c Log Message: don't force asserts in release builds. 2% faster h264. Index: cabac.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/cabac.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- cabac.h 12 Jan 2006 22:43:14 -0000 1.13 +++ cabac.h 29 Apr 2006 00:43:15 -0000 1.14 @@ -24,7 +24,7 @@ */ -#undef NDEBUG +//#undef NDEBUG #include <assert.h> #define CABAC_BITS 8 Index: h264.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v retrieving revision 1.201 retrieving revision 1.202 diff -u -d -r1.201 -r1.202 --- h264.c 25 Mar 2006 09:46:43 -0000 1.201 +++ h264.c 29 Apr 2006 00:43:15 -0000 1.202 @@ -33,7 +33,7 @@ #include "cabac.h" -#undef NDEBUG +//#undef NDEBUG #include <assert.h> #define interlaced_dct interlaced_dct_is_a_bad_name

4 3

CVS: ffmpeg README, 1.7, 1.8 clean-diff, 1.3, 1.4 unwrap-diff, 1.1, 1.2
by diego＠mplayerhq.hu 29 Apr '06

29 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv30269 Modified Files: README clean-diff unwrap-diff Log Message: Add missing newlines at end of file. Index: README =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- README 17 Dec 2005 18:14:25 -0000 1.7 +++ README 29 Apr 2006 16:17:50 -0000 1.8 @@ -16,4 +16,4 @@ * liba52 and libpostproc are distributed under the GNU General Public License and their compilation and use is optional in ffmpeg. -Fabrice Bellard. \ No newline at end of file +Fabrice Bellard. Index: clean-diff =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/clean-diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- clean-diff 3 Jun 2005 11:38:49 -0000 1.3 +++ clean-diff 29 Apr 2006 16:17:50 -0000 1.4 @@ -8,4 +8,4 @@ sed 's/$@@[^@]*@@?[^@]*$/\n\1/g' |\ egrep -v '@@[^@]*@@?(( [^?]*?)|([+-][[:space:]]*?)|(-[[:space:]]*([^?]*)?\+[[:space:]]*\5?))*$' |\ tr -d '\n' |\ - tr '?' '\n' \ No newline at end of file + tr '?' '\n' Index: unwrap-diff =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/unwrap-diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- unwrap-diff 10 Aug 2005 23:48:25 -0000 1.1 +++ unwrap-diff 29 Apr 2006 16:17:50 -0000 1.2 @@ -1,2 +1,2 @@ #!/bin/sh -tr '\n' '\001' | sed 's/\x01\x01/\x01 \x01/g' | sed 's/\x01$[^-+ @]$/ \1/g' | tr '\001' '\n' \ No newline at end of file +tr '\n' '\001' | sed 's/\x01\x01/\x01 \x01/g' | sed 's/\x01$[^-+ @]$/ \1/g' | tr '\001' '\n'

1 0

CVS: ffmpeg/libavutil mathematics.c,1.4,1.5
by mru＠mplayerhq.hu 29 Apr '06

29 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg/libavutil In directory mail:/var2/tmp/cvs-serv9641 Modified Files: mathematics.c Log Message: add newline at end of file Index: mathematics.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/mathematics.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mathematics.c 23 Apr 2006 10:28:54 -0000 1.4 +++ mathematics.c 28 Apr 2006 19:45:16 -0000 1.5 @@ -129,4 +129,4 @@ } } } -#endif \ No newline at end of file +#endif

3 4

CVS: CVSROOT style.sh,1.4,1.5
by diego＠mplayerhq.hu 29 Apr '06

29 Apr '06

Update of /cvsroot/ffmpeg/CVSROOT In directory mail:/var2/tmp/cvs-serv17066 Modified Files: style.sh Log Message: Check for files that do not end in newlines. Index: style.sh =================================================================== RCS file: /cvsroot/ffmpeg/CVSROOT/style.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- style.sh 13 Feb 2006 12:17:36 -0000 1.4 +++ style.sh 29 Apr 2006 16:05:39 -0000 1.5 @@ -19,6 +19,16 @@ fi done +for file in $FILELIST; do + if [ `tail -c1 $file | wc -l` = 0 ]; then + echo + echo "$file does not end in a newline." + echo "Commit aborted, fix the issue and try again." + echo + exit 1 + fi +done + #Makefiles and clean-diff may contain tabs. FILELIST="`echo $FILELIST | sed 's/Makefile\|common.mak\|clean-diff//g'`"

1 0

CVS: ffmpeg/libavutil mathematics.c,1.6,1.7
by michael＠mplayerhq.hu 29 Apr '06

29 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg/libavutil In directory mail:/var2/tmp/cvs-serv9184 Modified Files: mathematics.c Log Message: extend range used for testing (larger range should work too but testing code overflows) Index: mathematics.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/mathematics.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mathematics.c 29 Apr 2006 15:38:20 -0000 1.6 +++ mathematics.c 29 Apr 2006 16:02:28 -0000 1.7 @@ -113,9 +113,9 @@ main(){ int64_t a,b,c,d,e; - for(a=7; a<256LL*256*256*256*128; a=(a*3)+1){ - for(b=3; b<256LL*256*256*256*128; b=(b*5)/4+1){ - for(c=9; c<256LL*256*256*256*128; c=(c*7)/5+3 ){ + for(a=7; a<(1LL<<60); a=(a*3)+1){ + for(b=3; b<(1LL<<60); b=(b*5)/4+1){ + for(c=9; c<(1LL<<60); c=(c*7)/5+3){ int64_t r= c/2; AVInteger ai; ai= av_mul_i(av_int2i(a), av_int2i(b));

1 0