May 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

r5435 - trunk/libavcodec/kmvc.c
by subversion＠mplayerhq.hu 31 May '06

31 May '06

Author: kostya Date: Wed May 31 06:52:02 2006 New Revision: 5435 Modified: trunk/libavcodec/kmvc.c Log: Palette support for newer KMVC Modified: trunk/libavcodec/kmvc.c ============================================================================== --- trunk/libavcodec/kmvc.c (original) +++ trunk/libavcodec/kmvc.c Wed May 31 06:52:02 2006 @@ -242,8 +242,17 @@ return -1; } - header = buf[0]; - buf++; + header = *buf++; + + /* blocksize 127 is really palette change event */ + if (buf[0] == 127) { + buf += 3; + for (i = 0; i < 127; i++) { + ctx->pal[i + (header & 0x81)] = (buf[0] << 16) | (buf[1] << 8) | buf[2]; + buf += 4; + } + buf -= 127 * 4 + 3; + } if (header & KMVC_KEYFRAME) { ctx->pic.key_frame = 1; @@ -253,6 +262,13 @@ ctx->pic.pict_type = FF_P_TYPE; } + /* if palette has been changed, copy it from palctrl */ + if (ctx->avctx->palctrl && ctx->avctx->palctrl->palette_changed) { + memcpy(ctx->pal, ctx->avctx->palctrl->palette, AVPALETTE_SIZE); + ctx->setpal = 1; + ctx->avctx->palctrl->palette_changed = 0; + } + if (header & KMVC_PALETTE) { ctx->pic.palette_has_changed = 1; // palette starts from index 1 and has 127 entries @@ -272,12 +288,16 @@ blocksize = *buf++; - if (blocksize != 8) { + if (blocksize != 8 && blocksize != 127) { av_log(avctx, AV_LOG_ERROR, "Block size = %i\n", blocksize); return -1; } memset(ctx->cur, 0, 320 * 200); switch (header & KMVC_METHOD) { + case 0: + case 1: // used in palette changed event + memcpy(ctx->cur, ctx->prev, 320 * 200); + break; case 3: kmvc_decode_intra_8x8(ctx, buf, avctx->width, avctx->height); break; @@ -351,11 +371,14 @@ if (avctx->extradata_size == 1036) { // palette in extradata uint8_t *src = avctx->extradata + 12; - for (i = 0; i < c->palsize; i++) { + for (i = 0; i < 256; i++) { c->pal[i] = LE_32(src); src += 4; } c->setpal = 1; + if (c->avctx->palctrl) { + c->avctx->palctrl->palette_changed = 0; + } } avctx->pix_fmt = PIX_FMT_PAL8;

1 0

r5429 - trunk/vhook/imlib2.c
by subversion＠mplayerhq.hu 30 May '06

30 May '06

Author: michael Date: Tue May 30 11:21:58 2006 New Revision: 5429 Modified: trunk/vhook/imlib2.c Log: Support modular X11 path to rgb.txt patch by (Ville Skytt? - scop from SF-bugtracker) Modified: trunk/vhook/imlib2.c ============================================================================== --- trunk/vhook/imlib2.c (original) +++ trunk/vhook/imlib2.c Tue May 30 11:21:58 2006 @@ -144,7 +144,9 @@ char buff[256]; int done = 0; - f = fopen("/usr/lib/X11/rgb.txt", "r"); + f = fopen("/usr/share/X11/rgb.txt", "r"); + if (!f) + f = fopen("/usr/lib/X11/rgb.txt", "r"); if (!f) { fprintf(stderr, "Failed to find rgb.txt\n"); return -1;

2 1

r5434 - trunk/configure
by subversion＠mplayerhq.hu 30 May '06

30 May '06

Author: mru Date: Tue May 30 21:46:06 2006 New Revision: 5434 Modified: trunk/configure Log: make configure --whatever --help work as expected Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue May 30 21:46:06 2006 @@ -3,100 +3,101 @@ # ffmpeg configure script (c) 2000, 2001, 2002 Fabrice Bellard # -if test x"$1" = x"-h" -o x"$1" = x"--help" ; then -cat << EOF - -Usage: configure [options] -Options: [defaults in brackets after descriptions] +show_help(){ + echo "Usage: configure [options]" + echo "Options: [defaults in brackets after descriptions]" + echo + echo "Standard options:" + echo " --help print this message" + echo " --prefix=PREFIX install in PREFIX [$prefix]" + echo " --libdir=DIR install libs in DIR [PREFIX/lib]" + echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]" + echo " --mandir=DIR install man page in DIR [PREFIX/man]" + echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" + echo " --enable-libogg enable Ogg support via libogg [default=no]" + echo " --enable-vorbis enable Vorbis support via libvorbis [default=no]" + echo " --enable-theora enable Theora support via libtheora [default=no]" + echo " --enable-faad enable FAAD support via libfaad [default=no]" + echo " --enable-faadbin build FAAD support with runtime linking [default=no]" + echo " --enable-faac enable FAAC support via libfaac [default=no]" + echo " --enable-libgsm enable GSM support via libgsm [default=no]" + echo " --enable-xvid enable XviD support via xvidcore [default=no]" + echo " --enable-x264 enable H.264 encoding via x264 [default=no]" + echo " --enable-mingw32 enable MinGW native/cross Windows compile" + echo " --enable-mingwce enable MinGW native/cross WinCE compile" + echo " --enable-a52 enable GPLed A52 support [default=no]" + echo " --enable-a52bin open liba52.so.0 at runtime [default=no]" + echo " --enable-dts enable GPLed DTS support [default=no]" + echo " --enable-pp enable GPLed postprocessing support [default=no]" + echo " --enable-static build static libraries [default=yes]" + echo " --disable-static do not build static libraries [default=no]" + echo " --enable-shared build shared libraries [default=no]" + echo " --disable-shared do not build shared libraries [default=yes]" + echo " --enable-amr_nb enable amr_nb float audio codec" + echo " --enable-amr_nb-fixed use fixed point for amr-nb codec" + echo " --enable-amr_wb enable amr_wb float audio codec" + echo " --enable-amr_if2 enable amr_wb IF2 audio codec" + echo " --enable-sunmlib use Sun medialib [default=no]" + echo " --enable-pthreads use pthreads [default=no]" + echo " --enable-dc1394 enable IIDC-1394 grabbing using libdc1394" + echo " and libraw1394 [default=no]" + echo " --enable-gpl allow use of GPL code, the resulting libav*" + echo " and ffmpeg will be under GPL [default=no]" + echo "" + echo "Advanced options (experts only):" + echo " --source-path=PATH path to source code [$source_path]" + echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]" + echo " --cc=CC use C compiler CC [$cc]" + echo " --make=MAKE use specified make [$make]" + echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" + echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" + echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" + echo " --build-suffix=SUFFIX suffix for application specific build []" + echo " --cpu=CPU force cpu to CPU [$cpu]" + echo " --tune=CPU tune code for a particular CPU" + echo " (may fail or perform badly on other CPUs)" + echo " --powerpc-perf-enable enable performance report on PPC" + echo " (requires enabling PMC)" + echo " --disable-mmx disable MMX usage" + echo " --disable-iwmmxt disable iwmmxt usage" + echo " --disable-altivec disable AltiVec usage" + echo " --disable-audio-oss disable OSS audio support [default=no]" + echo " --disable-audio-beos disable BeOS audio support [default=no]" + echo " --disable-v4l disable video4linux grabbing [default=no]" + echo " --disable-v4l2 disable video4linux2 grabbing [default=no]" + echo " --disable-bktr disable bktr video grabbing [default=no]" + echo " --disable-dv1394 disable DV1394 grabbing [default=no]" + echo " --disable-network disable network support [default=no]" + echo " --disable-zlib disable zlib [default=no]" + echo " --disable-lzo disable lzo [default=no]" + echo " --disable-simple_idct disable simple IDCT routines [default=no]" + echo " --disable-vhook disable video hooking support" + echo " --enable-gprof enable profiling with gprof [$gprof]" + echo " --disable-debug disable debugging symbols" + echo " --disable-opts disable compiler optimizations" + echo " --disable-mpegaudio-hp faster (but less accurate)" + echo " MPEG audio decoding [default=no]" + echo " --disable-protocols disable I/O protocols support [default=no]" + echo " --disable-ffserver disable ffserver build" + echo " --disable-ffplay disable ffplay build" + echo " --enable-small optimize for size instead of speed" + echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers" + echo " --disable-strip disable stripping of executables and shared libraries" + echo " --disable-encoder=NAME disables encoder NAME" + echo " --enable-encoder=NAME enables encoder NAME" + echo " --disable-decoder=NAME disables decoder NAME" + echo " --enable-decoder=NAME enables decoder NAME" + echo " --disable-encoders disables all encoders" + echo " --disable-decoders disables all decoders" + echo " --disable-muxers disables all muxers" + echo " --disable-demuxers disables all demuxers" + echo "" + echo "NOTE: Object files are built at the place where configure is launched." + exit 1 +} -EOF -echo "Standard options:" -echo " --help print this message" -echo " --prefix=PREFIX install in PREFIX [$prefix]" -echo " --libdir=DIR install libs in DIR [PREFIX/lib]" -echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]" -echo " --mandir=DIR install man page in DIR [PREFIX/man]" -echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" -echo " --enable-libogg enable Ogg support via libogg [default=no]" -echo " --enable-vorbis enable Vorbis support via libvorbis [default=no]" -echo " --enable-theora enable Theora support via libtheora [default=no]" -echo " --enable-faad enable FAAD support via libfaad [default=no]" -echo " --enable-faadbin build FAAD support with runtime linking [default=no]" -echo " --enable-faac enable FAAC support via libfaac [default=no]" -echo " --enable-libgsm enable GSM support via libgsm [default=no]" -echo " --enable-xvid enable XviD support via xvidcore [default=no]" -echo " --enable-x264 enable H.264 encoding via x264 [default=no]" -echo " --enable-mingw32 enable MinGW native/cross Windows compile" -echo " --enable-mingwce enable MinGW native/cross WinCE compile" -echo " --enable-a52 enable GPLed A52 support [default=no]" -echo " --enable-a52bin open liba52.so.0 at runtime [default=no]" -echo " --enable-dts enable GPLed DTS support [default=no]" -echo " --enable-pp enable GPLed postprocessing support [default=no]" -echo " --enable-static build static libraries [default=yes]" -echo " --disable-static do not build static libraries [default=no]" -echo " --enable-shared build shared libraries [default=no]" -echo " --disable-shared do not build shared libraries [default=yes]" -echo " --enable-amr_nb enable amr_nb float audio codec" -echo " --enable-amr_nb-fixed use fixed point for amr-nb codec" -echo " --enable-amr_wb enable amr_wb float audio codec" -echo " --enable-amr_if2 enable amr_wb IF2 audio codec" -echo " --enable-sunmlib use Sun medialib [default=no]" -echo " --enable-pthreads use pthreads [default=no]" -echo " --enable-dc1394 enable IIDC-1394 grabbing using libdc1394" -echo " and libraw1394 [default=no]" -echo " --enable-gpl allow use of GPL code, the resulting libav*" -echo " and ffmpeg will be under GPL [default=no]" -echo "" -echo "Advanced options (experts only):" -echo " --source-path=PATH path to source code [$source_path]" -echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]" -echo " --cc=CC use C compiler CC [$cc]" -echo " --make=MAKE use specified make [$make]" -echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" -echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" -echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" -echo " --build-suffix=SUFFIX suffix for application specific build []" -echo " --cpu=CPU force cpu to CPU [$cpu]" -echo " --tune=CPU tune code for a particular CPU" -echo " (may fail or perform badly on other CPUs)" -echo " --powerpc-perf-enable enable performance report on PPC" -echo " (requires enabling PMC)" -echo " --disable-mmx disable MMX usage" -echo " --disable-iwmmxt disable iwmmxt usage" -echo " --disable-altivec disable AltiVec usage" -echo " --disable-audio-oss disable OSS audio support [default=no]" -echo " --disable-audio-beos disable BeOS audio support [default=no]" -echo " --disable-v4l disable video4linux grabbing [default=no]" -echo " --disable-v4l2 disable video4linux2 grabbing [default=no]" -echo " --disable-bktr disable bktr video grabbing [default=no]" -echo " --disable-dv1394 disable DV1394 grabbing [default=no]" -echo " --disable-network disable network support [default=no]" -echo " --disable-zlib disable zlib [default=no]" -echo " --disable-lzo disable lzo [default=no]" -echo " --disable-simple_idct disable simple IDCT routines [default=no]" -echo " --disable-vhook disable video hooking support" -echo " --enable-gprof enable profiling with gprof [$gprof]" -echo " --disable-debug disable debugging symbols" -echo " --disable-opts disable compiler optimizations" -echo " --disable-mpegaudio-hp faster (but less accurate)" -echo " MPEG audio decoding [default=no]" -echo " --disable-protocols disable I/O protocols support [default=no]" -echo " --disable-ffserver disable ffserver build" -echo " --disable-ffplay disable ffplay build" -echo " --enable-small optimize for size instead of speed" -echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers" -echo " --disable-strip disable stripping of executables and shared libraries" -echo " --disable-encoder=NAME disables encoder NAME" -echo " --enable-encoder=NAME enables encoder NAME" -echo " --disable-decoder=NAME disables decoder NAME" -echo " --enable-decoder=NAME enables decoder NAME" -echo " --disable-encoders disables all encoders" -echo " --disable-decoders disables all decoders" -echo " --disable-muxers disables all muxers" -echo " --disable-demuxers disables all demuxers" -echo "" -echo "NOTE: Object files are built at the place where configure is launched." -exit 1 +if test x"$1" = x"-h" -o x"$1" = x"--help" ; then + show_help fi # set temporary file name @@ -622,6 +623,8 @@ ;; --disable-demuxers) demuxers="no" ;; + --help) show_help + ;; *) echo "Unknown option \"$opt\"." echo "See $0 --help for available options."

1 0

r5433 - trunk/libavcodec/snow.c
by subversion＠mplayerhq.hu 30 May '06

30 May '06

Author: lorenm Date: Tue May 30 21:45:12 2006 New Revision: 5433 Modified: trunk/libavcodec/snow.c Log: Snow: don't try to encode lossless with 9/7 wavelet, because it isn't lossless. Modified: trunk/libavcodec/snow.c ============================================================================== --- trunk/libavcodec/snow.c (original) +++ trunk/libavcodec/snow.c Tue May 30 21:45:12 2006 @@ -4041,6 +4041,13 @@ return -1; } + if(avctx->prediction_method == DWT_97 + && (avctx->flags & CODEC_FLAG_QSCALE) + && avctx->global_quality == 0){ + av_log(avctx, AV_LOG_ERROR, "the 9/7 wavelet is incompatible with lossless mode\n"); + return -1; + } + common_init(avctx); alloc_blocks(s);

1 0

r5432 - in trunk/libavcodec: snow.c snow.h
by subversion＠mplayerhq.hu 30 May '06

30 May '06

Author: lorenm Date: Tue May 30 21:40:28 2006 New Revision: 5432 Modified: trunk/libavcodec/snow.c trunk/libavcodec/snow.h Log: Snow: cosmetics Modified: trunk/libavcodec/snow.c ============================================================================== --- trunk/libavcodec/snow.c (original) +++ trunk/libavcodec/snow.c Tue May 30 21:40:28 2006 @@ -1197,9 +1197,9 @@ for(level=0; level<decomposition_count; level++){ switch(type){ - case 0: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break; - case 1: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break; - case 2: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break; + case DWT_97: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break; + case DWT_53: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break; + case DWT_X: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break; } } } @@ -1502,10 +1502,10 @@ int level; for(level=decomposition_count-1; level>=0; level--){ switch(type){ - case 0: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; - case 1: spatial_compose53i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; + case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; + case DWT_53: spatial_compose53i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; /* not slicified yet */ - case 2: /*spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;*/ + case DWT_X: /*spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;*/ av_log(NULL, AV_LOG_ERROR, "spatial_composeX neither buffered nor slicified yet.\n"); break; } } @@ -1515,10 +1515,10 @@ int level; for(level=decomposition_count-1; level>=0; level--){ switch(type){ - case 0: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break; - case 1: spatial_compose53i_init(cs+level, buffer, height>>level, stride<<level); break; + case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break; + case DWT_53: spatial_compose53i_init(cs+level, buffer, height>>level, stride<<level); break; /* not slicified yet */ - case 2: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break; + case DWT_X: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break; } } } @@ -1531,11 +1531,11 @@ for(level=decomposition_count-1; level>=0; level--){ while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){ switch(type){ - case 0: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); + case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); break; - case 1: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); + case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); break; - case 2: break; + case DWT_X: break; } } } @@ -1549,11 +1549,11 @@ for(level=decomposition_count-1; level>=0; level--){ while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){ switch(type){ - case 0: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level); + case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level); break; - case 1: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level); + case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level); break; - case 2: break; + case DWT_X: break; } } } Modified: trunk/libavcodec/snow.h ============================================================================== --- trunk/libavcodec/snow.h (original) +++ trunk/libavcodec/snow.h Tue May 30 21:40:28 2006 @@ -35,6 +35,10 @@ #define LOG2_OBMC_MAX 8 #define OBMC_MAX (1<<(LOG2_OBMC_MAX)) +#define DWT_97 0 +#define DWT_53 1 +#define DWT_X 2 + /** Used to minimize the amount of memory used in order to optimize cache performance. **/ struct slice_buffer_s { DWTELEM * * line; ///< For use by idwt and predict_slices.

1 0

r5431 - trunk/libavcodec/snow.c
by subversion＠mplayerhq.hu 30 May '06

30 May '06

Author: lorenm Date: Tue May 30 18:42:29 2006 New Revision: 5431 Modified: trunk/libavcodec/snow.c Log: Snow: scale predicted mv based on which reference frame the neighbors used. Modified: trunk/libavcodec/snow.c ============================================================================== --- trunk/libavcodec/snow.c (original) +++ trunk/libavcodec/snow.c Tue May 30 18:42:29 2006 @@ -366,6 +366,8 @@ obmc32, obmc16, obmc8, obmc4 }; +static int scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES]; + typedef struct BlockNode{ int16_t mx; int16_t my; @@ -1949,6 +1951,22 @@ assert(!ref_index); } +static inline void pred_mv(SnowContext *s, int *mx, int *my, int ref, + BlockNode *left, BlockNode *top, BlockNode *tr){ + if(s->ref_frames == 1){ + *mx = mid_pred(left->mx, top->mx, tr->mx); + *my = mid_pred(left->my, top->my, tr->my); + }else{ + const int *scale = scale_mv_ref[ref]; + *mx = mid_pred(left->mx * scale[left->ref] + 128 >>8, + top ->mx * scale[top ->ref] + 128 >>8, + tr ->mx * scale[tr ->ref] + 128 >>8); + *my = mid_pred(left->my * scale[left->ref] + 128 >>8, + top ->my * scale[top ->ref] + 128 >>8, + tr ->my * scale[tr ->ref] + 128 >>8); + } +} + //FIXME copy&paste #define P_LEFT P[1] #define P_TOP P[2] @@ -1982,8 +2000,7 @@ int pl = left->color[0]; int pcb= left->color[1]; int pcr= left->color[2]; - int pmx= mid_pred(left->mx, top->mx, tr->mx); - int pmy= mid_pred(left->my, top->my, tr->my); + int pmx, pmy; int mx=0, my=0; int l,cr,cb; const int stride= s->current_picture.linesize[0]; @@ -2004,7 +2021,7 @@ assert(sizeof(s->block_state) >= 256); if(s->keyframe){ - set_blocks(s, level, x, y, pl, pcb, pcr, pmx, pmy, 0, BLOCK_INTRA); + set_blocks(s, level, x, y, pl, pcb, pcr, 0, 0, 0, BLOCK_INTRA); return 0; } @@ -2102,6 +2119,7 @@ put_rac(&pc, &p_state[1 + left->type + top->type], 0); if(s->ref_frames > 1) put_symbol(&pc, &p_state[128 + 1024 + 32*ref_context], best_ref, 0); + pred_mv(s, &pmx, &pmy, best_ref, left, top, tr); put_symbol(&pc, &p_state[128 + 32*(mx_context + 16*!!best_ref)], mx - pmx, 1); put_symbol(&pc, &p_state[128 + 32*(my_context + 16*!!best_ref)], my - pmy, 1); p_len= pc.bytestream - pc.bytestream_start; @@ -2167,6 +2185,7 @@ } if(iscore < score){ + pred_mv(s, &pmx, &pmy, 0, left, top, tr); memcpy(pbbak, i_buffer, i_len); s->c= ic; s->c.bytestream_start= pbbak_start; @@ -2206,15 +2225,14 @@ int pl = left->color[0]; int pcb= left->color[1]; int pcr= left->color[2]; - int pmx= mid_pred(left->mx, top->mx, tr->mx); - int pmy= mid_pred(left->my, top->my, tr->my); + int pmx, pmy; int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref); int mx_context= av_log2(2*ABS(left->mx - top->mx)) + 16*!!b->ref; int my_context= av_log2(2*ABS(left->my - top->my)) + 16*!!b->ref; int s_context= 2*left->level + 2*top->level + tl->level + tr->level; if(s->keyframe){ - set_blocks(s, level, x, y, pl, pcb, pcr, pmx, pmy, 0, BLOCK_INTRA); + set_blocks(s, level, x, y, pl, pcb, pcr, 0, 0, 0, BLOCK_INTRA); return; } @@ -2231,12 +2249,14 @@ } } if(b->type & BLOCK_INTRA){ + pred_mv(s, &pmx, &pmy, 0, left, top, tr); put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 1); put_symbol(&s->c, &s->block_state[32], b->color[0]-pl , 1); put_symbol(&s->c, &s->block_state[64], b->color[1]-pcb, 1); put_symbol(&s->c, &s->block_state[96], b->color[2]-pcr, 1); set_blocks(s, level, x, y, b->color[0], b->color[1], b->color[2], pmx, pmy, 0, BLOCK_INTRA); }else{ + pred_mv(s, &pmx, &pmy, b->ref, left, top, tr); put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 0); if(s->ref_frames > 1) put_symbol(&s->c, &s->block_state[128 + 1024 + 32*ref_context], b->ref, 0); @@ -2277,12 +2297,14 @@ type= get_rac(&s->c, &s->block_state[1 + left->type + top->type]) ? BLOCK_INTRA : 0; if(type){ + pred_mv(s, &mx, &my, 0, left, top, tr); l += get_symbol(&s->c, &s->block_state[32], 1); cb+= get_symbol(&s->c, &s->block_state[64], 1); cr+= get_symbol(&s->c, &s->block_state[96], 1); }else{ if(s->ref_frames > 1) ref= get_symbol(&s->c, &s->block_state[128 + 1024 + 32*ref_context], 0); + pred_mv(s, &mx, &my, ref, left, top, tr); mx+= get_symbol(&s->c, &s->block_state[128 + 32*(mx_context + 16*!!ref)], 1); my+= get_symbol(&s->c, &s->block_state[128 + 32*(my_context + 16*!!ref)], 1); } @@ -3013,8 +3035,6 @@ if(x<0 || x>=b_stride || y>=b_height) return 0; - dmx= b->mx - mid_pred(left->mx, top->mx, tr->mx); - dmy= b->my - mid_pred(left->my, top->my, tr->my); /* 1 0 0 01X 1-2 1 @@ -3028,10 +3048,14 @@ return 3+2*( av_log2(2*ABS(left->color[0] - b->color[0])) + av_log2(2*ABS(left->color[1] - b->color[1])) + av_log2(2*ABS(left->color[2] - b->color[2]))); - }else + }else{ + pred_mv(s, &dmx, &dmy, b->ref, left, top, tr); + dmx-= b->mx; + dmy-= b->my; return 2*(1 + av_log2(2*ABS(dmx)) //FIXME kill the 2* can be merged in lambda + av_log2(2*ABS(dmy)) + av_log2(2*b->ref)); + } } static int get_block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index, const uint8_t *obmc_edged){ @@ -3806,6 +3830,7 @@ SnowContext *s = avctx->priv_data; int width, height; int level, orientation, plane_index, dec; + int i, j; s->avctx= avctx; @@ -3911,6 +3936,10 @@ } } + for(i=0; i<MAX_REF_FRAMES; i++) + for(j=0; j<MAX_REF_FRAMES; j++) + scale_mv_ref[i][j] = 256*(i+1)/(j+1); + reset_contexts(s); /* width= s->width= avctx->width;

3 2

r5422 - trunk/libavcodec/ratecontrol.c
by subversion＠mplayerhq.hu 30 May '06

30 May '06

Author: michael Date: Mon May 29 18:50:37 2006 New Revision: 5422 Modified: trunk/libavcodec/ratecontrol.c Log: fabs is better then abs for floats ... Modified: trunk/libavcodec/ratecontrol.c ============================================================================== --- trunk/libavcodec/ratecontrol.c (original) +++ trunk/libavcodec/ratecontrol.c Mon May 29 18:50:37 2006 @@ -911,7 +911,7 @@ av_free(qscale); av_free(blured_qscale); - if(abs(expected_bits/all_available_bits - 1.0) > 0.01 ){ + if(fabs(expected_bits/all_available_bits - 1.0) > 0.01 ){ av_log(s->avctx, AV_LOG_ERROR, "Error: 2pass curve failed to converge\n"); return -1; }

3 3

r5430 - in trunk: configure libavformat/v4l2.c
by subversion＠mplayerhq.hu 30 May '06

30 May '06

Author: lucabe Date: Tue May 30 15:04:18 2006 New Revision: 5430 Modified: trunk/configure trunk/libavformat/v4l2.c Log: Include the correct video4linux2 header Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue May 30 15:04:18 2006 @@ -1273,7 +1273,8 @@ # check for video4linux2 --- V4L2_PIX_FMT_YUV420 cat > $TMPC << EOF #include <sys/time.h> -#include <linux/videodev.h> +#include <asm/types.h> +#include <linux/videodev2.h> int dummy = V4L2_PIX_FMT_YUV420; struct v4l2_buffer dummy1; EOF Modified: trunk/libavformat/v4l2.c ============================================================================== --- trunk/libavformat/v4l2.c (original) +++ trunk/libavformat/v4l2.c Tue May 30 15:04:18 2006 @@ -30,8 +30,8 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/time.h> -#define _LINUX_TIME_H 1 -#include <linux/videodev.h> +#include <asm/types.h> +#include <linux/videodev2.h> #include <time.h> static const int desired_video_buffers = 256;

1 0