February 2006 - ffmpeg-cvslog

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/libavformat mov.c,1.101,1.102
by michael＠mplayerhq.hu 11 Mar '06

11 Mar '06

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv12806 Modified Files: mov.c Log Message: simplify timebase if possible ignore edit lists instead of always failing Index: mov.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mov.c,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- mov.c 25 Jan 2006 16:04:31 -0000 1.101 +++ mov.c 2 Feb 2006 20:56:35 -0000 1.102 @@ -63,6 +63,9 @@ #include "qtpalette.h" +#undef NDEBUG +#include <assert.h> + /* Allows seeking (MOV_SPLIT_CHUNKS should also be defined) */ #define MOV_SEEK @@ -279,6 +282,7 @@ long keyframe_count; long *keyframes; int time_scale; + int time_rate; long current_sample; long left_in_chunk; /* how many samples before next chunk */ MOV_esds_t esds; @@ -720,7 +724,6 @@ (version==1)?get_be64(pb):get_be32(pb); /* modification time */ c->streams[c->fc->nb_streams-1]->time_scale = get_be32(pb); - av_set_pts_info(c->fc->streams[c->fc->nb_streams-1], 64, 1, c->streams[c->fc->nb_streams-1]->time_scale); #ifdef DEBUG av_log(NULL, AV_LOG_DEBUG, "track[%i].time_scale = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->time_scale); /* time scale */ @@ -1415,7 +1418,7 @@ static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - //MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; unsigned int i, entries; int64_t duration=0; int64_t total_sample_count=0; @@ -1428,20 +1431,25 @@ if(entries >= UINT_MAX / sizeof(Time2Sample)) return -1; - c->streams[c->fc->nb_streams-1]->stts_count = entries; - c->streams[c->fc->nb_streams-1]->stts_data = av_malloc(entries * sizeof(Time2Sample)); + sc->stts_count = entries; + sc->stts_data = av_malloc(entries * sizeof(Time2Sample)); #ifdef DEBUG av_log(NULL, AV_LOG_DEBUG, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries); #endif + + sc->time_rate=0; + for(i=0; i<entries; i++) { int sample_duration; int sample_count; sample_count=get_be32(pb); sample_duration = get_be32(pb); - c->streams[c->fc->nb_streams - 1]->stts_data[i].count= sample_count; - c->streams[c->fc->nb_streams - 1]->stts_data[i].duration= sample_duration; + sc->stts_data[i].count= sample_count; + sc->stts_data[i].duration= sample_duration; + + sc->time_rate= ff_gcd(sc->time_rate, sample_duration); #ifdef DEBUG av_log(NULL, AV_LOG_DEBUG, "sample_count=%d, sample_duration=%d\n",sample_count,sample_duration); @@ -1864,8 +1872,15 @@ i++; } for(i=0; i<s->nb_streams;i++) { - MOVStreamContext *sc; - sc = (MOVStreamContext *)s->streams[i]->priv_data; + MOVStreamContext *sc = (MOVStreamContext *)s->streams[i]->priv_data; + + if(!sc->time_rate) + sc->time_rate=1; + av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale); + + assert(s->streams[i]->duration % sc->time_rate == 0); + s->streams[i]->duration /= sc->time_rate; + sc->ffindex = i; sc->is_ff_stream = 1; } @@ -1882,6 +1897,7 @@ { MOVContext *mov = (MOVContext *) s->priv_data; MOVStreamContext *sc; + AVStream *st; int64_t offset = INT64_MAX; int64_t best_dts = INT64_MAX; int i, a, b, m; @@ -2109,8 +2125,13 @@ pts = dts + duration; }else pts = dts; - pkt->pts = pts; - pkt->dts = dts; + + st= s->streams[ sc->ffindex ]; + assert(pts % st->time_base.num == 0); + assert(dts % st->time_base.num == 0); + + pkt->pts = pts / st->time_base.num; + pkt->dts = dts / st->time_base.num; #ifdef DEBUG av_log(NULL, AV_LOG_DEBUG, "stream #%d smp #%ld dts = %lld pts = %lld (smp:%ld time:%lld idx:%d ent:%d count:%d dur:%d)\n" , pkt->stream_index, sc->current_sample-1, pkt->dts, pkt->pts @@ -2160,8 +2181,10 @@ } sc = mov->streams[mov_idx]; + sample_time *= s->streams[stream_index]->time_base.num; + // Step 1. Find the edit that contains the requested time (elst) - if (sc->edit_count) { + if (sc->edit_count && 0) { // FIXME should handle edit list av_log(s, AV_LOG_ERROR, "mov: does not handle seeking in files that contain edit list (c:%d)\n", sc->edit_count); return -1;

6 13

CVS: ffmpeg/libavcodec/ppc dsputil_h264_template_altivec.c, 1.4, 1.5
by aurel＠mplayerhq.hu 28 Feb '06

28 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/ppc In directory mail:/var2/tmp/cvs-serv19158/libavcodec/ppc Modified Files: dsputil_h264_template_altivec.c Log Message: use vec_splat_u32 to initialise a v16ui (patch by Likai Liu < liulk _at_ cs.bu.edu >) Index: dsputil_h264_template_altivec.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ppc/dsputil_h264_template_altivec.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- dsputil_h264_template_altivec.c 21 Feb 2006 22:24:19 -0000 1.4 +++ dsputil_h264_template_altivec.c 28 Feb 2006 21:55:18 -0000 1.5 @@ -426,7 +426,7 @@ const vector signed short v5ss = vec_splat_s16(5); const vector signed short v1ss = vec_splat_s16(1); const vector signed int v512si = vec_sl(vec_splat_s32(1),vec_splat_u32(9)); - const vector unsigned int v16ui = vec_sl(vec_splat_u16(1),vec_splat_u16(4)); + const vector unsigned int v16ui = vec_sl(vec_splat_u32(1),vec_splat_u32(4)); register int align = ((((unsigned long)src) - 2) % 16);

1 0

CVS: ffmpeg/tests test.conf,1.11,1.12
by aurel＠mplayerhq.hu 28 Feb '06

28 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg/tests In directory mail:/var2/tmp/cvs-serv22559/tests Modified Files: test.conf Log Message: -loop was renamed to -loop_input Index: test.conf =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/test.conf,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- test.conf 23 Feb 2006 23:29:30 -0000 1.11 +++ test.conf 28 Feb 2006 21:42:41 -0000 1.12 @@ -57,7 +57,7 @@ # Fire up ffmpeg pointing at this stream -Launch ../ffmpeg -loop -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm +Launch ../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm acl allow localhost </Feed>

1 0

CVS: ffmpeg ffmpeg.c,1.369,1.370
by lucabe＠mplayerhq.hu 28 Feb '06

28 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv20797 Modified Files: ffmpeg.c Log Message: Rename the "-loop" option defined in ffmpeg.c to "-loop_input" ("-loop" conflicts with an AVOption) Index: ffmpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v retrieving revision 1.369 retrieving revision 1.370 diff -u -d -r1.369 -r1.370 --- ffmpeg.c 13 Feb 2006 15:36:13 -0000 1.369 +++ ffmpeg.c 28 Feb 2006 11:32:31 -0000 1.370 @@ -4025,7 +4025,7 @@ { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, "when dumping packets, also dump the payload" }, { "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" }, - { "loop", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" }, + { "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" }, { "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "number of times to loop output in formats that support looping (0 loops forever)", "" }, { "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" }, { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },

1 0

CVS: ffmpeg/libavformat v4l2.c,1.3,1.4
by lucabe＠mplayerhq.hu 28 Feb '06

28 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv26852/libavformat Modified Files: v4l2.c Log Message: Add support for drivers that can change the capture size on VIDIOC_S_FMT Index: v4l2.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/v4l2.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- v4l2.c 28 Feb 2006 11:14:59 -0000 1.3 +++ v4l2.c 28 Feb 2006 11:28:09 -0000 1.4 @@ -148,17 +148,25 @@ return fd; } -static int device_init(int fd, int width, int height, int pix_fmt) +static int device_init(int fd, int *width, int *height, int pix_fmt) { struct v4l2_format fmt; + int res; memset(&fmt, 0, sizeof(struct v4l2_format)); fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - fmt.fmt.pix.width = width; - fmt.fmt.pix.height = height; + fmt.fmt.pix.width = *width; + fmt.fmt.pix.height = *height; fmt.fmt.pix.pixelformat = pix_fmt; fmt.fmt.pix.field = V4L2_FIELD_INTERLACED; - return ioctl (fd, VIDIOC_S_FMT, &fmt); + res = ioctl(fd, VIDIOC_S_FMT, &fmt); + if ((*width != fmt.fmt.pix.width) || (*height != fmt.fmt.pix.height)) { + av_log(NULL, AV_LOG_INFO, "The V4L2 driver changed the video from %dx%d to %dx%d\n", *width, *height, fmt.fmt.pix.width, fmt.fmt.pix.height); + *width = fmt.fmt.pix.width; + *height = fmt.fmt.pix.height; + } + + return res; } static int first_field(int fd) @@ -418,13 +426,13 @@ av_log(s1, AV_LOG_ERROR, "[%d]Capabilities: %x\n", s->fd, capabilities); desired_format = fmt_ff2v4l(ap->pix_fmt); - if (desired_format == 0 || (device_init(s->fd, width, height, desired_format) < 0)) { + if (desired_format == 0 || (device_init(s->fd, &width, &height, desired_format) < 0)) { int i, done; done = 0; i = 0; while (!done) { desired_format = fmt_conversion_table[i].v4l2_fmt; - if (device_init(s->fd, width, height, desired_format) < 0) { + if (device_init(s->fd, &width, &height, desired_format) < 0) { desired_format = 0; i++; } else {

1 0

CVS: ffmpeg/libavformat v4l2.c,1.2,1.3
by lucabe＠mplayerhq.hu 28 Feb '06

28 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv14708/libavformat Modified Files: v4l2.c Log Message: Error path fix: close the video device on failure Original patch by Flavio Pimentel Duarte (flaviop AT land DOT ufrj DOT br) Index: v4l2.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/v4l2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- v4l2.c 26 Feb 2006 13:22:32 -0000 1.2 +++ v4l2.c 28 Feb 2006 11:14:59 -0000 1.3 @@ -126,17 +126,20 @@ if (res < 0 && errno == 515) { av_log(NULL, AV_LOG_ERROR, "QUERYCAP not implemented, probably V4L device but not supporting V4L2\n"); + close(fd); return -1; } if (res < 0) { av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYCAP): %s\n", strerror(errno)); + close(fd); return -1; } if ((cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) == 0) { av_log(NULL, AV_LOG_ERROR, "Not a video capture device\n"); + close(fd); return -1; }

1 0

CVS: ffmpeg/tests ffmpeg.regression.ref, 1.167, 1.168 libav.regression.ref, 1.87, 1.88 rotozoom.regression.ref, 1.120, 1.121
by romansh＠mplayerhq.hu 28 Feb '06

28 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg/tests In directory mail:/var2/tmp/cvs-serv19480/ffmpeg/tests Modified Files: ffmpeg.regression.ref libav.regression.ref rotozoom.regression.ref Log Message: Assign class 2 to most macroblocks by default, instead of a more conservative method defined by SMPTE Patch by Dan Maas Index: ffmpeg.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/ffmpeg.regression.ref,v retrieving revision 1.167 retrieving revision 1.168 diff -u -d -r1.167 -r1.168 --- ffmpeg.regression.ref 27 Feb 2006 04:50:05 -0000 1.167 +++ ffmpeg.regression.ref 28 Feb 2006 02:54:48 -0000 1.168 @@ -133,10 +133,10 @@ 3533710 ./data/a-snow53.avi 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -1352049a75c5c94f21a360888b12d75d *./data/a-dv.dv +85529d9838c5a8aef041445fa8ef3c85 *./data/a-dv.dv 7200000 ./data/a-dv.dv -2c7f745a74c1ac25566b6c49ed619649 *./data/out.yuv -stddev: 9.00 PSNR:29.03 bytes:7602176 +c2082cd8adf417c4ebc32654e446cba1 *./data/out.yuv +stddev: 8.86 PSNR:29.17 bytes:7602176 bd0db310a36ad94bcd4448abe0a88368 *./data/a-svq1.mov 1379827 ./data/a-svq1.mov bbff871d1475e1eee4231a08e075de2c *./data/out.yuv Index: libav.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/libav.regression.ref,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- libav.regression.ref 27 Feb 2006 04:50:06 -0000 1.87 +++ libav.regression.ref 28 Feb 2006 02:54:48 -0000 1.88 @@ -28,9 +28,9 @@ 8bf16d40a2ec19fa36b124a928e47e23 *./data/b-libav.nut 332358 ./data/b-libav.nut ./data/b-libav.nut CRC=0xccab3a27 -afe55c5769eb6d1873d4106b3ef2b691 *./data/b-libav.dv +2cc647904d3cca01703f36056b9d3f42 *./data/b-libav.dv 3600000 ./data/b-libav.dv -./data/b-libav.dv CRC=0x9292dedd +./data/b-libav.dv CRC=0xa6b8b635 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm 317075 ./data/b-libav.pbm ./data/b-libav.pbm CRC=0xb92906cb Index: rotozoom.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.regression.ref,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- rotozoom.regression.ref 27 Feb 2006 04:50:06 -0000 1.120 +++ rotozoom.regression.ref 28 Feb 2006 02:54:48 -0000 1.121 @@ -133,10 +133,10 @@ 2725570 ./data/a-snow53.avi dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -3d7def2ed47e896790945c3c634fa4e8 *./data/a-dv.dv +6568326ee439099e8a0e1680336ed351 *./data/a-dv.dv 7200000 ./data/a-dv.dv -49020c3651d58137db4dc56ca13ff26d *./data/out.yuv -stddev: 3.06 PSNR:38.40 bytes:7602176 +bb69dda7a84a5b166434e28e1243d3d1 *./data/out.yuv +stddev: 2.99 PSNR:38.59 bytes:7602176 5b02b6ae7ffa257a66ae9857a992fdfe *./data/a-svq1.mov 769527 ./data/a-svq1.mov 44777d1ddbccd0ef7f8d08394465670c *./data/out.yuv

1 0

CVS: ffmpeg/libavcodec dv.c,1.80,1.81
by romansh＠mplayerhq.hu 28 Feb '06

28 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv19480/ffmpeg/libavcodec Modified Files: dv.c Log Message: Assign class 2 to most macroblocks by default, instead of a more conservative method defined by SMPTE Patch by Dan Maas Index: dv.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dv.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- dv.c 27 Feb 2006 05:04:05 -0000 1.80 +++ dv.c 28 Feb 2006 02:54:48 -0000 1.81 @@ -658,8 +658,22 @@ const uint8_t* zigzag_scan, const int *weight, int bias) { int i, area; + /* We offer two different methods for class number assignment: the + method suggested in SMPTE 314M Table 22, and an improved + method. The SMPTE method is very conservative; it assigns class + 3 (i.e. severe quantization) to any block where the largest AC + component is greater than 36. ffmpeg's DV encoder tracks AC bit + consumption precisely, so there is no need to bias most blocks + towards strongly lossy compression. Instead, we assign class 2 + to most blocks, and use class 3 only when strictly necessary + (for blocks whose largest AC component exceeds 255). */ + +#if 0 /* SMPTE spec method */ static const int classes[] = {12, 24, 36, 0xffff}; - int max=12; +#else /* improved ffmpeg method */ + static const int classes[] = {-1, -1, 255, 0xffff}; +#endif + int max=classes[0]; int prev=0; bi->mb[0] = blk[0];

1 0

CVS: ffmpeg MAINTAINERS,1.4,1.5
by michael＠mplayerhq.hu 27 Feb '06

27 Feb '06

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv6678 Modified Files: MAINTAINERS Log Message: v4l2 maintainer Index: MAINTAINERS =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/MAINTAINERS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MAINTAINERS 18 Feb 2006 14:28:01 -0000 1.4 +++ MAINTAINERS 27 Feb 2006 18:21:07 -0000 1.5 @@ -184,6 +184,7 @@ raw.c Michael Niedermayer rm.c Roberto Togni segafilm.c Mike Melanson + v4l2.c Luca Abeni voc.c Aurelien Jacobs wav.c Michael Niedermayer wc3movie.c Mike Melanson

1 0