September 2006 - ffmpeg-cvslog

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

r6072 - in trunk: libavformat/movenc.c tests/ffmpeg.regression.ref tests/rotozoom.regression.ref
by subversion＠mplayerhq.hu 12 Nov '06

12 Nov '06

Author: bcoudurier Date: Thu Aug 24 12:32:09 2006 New Revision: 6072 Modified: trunk/libavformat/movenc.c trunk/tests/ffmpeg.regression.ref trunk/tests/rotozoom.regression.ref Log: wide atom is only defined in mov, use free for mp4/3gp Modified: trunk/libavformat/movenc.c ============================================================================== --- trunk/libavformat/movenc.c (original) +++ trunk/libavformat/movenc.c Thu Aug 24 12:32:09 2006 @@ -1332,7 +1332,7 @@ static int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov) { put_be32(pb, 8); // placeholder for extended size field (64 bit) - put_tag(pb, "wide"); + put_tag(pb, mov->mode == MODE_MOV ? "wide" : "free"); mov->mdat_pos = url_ftell(pb); put_be32(pb, 0); /* size placeholder*/ Modified: trunk/tests/ffmpeg.regression.ref ============================================================================== --- trunk/tests/ffmpeg.regression.ref (original) +++ trunk/tests/ffmpeg.regression.ref Thu Aug 24 12:32:09 2006 @@ -59,7 +59,7 @@ 2415378 ./data/a-h263p.avi 28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv stddev: 2.07 PSNR:41.76 bytes:7602176 -0ff2951f72be3e62038b426f0ec12e1b *./data/a-odivx.mp4 +d84b65558cd386064ab7a126d66c4744 *./data/a-odivx.mp4 554499 ./data/a-odivx.mp4 57aed19df5cbada4b05991527ee72ebe *./data/out.yuv stddev: 7.99 PSNR:30.06 bytes:7602176 @@ -83,7 +83,7 @@ 900488 ./data/a-mpeg4-Q.avi af59c063ed644c7dc4151a0a2debbddd *./data/out.yuv stddev: 5.69 PSNR:33.00 bytes:7602176 -2ff870bf5e75d493072cc28ea8d51ab1 *./data/a-mpeg4-PSP.mp4 +b8da412bd5421c6ac6fcb6c9caa261ae *./data/a-mpeg4-PSP.mp4 407313 ./data/a-mpeg4-PSP.mp4 ef45e577219460332bed428106f638a6 *./data/a-error-mpeg4-adv.avi 767718 ./data/a-error-mpeg4-adv.avi Modified: trunk/tests/rotozoom.regression.ref ============================================================================== --- trunk/tests/rotozoom.regression.ref (original) +++ trunk/tests/rotozoom.regression.ref Thu Aug 24 12:32:09 2006 @@ -59,7 +59,7 @@ 869200 ./data/a-h263p.avi 80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv stddev: 1.91 PSNR:42.49 bytes:7602176 -58ca40c205c596abbd770ceb221df3ec *./data/a-odivx.mp4 +286c5a5fca0d3e17ba6ede970b8318b8 *./data/a-odivx.mp4 120150 ./data/a-odivx.mp4 e8c90899c32e11e7e4d1354dab0b8f28 *./data/out.yuv stddev: 5.34 PSNR:33.56 bytes:7602176 @@ -83,7 +83,7 @@ 166034 ./data/a-mpeg4-Q.avi b078f22c66083f0537bd3581509684d8 *./data/out.yuv stddev: 4.01 PSNR:36.05 bytes:7602176 -30fa98177dad6bd40a1baf13c29c20d4 *./data/a-mpeg4-PSP.mp4 +29bdd2038570dc612f19eacfc4f9011a *./data/a-mpeg4-PSP.mp4 321886 ./data/a-mpeg4-PSP.mp4 d93e3d53110437db55e954a14fdd7c3a *./data/a-error-mpeg4-adv.avi 178248 ./data/a-error-mpeg4-adv.avi

3 2

r5891 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 20 Oct '06

20 Oct '06

Author: lucabe Date: Wed Aug 2 13:50:38 2006 New Revision: 5891 Modified: trunk/ffmpeg.c Log: Move ffmpeg.c to the swscale interface Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Wed Aug 2 13:50:38 2006 @@ -19,6 +19,7 @@ #define HAVE_AV_CONFIG_H #include <limits.h> #include "avformat.h" +#include "swscale.h" #include "framehook.h" #include "dsputil.h" #include "opt.h" @@ -246,6 +247,8 @@ static int pgmyuv_compatibility_hack=0; static int dts_delta_threshold = 10; +static int sws_flags = SWS_BICUBIC; + const char **opt_names=NULL; int opt_name_count=0; AVCodecContext *avctx_opts; @@ -273,7 +276,8 @@ /* video only */ int video_resample; AVFrame pict_tmp; /* temporary image for resampling */ - ImgReSampleContext *img_resample_ctx; /* for image resampling */ + struct SwsContext *img_resample_ctx; /* for image resampling */ + int resample_height; int video_crop; int topBand; /* cropping area sizes */ @@ -728,12 +732,10 @@ { int nb_frames, i, ret; AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; - AVFrame picture_format_temp, picture_crop_temp, picture_pad_temp; + AVFrame picture_crop_temp, picture_pad_temp; uint8_t *buf = NULL, *buf1 = NULL; AVCodecContext *enc, *dec; - enum PixelFormat target_pixfmt; - avcodec_get_frame_defaults(&picture_format_temp); avcodec_get_frame_defaults(&picture_crop_temp); avcodec_get_frame_defaults(&picture_pad_temp); @@ -770,38 +772,14 @@ if (nb_frames <= 0) return; - /* convert pixel format if needed */ - target_pixfmt = ost->video_resample ? PIX_FMT_YUV420P : enc->pix_fmt; - if (dec->pix_fmt != target_pixfmt) { - int size; - - /* create temporary picture */ - size = avpicture_get_size(target_pixfmt, dec->width, dec->height); - buf = av_malloc(size); - if (!buf) - return; - formatted_picture = &picture_format_temp; - avpicture_fill((AVPicture*)formatted_picture, buf, target_pixfmt, dec->width, dec->height); - - if (img_convert((AVPicture*)formatted_picture, target_pixfmt, - (AVPicture *)in_picture, dec->pix_fmt, - dec->width, dec->height) < 0) { - - if (verbose >= 0) - fprintf(stderr, "pixel format conversion not handled\n"); - - goto the_end; - } - } else { - formatted_picture = in_picture; - } - if (ost->video_crop) { - if (img_crop((AVPicture *)&picture_crop_temp, (AVPicture *)formatted_picture, target_pixfmt, ost->topBand, ost->leftBand) < 0) { + if (img_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); goto the_end; } formatted_picture = &picture_crop_temp; + } else { + formatted_picture = in_picture; } final_picture = formatted_picture; @@ -810,7 +788,7 @@ if (ost->video_pad) { final_picture = &ost->pict_tmp; if (ost->video_resample) { - if (img_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, target_pixfmt, ost->padtop, ost->padleft) < 0) { + if (img_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, enc->pix_fmt, ost->padtop, ost->padleft) < 0) { av_log(NULL, AV_LOG_ERROR, "error padding picture\n"); goto the_end; } @@ -818,36 +796,11 @@ } } - /* XXX: resampling could be done before raw format conversion in - some cases to go faster */ - /* XXX: only works for YUV420P */ if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; - img_resample(ost->img_resample_ctx, (AVPicture *)resampling_dst, (AVPicture*)formatted_picture); - } - - if (enc->pix_fmt != target_pixfmt) { - int size; - - av_free(buf); - /* create temporary picture */ - size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height); - buf = av_malloc(size); - if (!buf) - return; - final_picture = &picture_format_temp; - avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - - if (img_convert((AVPicture*)final_picture, enc->pix_fmt, - (AVPicture*)&ost->pict_tmp, target_pixfmt, - enc->width, enc->height) < 0) { - - if (verbose >= 0) - fprintf(stderr, "pixel format conversion not handled\n"); - - goto the_end; - } + sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize, + 0, ost->resample_height, resampling_dst->data, resampling_dst->linesize); } if (ost->video_pad) { @@ -1680,7 +1633,8 @@ (frame_padleft + frame_padright)) || (codec->height != icodec->height - (frame_topBand + frame_bottomBand) + - (frame_padtop + frame_padbottom))); + (frame_padtop + frame_padbottom)) || + (codec->pix_fmt != icodec->pix_fmt)); if (ost->video_crop) { ost->topBand = frame_topBand; ost->leftBand = frame_leftBand; @@ -1699,16 +1653,19 @@ } if (ost->video_resample) { avcodec_get_frame_defaults(&ost->pict_tmp); - if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, + if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, codec->pix_fmt, codec->width, codec->height ) ) goto fail; - ost->img_resample_ctx = img_resample_init( + ost->img_resample_ctx = sws_getContext( + icodec->width - (frame_leftBand + frame_rightBand), + icodec->height - (frame_topBand + frame_bottomBand), + icodec->pix_fmt, codec->width - (frame_padleft + frame_padright), codec->height - (frame_padtop + frame_padbottom), - icodec->width - (frame_leftBand + frame_rightBand), - icodec->height - (frame_topBand + frame_bottomBand)); - + codec->pix_fmt, + sws_flags, NULL, NULL, NULL); + ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); } ost->encoding_needed = 1; ist->decoding_needed = 1; @@ -2086,7 +2043,7 @@ initialized but set to zero */ av_free(ost->pict_tmp.data[0]); if (ost->video_resample) - img_resample_close(ost->img_resample_ctx); + sws_freeContext(ost->img_resample_ctx); if (ost->audio_resample) audio_resample_close(ost->resample); av_free(ost);

3 3

r5996 - trunk/libavutil/mem.c
by subversion＠mplayerhq.hu 19 Oct '06

19 Oct '06

Author: michael Date: Sun Aug 13 23:09:00 2006 New Revision: 5996 Modified: trunk/libavutil/mem.c Log: trying to fix av_realloc() Modified: trunk/libavutil/mem.c ============================================================================== --- trunk/libavutil/mem.c (original) +++ trunk/libavutil/mem.c Sun Aug 13 23:09:00 2006 @@ -50,7 +50,7 @@ #endif /* let's disallow possible ambiguous cases */ - if(size > (INT_MAX-16) ) + if(size > (INT_MAX-16) || !size) return NULL; #ifdef MEMALIGN_HACK @@ -109,14 +109,16 @@ #ifndef MEMALIGN_HACK ptr= realloc(ptr, size); - if(((int)ptr&15) || !ptr) +assert(((int)((void*)0)&15) == 0); //for the null pointer pedants + if(!((int)ptr&15)) return ptr; #endif ptr2= av_malloc(size); if(ptr && ptr2) memcpy(ptr2, ptr, size); - av_free(ptr); + if(ptr2 || !size) + av_free(ptr); return ptr2; }

4 4

r6316 - trunk/libavformat/aviobuf.c
by subversion＠mplayerhq.hu 19 Oct '06

19 Oct '06

Author: michael Date: Fri Sep 22 12:03:04 2006 New Revision: 6316 Modified: trunk/libavformat/aviobuf.c Log: simplify url_fseek() Modified: trunk/libavformat/aviobuf.c ============================================================================== --- trunk/libavformat/aviobuf.c (original) +++ trunk/libavformat/aviobuf.c Fri Sep 22 12:03:04 2006 @@ -106,56 +106,41 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) { offset_t offset1; + offset_t pos= s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer)); if (whence != SEEK_CUR && whence != SEEK_SET) return -EINVAL; + if (whence == SEEK_CUR) { + offset1 = pos + (s->buf_ptr - s->buffer); + if (offset == 0) + return offset1; + offset += offset1; + } + offset1 = offset - pos; + if (!s->must_flush && + offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) { + /* can do the seek inside the buffer */ + s->buf_ptr = s->buffer + offset1; + } else { + if (!s->seek) + return -EPIPE; + #ifdef CONFIG_MUXERS - if (s->write_flag) { - if (whence == SEEK_CUR) { - offset1 = s->pos + (s->buf_ptr - s->buffer); - if (offset == 0) - return offset1; - offset += offset1; - } - offset1 = offset - s->pos; - if (!s->must_flush && - offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) { - /* can do the seek inside the buffer */ - s->buf_ptr = s->buffer + offset1; - } else { - if (!s->seek) - return -EPIPE; + if (s->write_flag) { flush_buffer(s); s->must_flush = 1; - s->buf_ptr = s->buffer; - s->seek(s->opaque, offset, SEEK_SET); - s->pos = offset; - } - } else + } else #endif //CONFIG_MUXERS - { - if (whence == SEEK_CUR) { - offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer); - if (offset == 0) - return offset1; - offset += offset1; - } - offset1 = offset - (s->pos - (s->buf_end - s->buffer)); - if (offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) { - /* can do the seek inside the buffer */ - s->buf_ptr = s->buffer + offset1; - } else { - if (!s->seek) - return -EPIPE; - s->buf_ptr = s->buffer; + { s->buf_end = s->buffer; - if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE) - return -EPIPE; - s->pos = offset; } - s->eof_reached = 0; + s->buf_ptr = s->buffer; + if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE) + return -EPIPE; + s->pos = offset; } + s->eof_reached = 0; return offset; }

2 1

r6376 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 04 Oct '06

04 Oct '06

Author: bcoudurier Date: Fri Sep 29 12:28:11 2006 New Revision: 6376 Modified: trunk/libavformat/mov.c Log: remove gcc warnings about void * used in arithmetic Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Fri Sep 29 12:28:11 2006 @@ -649,7 +649,7 @@ if (st->codec->extradata) { strcpy(st->codec->extradata, "SVQ3"); // fake - get_buffer(pb, st->codec->extradata + 0x5a, atom.size); + get_buffer(pb, (uint8_t *)st->codec->extradata + 0x5a, atom.size); dprintf("Reading SMI %"PRId64" %s\n", atom.size, (char*)st->codec->extradata + 0x5a); } else url_fskip(pb, atom.size); @@ -689,8 +689,8 @@ st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); if (st->codec->extradata) { - strcpy(st->codec->extradata + 4, "alac"); // fake - get_buffer(pb, st->codec->extradata + 8, 36 - 8); + strcpy((char *)st->codec->extradata + 4, "alac"); // fake + get_buffer(pb, (uint8_t *)st->codec->extradata + 8, 36 - 8); dprintf("Reading alac %d %s\n", st->codec->extradata_size, (char*)st->codec->extradata); } else url_fskip(pb, atom.size); @@ -735,8 +735,8 @@ /* pass all jp2h atom to codec */ if (st->codec->extradata) { - strcpy(st->codec->extradata + 4, "jp2h"); - get_buffer(pb, st->codec->extradata + 8, atom.size); + strcpy((char *)st->codec->extradata + 4, "jp2h"); + get_buffer(pb, (uint8_t *)st->codec->extradata + 8, atom.size); } else url_fskip(pb, atom.size); return 0;

5 5

r6399 - trunk/libavcodec/vqavideo.c
by subversion＠mplayerhq.hu 30 Sep '06

30 Sep '06

Author: michael Date: Sun Oct 1 01:49:09 2006 New Revision: 6399 Modified: trunk/libavcodec/vqavideo.c Log: palette (if we memcpy it into AVFrame) must be uint32_t Modified: trunk/libavcodec/vqavideo.c ============================================================================== --- trunk/libavcodec/vqavideo.c (original) +++ trunk/libavcodec/vqavideo.c Sun Oct 1 01:49:09 2006 @@ -107,7 +107,7 @@ unsigned char *buf; int size; - unsigned int palette[PALETTE_COUNT]; + uint32_t palette[PALETTE_COUNT]; int width; /* width of a frame */ int height; /* height of a frame */

1 0

r6398 - in trunk/libavcodec: Makefile vorbis.c vorbis.h vorbis_data.c
by subversion＠mplayerhq.hu 30 Sep '06

30 Sep '06

Author: ods15 Date: Sat Sep 30 20:47:15 2006 New Revision: 6398 Added: trunk/libavcodec/vorbis.h trunk/libavcodec/vorbis_data.c - copied, changed from r6396, /trunk/libavcodec/vorbis.h Modified: trunk/libavcodec/Makefile trunk/libavcodec/vorbis.c Log: vorbis.h -> vorbis_data.c move tables from vorbis.h to a C file so they can be used later in vorbis_enc.c Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Sat Sep 30 20:47:15 2006 @@ -121,7 +121,7 @@ OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o -OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.o +OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.o vorbis_data.o OBJS-$(CONFIG_VP3_DECODER) += vp3.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o Modified: trunk/libavcodec/vorbis.c ============================================================================== --- trunk/libavcodec/vorbis.c (original) +++ trunk/libavcodec/vorbis.c Sat Sep 30 20:47:15 2006 @@ -43,6 +43,124 @@ #undef NDEBUG #include <assert.h> +typedef struct { + uint_fast8_t dimensions; + uint_fast8_t lookup_type; + uint_fast8_t maxdepth; + VLC vlc; + float *codevectors; + unsigned int nb_bits; +} vorbis_codebook; + +typedef union vorbis_floor_u vorbis_floor_data; +typedef struct vorbis_floor0_s vorbis_floor0; +typedef struct vorbis_floor1_s vorbis_floor1; +struct vorbis_context_s; +typedef +uint_fast8_t (* vorbis_floor_decode_func) + (struct vorbis_context_s *, vorbis_floor_data *, float *); +typedef struct { + uint_fast8_t floor_type; + vorbis_floor_decode_func decode; + union vorbis_floor_u + { + struct vorbis_floor0_s + { + uint_fast8_t order; + uint_fast16_t rate; + uint_fast16_t bark_map_size; + int_fast32_t * map[2]; + uint_fast32_t map_size[2]; + uint_fast8_t amplitude_bits; + uint_fast8_t amplitude_offset; + uint_fast8_t num_books; + uint_fast8_t * book_list; + float * lsp; + } t0; + struct vorbis_floor1_s + { + uint_fast8_t partitions; + uint_fast8_t maximum_class; + uint_fast8_t partition_class[32]; + uint_fast8_t class_dimensions[16]; + uint_fast8_t class_subclasses[16]; + uint_fast8_t class_masterbook[16]; + int_fast16_t subclass_books[16][8]; + uint_fast8_t multiplier; + uint_fast16_t x_list_dim; + uint_fast16_t *x_list; + uint_fast16_t *x_list_order; + uint_fast16_t *low_neighbour; + uint_fast16_t *high_neighbour; + } t1; + } data; +} vorbis_floor; + +typedef struct { + uint_fast16_t type; + uint_fast32_t begin; + uint_fast32_t end; + uint_fast32_t partition_size; + uint_fast8_t classifications; + uint_fast8_t classbook; + int_fast16_t books[64][8]; + uint_fast8_t maxpass; +} vorbis_residue; + +typedef struct { + uint_fast8_t submaps; + uint_fast16_t coupling_steps; + uint_fast8_t *magnitude; + uint_fast8_t *angle; + uint_fast8_t *mux; + uint_fast8_t submap_floor[16]; + uint_fast8_t submap_residue[16]; +} vorbis_mapping; + +typedef struct { + uint_fast8_t blockflag; + uint_fast16_t windowtype; + uint_fast16_t transformtype; + uint_fast8_t mapping; +} vorbis_mode; + +typedef struct vorbis_context_s { + AVCodecContext *avccontext; + GetBitContext gb; + DSPContext dsp; + + MDCTContext mdct[2]; + uint_fast8_t first_frame; + uint_fast32_t version; + uint_fast8_t audio_channels; + uint_fast32_t audio_samplerate; + uint_fast32_t bitrate_maximum; + uint_fast32_t bitrate_nominal; + uint_fast32_t bitrate_minimum; + uint_fast32_t blocksize[2]; + const float * win[2]; + uint_fast16_t codebook_count; + vorbis_codebook *codebooks; + uint_fast8_t floor_count; + vorbis_floor *floors; + uint_fast8_t residue_count; + vorbis_residue *residues; + uint_fast8_t mapping_count; + vorbis_mapping *mappings; + uint_fast8_t mode_count; + vorbis_mode *modes; + uint_fast8_t mode_number; // mode number for the current packet + float *channel_residues; + float *channel_floors; + float *saved; + uint_fast16_t saved_start; + float *ret; + float *buf; + float *buf_tmp; + uint_fast32_t add_bias; // for float->int conversion + uint_fast32_t exp_bias; +} vorbis_context; + /* Helper functions */ #define ilog(i) av_log2(2*(i)) @@ -849,7 +967,6 @@ static int vorbis_parse_id_hdr(vorbis_context *vc){ GetBitContext *gb=&vc->gb; uint_fast8_t bl0, bl1; - const float *vwin[8]={ vwin64, vwin128, vwin256, vwin512, vwin1024, vwin2048, vwin4096, vwin8192 }; if ((get_bits(gb, 8)!='v') || (get_bits(gb, 8)!='o') || (get_bits(gb, 8)!='r') || (get_bits(gb, 8)!='b') || @@ -879,8 +996,8 @@ "output packets too large.\n"); return 4; } - vc->win[0]=vwin[bl0-6]; - vc->win[1]=vwin[bl1-6]; + vc->win[0]=ff_vorbis_vwin[bl0-6]; + vc->win[1]=ff_vorbis_vwin[bl1-6]; if(vc->exp_bias){ int i, j; @@ -1251,7 +1368,7 @@ lx=0; ly=floor1_Y_final[0]*vf->multiplier; // conforms to SPEC - vec[0]=floor1_inverse_db_table[ly]; + vec[0]=ff_vorbis_floor1_inverse_db_table[ly]; for(i=1;i<vf->x_list_dim;++i) { AV_DEBUG(" Looking at post %d \n", i); @@ -1278,7 +1395,7 @@ sy=base+1; } ady=ady-(base<0 ? -base : base)*adx; - vec[x]=floor1_inverse_db_table[y]; + vec[x]=ff_vorbis_floor1_inverse_db_table[y]; AV_DEBUG(" vec[ %d ] = %d \n", x, y); @@ -1290,7 +1407,7 @@ } else { y+=base; } - vec[x]=floor1_inverse_db_table[y]; + vec[x]=ff_vorbis_floor1_inverse_db_table[y]; AV_DEBUG(" vec[ %d ] = %d \n", x, y); } @@ -1307,7 +1424,7 @@ predicted=ly+off; } if (lx+j < vf->x_list[1]) { - vec[lx+j]=floor1_inverse_db_table[predicted]; + vec[lx+j]=ff_vorbis_floor1_inverse_db_table[predicted]; } }*/ @@ -1318,7 +1435,7 @@ if (hx<vf->x_list[1]) { for(i=hx;i<vf->x_list[1];++i) { - vec[i]=floor1_inverse_db_table[hy]; + vec[i]=ff_vorbis_floor1_inverse_db_table[hy]; } } Added: trunk/libavcodec/vorbis.h ============================================================================== --- (empty file) +++ trunk/libavcodec/vorbis.h Sat Sep 30 20:47:15 2006 @@ -0,0 +1,25 @@ +/* + * copyright (c) 2006 Oded Shimon <ods15 at ods15.dyndns.org> + * + * 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 + */ + +#ifndef VORBIS_H +#define VORBIS_H + +extern const float ff_vorbis_floor1_inverse_db_table[256]; +extern const float * ff_vorbis_vwin[8]; + +#endif Copied: trunk/libavcodec/vorbis_data.c (from r6396, /trunk/libavcodec/vorbis.h) ============================================================================== --- /trunk/libavcodec/vorbis.h (original) +++ trunk/libavcodec/vorbis_data.c Sat Sep 30 20:47:15 2006 @@ -16,130 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define ALT_BITSTREAM_READER_LE -#include "avcodec.h" -#include "bitstream.h" -#include "dsputil.h" - -typedef struct { - uint_fast8_t dimensions; - uint_fast8_t lookup_type; - uint_fast8_t maxdepth; - VLC vlc; - float *codevectors; - unsigned int nb_bits; -} vorbis_codebook; - -typedef union vorbis_floor_u vorbis_floor_data; -typedef struct vorbis_floor0_s vorbis_floor0; -typedef struct vorbis_floor1_s vorbis_floor1; -struct vorbis_context_s; -typedef -uint_fast8_t (* vorbis_floor_decode_func) - (struct vorbis_context_s *, vorbis_floor_data *, float *); -typedef struct { - uint_fast8_t floor_type; - vorbis_floor_decode_func decode; - union vorbis_floor_u - { - struct vorbis_floor0_s - { - uint_fast8_t order; - uint_fast16_t rate; - uint_fast16_t bark_map_size; - int_fast32_t * map[2]; - uint_fast32_t map_size[2]; - uint_fast8_t amplitude_bits; - uint_fast8_t amplitude_offset; - uint_fast8_t num_books; - uint_fast8_t * book_list; - float * lsp; - } t0; - struct vorbis_floor1_s - { - uint_fast8_t partitions; - uint_fast8_t maximum_class; - uint_fast8_t partition_class[32]; - uint_fast8_t class_dimensions[16]; - uint_fast8_t class_subclasses[16]; - uint_fast8_t class_masterbook[16]; - int_fast16_t subclass_books[16][8]; - uint_fast8_t multiplier; - uint_fast16_t x_list_dim; - uint_fast16_t *x_list; - uint_fast16_t *x_list_order; - uint_fast16_t *low_neighbour; - uint_fast16_t *high_neighbour; - } t1; - } data; -} vorbis_floor; - -typedef struct { - uint_fast16_t type; - uint_fast32_t begin; - uint_fast32_t end; - uint_fast32_t partition_size; - uint_fast8_t classifications; - uint_fast8_t classbook; - int_fast16_t books[64][8]; - uint_fast8_t maxpass; -} vorbis_residue; - -typedef struct { - uint_fast8_t submaps; - uint_fast16_t coupling_steps; - uint_fast8_t *magnitude; - uint_fast8_t *angle; - uint_fast8_t *mux; - uint_fast8_t submap_floor[16]; - uint_fast8_t submap_residue[16]; -} vorbis_mapping; - -typedef struct { - uint_fast8_t blockflag; - uint_fast16_t windowtype; - uint_fast16_t transformtype; - uint_fast8_t mapping; -} vorbis_mode; - -typedef struct vorbis_context_s { - AVCodecContext *avccontext; - GetBitContext gb; - DSPContext dsp; - - MDCTContext mdct[2]; - uint_fast8_t first_frame; - uint_fast32_t version; - uint_fast8_t audio_channels; - uint_fast32_t audio_samplerate; - uint_fast32_t bitrate_maximum; - uint_fast32_t bitrate_nominal; - uint_fast32_t bitrate_minimum; - uint_fast32_t blocksize[2]; - const float * win[2]; - uint_fast16_t codebook_count; - vorbis_codebook *codebooks; - uint_fast8_t floor_count; - vorbis_floor *floors; - uint_fast8_t residue_count; - vorbis_residue *residues; - uint_fast8_t mapping_count; - vorbis_mapping *mappings; - uint_fast8_t mode_count; - vorbis_mode *modes; - uint_fast8_t mode_number; // mode number for the current packet - float *channel_residues; - float *channel_floors; - float *saved; - uint_fast16_t saved_start; - float *ret; - float *buf; - float *buf_tmp; - uint_fast32_t add_bias; // for float->int conversion - uint_fast32_t exp_bias; -} vorbis_context; - - +#include "vorbis.h" static const float vwin64[32] = { 0.0009460463F, 0.0085006468F, 0.0235352254F, 0.0458950567F, @@ -2205,7 +2082,7 @@ 1.0000000000F, 1.0000000000F, 1.0000000000F, 1.0000000000F, }; -static const float floor1_inverse_db_table[256]={ +const float ff_vorbis_floor1_inverse_db_table[256]={ 1.0649863e-07F, 1.1341951e-07F, 1.2079015e-07F, 1.2863978e-07F, 1.3699951e-07F, 1.4590251e-07F, 1.5538408e-07F, 1.6548181e-07F, 1.7623575e-07F, 1.8768855e-07F, 1.9988561e-07F, 2.128753e-07F, @@ -2272,3 +2149,5 @@ 0.82788260F, 0.88168307F, 0.9389798F, 1.F, }; +const float * ff_vorbis_vwin[8] = { vwin64, vwin128, vwin256, vwin512, vwin1024, vwin2048, vwin4096, vwin8192 }; +

2 1

r6397 - trunk/libavcodec/avcodec.h
by subversion＠mplayerhq.hu 30 Sep '06

30 Sep '06

Author: michael Date: Sat Sep 30 20:16:38 2006 New Revision: 6397 Modified: trunk/libavcodec/avcodec.h Log: marking AVPaletteControl as deprecated due to thread saftey amongth other issues (it doesnt work if theres any delay between demuxer and decoder) Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Sat Sep 30 20:16:38 2006 @@ -2086,6 +2086,7 @@ * AVPaletteControl * This structure defines a method for communicating palette changes * between and demuxer and a decoder. + * this is totally broken, palette changes should be sent as AVPackets */ #define AVPALETTE_SIZE 1024 #define AVPALETTE_COUNT 256 @@ -2101,7 +2102,7 @@ * data is probably 6 bits in size and needs to be scaled */ unsigned int palette[AVPALETTE_COUNT]; -} AVPaletteControl; +} AVPaletteControl attribute_deprecated; typedef struct AVSubtitleRect { uint16_t x;

1 0