November 2005 - ffmpeg-cvslog

[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec bmp.c, NONE, 1.1 allcodecs.c, 1.115, 1.116 Makefile, 1.212, 1.213 avcodec.h, 1.428, 1.429
by mru＠mplayerhq.hu 30 Nov '05

30 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv3074/libavcodec Modified Files: allcodecs.c Makefile avcodec.h Added Files: bmp.c Log Message: BMP image decoder --- NEW FILE: bmp.c --- /* * BMP image format * Copyright (c) 2005 Mans Rullgard * * 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 "avcodec.h" #include "bitstream.h" #include "bswap.h" typedef struct BMPContext { AVFrame picture; } BMPContext; #define BMP_RGB 0 #define BMP_RLE8 1 #define BMP_RLE4 2 #define BMP_BITFIELDS 3 #define read16(bits) bswap_16(get_bits(bits, 16)) #define read32(bits) bswap_32(get_bits_long(bits, 32)) static int bmp_decode_init(AVCodecContext *avctx){ BMPContext *s = avctx->priv_data; avcodec_get_frame_defaults((AVFrame*)&s->picture); avctx->coded_frame = (AVFrame*)&s->picture; return 0; } static int bmp_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) { BMPContext *s = avctx->priv_data; AVFrame *picture = data; AVFrame *p = &s->picture; GetBitContext bits; unsigned int fsize, hsize; int width, height; unsigned int depth; unsigned int comp; unsigned int ihsize; int i, j, n, linesize; uint32_t rgb[3]; uint8_t *ptr; int dsize; if(buf_size < 14){ av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size); return -1; } init_get_bits(&bits, buf, buf_size); if(get_bits(&bits, 16) != 0x424d){ /* 'BM' */ av_log(avctx, AV_LOG_ERROR, "bad magic number\n"); return -1; } fsize = read32(&bits); if(buf_size < fsize){ av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n", buf_size, fsize); return -1; } skip_bits(&bits, 16); /* reserved1 */ skip_bits(&bits, 16); /* reserved2 */ hsize = read32(&bits); /* header size */ if(fsize <= hsize){ av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n", fsize, hsize); return -1; } ihsize = read32(&bits); /* more header size */ if(ihsize + 14 > hsize){ av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize); return -1; } width = read32(&bits); height = read32(&bits); if(read16(&bits) != 1){ /* planes */ av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n"); return -1; } depth = read16(&bits); if(ihsize > 16) comp = read32(&bits); else comp = BMP_RGB; if(comp != BMP_RGB && comp != BMP_BITFIELDS){ av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp); return -1; } if(comp == BMP_BITFIELDS){ skip_bits(&bits, 20 * 8); rgb[0] = read32(&bits); rgb[1] = read32(&bits); rgb[2] = read32(&bits); } avctx->codec_id = CODEC_ID_BMP; avctx->width = width; avctx->height = height > 0? height: -height; avctx->pix_fmt = PIX_FMT_NONE; switch(depth){ case 32: if(comp == BMP_BITFIELDS){ rgb[0] = (rgb[0] >> 15) & 3; rgb[1] = (rgb[1] >> 15) & 3; rgb[2] = (rgb[2] >> 15) & 3; if(rgb[0] + rgb[1] + rgb[2] != 3 || rgb[0] == rgb[1] || rgb[0] == rgb[2] || rgb[1] == rgb[2]){ break; } } else { rgb[0] = 2; rgb[1] = 1; rgb[2] = 0; } avctx->pix_fmt = PIX_FMT_BGR24; break; case 24: avctx->pix_fmt = PIX_FMT_BGR24; break; case 16: if(comp == BMP_RGB) avctx->pix_fmt = PIX_FMT_RGB555; break; default: av_log(avctx, AV_LOG_ERROR, "depth %d not supported\n", depth); return -1; } if(avctx->pix_fmt == PIX_FMT_NONE){ av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n"); return -1; } p->reference = 0; if(avctx->get_buffer(avctx, p) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } p->pict_type = FF_I_TYPE; p->key_frame = 1; buf += hsize; dsize = buf_size - hsize; n = avctx->width * (depth / 8); if(n * avctx->height > dsize){ av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n", dsize, n * avctx->height); return -1; } if(height > 0){ ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; linesize = -p->linesize[0]; } else { ptr = p->data[0]; linesize = p->linesize[0]; } switch(depth){ case 24: for(i = 0; i < avctx->height; i++){ memcpy(ptr, buf, n); buf += n; ptr += linesize; } break; case 16: for(i = 0; i < avctx->height; i++){ uint16_t *src = (uint16_t *) buf; uint16_t *dst = (uint16_t *) ptr; for(j = 0; j < avctx->width; j++) *dst++ = le2me_16(*src++); buf += n; ptr += linesize; } break; case 32: for(i = 0; i < avctx->height; i++){ uint8_t *src = buf; uint8_t *dst = ptr; for(j = 0; j < avctx->width; j++){ dst[0] = src[rgb[2]]; dst[1] = src[rgb[1]]; dst[2] = src[rgb[0]]; dst += 3; src += 4; } buf += n; ptr += linesize; } break; default: av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n"); return -1; } *picture = s->picture; *data_size = sizeof(AVPicture); return buf_size; } AVCodec bmp_decoder = { "bmp", CODEC_TYPE_VIDEO, CODEC_ID_BMP, sizeof(BMPContext), bmp_decode_init, NULL, NULL, bmp_decode_frame }; Index: allcodecs.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- allcodecs.c 21 Nov 2005 20:03:35 -0000 1.115 +++ allcodecs.c 30 Nov 2005 01:40:50 -0000 1.116 @@ -518,6 +518,10 @@ #endif //CONFIG_ENCODERS #endif /* AMR_WB */ +#ifdef CONFIG_BMP_DECODER + register_avcodec(&bmp_decoder); +#endif + /* pcm codecs */ #if defined (CONFIG_ENCODERS) && defined (CONFIG_DECODERS) #define PCM_CODEC(id, name) \ Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.212 retrieving revision 1.213 diff -u -d -r1.212 -r1.213 --- Makefile 21 Nov 2005 20:03:35 -0000 1.212 +++ Makefile 30 Nov 2005 01:40:50 -0000 1.213 @@ -197,8 +197,10 @@ ifeq ($(CONFIG_XL_DECODER),yes) OBJS+= xl.o endif - - +ifeq ($(CONFIG_BMP_DECODER),yes) + OBJS+= bmp.o +endif + AMROBJS= ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB_FIXED),yes) Index: avcodec.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v retrieving revision 1.428 retrieving revision 1.429 diff -u -d -r1.428 -r1.429 --- avcodec.h 14 Nov 2005 22:17:29 -0000 1.428 +++ avcodec.h 30 Nov 2005 01:40:50 -0000 1.429 @@ -112,6 +112,7 @@ CODEC_ID_INDEO2, CODEC_ID_FRAPS, CODEC_ID_TRUEMOTION2, + CODEC_ID_BMP, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, @@ -2071,6 +2072,7 @@ extern AVCodec fraps_decoder; extern AVCodec libgsm_encoder; extern AVCodec libgsm_decoder; +extern AVCodec bmp_decoder; /* pcm codecs */ #define PCM_CODEC(id, name) \

6 9

CVS: ffmpeg/libavformat avienc.c,1.114,1.115
by gpoirier＠mplayerhq.hu 30 Nov '05

30 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv24490/libavformat Modified Files: avienc.c Log Message: add some h.264 fourccs to codec_bmp_tags[] Index: avienc.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- avienc.c 13 Nov 2005 03:32:12 -0000 1.114 +++ avienc.c 30 Nov 2005 10:50:13 -0000 1.115 @@ -77,6 +77,10 @@ important if multiple tags possible for a given codec. */ const CodecTag codec_bmp_tags[] = { { CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('h', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('X', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('x', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, { CODEC_ID_H263, MKTAG('H', '2', '6', '3') },

1 0

CVS: ffmpeg/libavformat img2.c,1.17,1.18
by mru＠mplayerhq.hu 30 Nov '05

30 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv3074/libavformat Modified Files: img2.c Log Message: BMP image decoder Index: img2.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/img2.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- img2.c 17 Jul 2005 22:24:35 -0000 1.17 +++ img2.c 30 Nov 2005 01:40:50 -0000 1.18 @@ -51,6 +51,7 @@ { CODEC_ID_MPEG4 , "mpg4-img"}, { CODEC_ID_FFV1 , "ffv1-img"}, { CODEC_ID_RAWVIDEO , "y"}, + { CODEC_ID_BMP , "bmp"}, {0, NULL} };

1 0

CVS: ffmpeg configure,1.215,1.216
by mru＠mplayerhq.hu 29 Nov '05

29 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv564 Modified Files: configure Log Message: use $CFLAGS and $LDFLAGS in dlopen() check Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.215 retrieving revision 1.216 diff -u -d -r1.215 -r1.216 --- configure 22 Oct 2005 19:17:39 -0000 1.215 +++ configure 29 Nov 2005 21:12:30 -0000 1.216 @@ -1030,12 +1030,12 @@ ldl=-ldl -if $cc -o $TMPE $TMPC -ldl > /dev/null 2>&1 ; then +if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -ldl > /dev/null 2>&1 ; then dlfcn=yes dlopen=yes fi -if $cc -o $TMPE $TMPC > /dev/null 2>&1 ; then +if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC > /dev/null 2>&1 ; then dlfcn=yes dlopen=yes ldl="" @@ -1045,11 +1045,11 @@ int main( void ) { return (int) dlopen("foo", 0); } EOF -if $cc -o $TMPE $TMPC -ldl > /dev/null 2>&1 ; then +if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -ldl > /dev/null 2>&1 ; then dlopen=yes fi -if $cc -o $TMPE $TMPC > /dev/null 2>&1 ; then +if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC > /dev/null 2>&1 ; then dlopen=yes ldl="" fi

1 0

CVS: ffmpeg/libavcodec Makefile, 1.211, 1.212 allcodecs.c, 1.114, 1.115
by gpoirier＠mplayerhq.hu 21 Nov '05

21 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv28819/libavcodec Modified Files: Makefile allcodecs.c Log Message: Make DV(B|D) subtitles (en|de)coders be conditonnaly compiled depending on the configure system Original thread: Date: Nov 20, 2005 9:25 PM Subject: [PATCH] make dvdsub encoder depend on config variables Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.211 retrieving revision 1.212 diff -u -d -r1.211 -r1.212 --- Makefile 14 Nov 2005 22:17:29 -0000 1.211 +++ Makefile 21 Nov 2005 20:03:35 -0000 1.212 @@ -18,7 +18,7 @@ fft.o mdct.o raw.o golomb.o cabac.o\ dpcm.o adx.o faandct.o parser.o g726.o \ vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \ - dvdsub.o dvbsub.o dvbsubdec.o dvdsubenc.o opt.o + opt.o ifeq ($(CONFIG_AASC_DECODER),yes) OBJS+= aasc.o @@ -38,6 +38,18 @@ ifeq ($(CONFIG_CYUV_DECODER),yes) OBJS+= cyuv.o endif +ifeq ($(CONFIG_DVBSUB_DECODER),yes) + OBJS+= dvbsubdec.o +endif +ifeq ($(CONFIG_DVBSUB_ENCODER),yes) + OBJS+= dvbsub.o +endif +ifeq ($(CONFIG_DVDSUB_DECODER),yes) + OBJS+= dvdsub.o +endif +ifeq ($(CONFIG_DVDSUB_ENCODER),yes) + OBJS+= dvdsubenc.o +endif ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),) OBJS+= dv.o endif Index: allcodecs.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- allcodecs.c 14 Nov 2005 22:17:29 -0000 1.114 +++ allcodecs.c 21 Nov 2005 20:03:35 -0000 1.115 @@ -568,15 +568,19 @@ #undef PCM_CODEC /* subtitles */ -#ifdef CONFIG_ENCODERS - register_avcodec(&dvbsub_encoder); +#ifdef CONFIG_DVDSUB_DECODER + register_avcodec(&dvdsub_decoder); +#endif +#ifdef CONFIG_DVDSUB_ENCODER register_avcodec(&dvdsub_encoder); #endif -#ifdef CONFIG_DECODERS - register_avcodec(&dvdsub_decoder); +#ifdef CONFIG_DVBSUB_DECODER register_avcodec(&dvbsub_decoder); #endif +#ifdef CONFIG_DVBSUB_ENCODER + register_avcodec(&dvbsub_encoder); +#endif /* parsers */ av_register_codec_parser(&mpegvideo_parser); @@ -595,7 +599,12 @@ #ifdef CONFIG_AC3 av_register_codec_parser(&ac3_parser); #endif + +#ifdef CONFIG_DVDSUB_DECODER av_register_codec_parser(&dvdsub_parser); +#endif +#ifdef CONFIG_DVBSUB_DECODER av_register_codec_parser(&dvbsub_parser); +#endif }

1 0

CVS: ffmpeg/libavcodec mpeg12.c,1.242,1.243
by iive＠mplayerhq.hu 20 Nov '05

20 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv9660 Modified Files: mpeg12.c Log Message: Mark all 12 block unused when there are no coded blocks Fixes 422/444 artifacts Index: mpeg12.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpeg12.c,v retrieving revision 1.242 retrieving revision 1.243 diff -u -d -r1.242 -r1.243 --- mpeg12.c 14 Aug 2005 15:42:39 -0000 1.242 +++ mpeg12.c 20 Nov 2005 23:09:05 -0000 1.243 @@ -1436,7 +1436,7 @@ } } }else{ - for(i=0;i<6;i++) + for(i=0;i<12;i++) s->block_last_index[i] = -1; } }

1 0

CVS: ffmpeg/libavcodec dvdsubenc.c, NONE, 1.1 Makefile, 1.210, 1.211 avcodec.h, 1.427, 1.428 allcodecs.c, 1.113, 1.114 dvbsub.c, 1.2, 1.3
by gpoirier＠mplayerhq.hu 20 Nov '05

20 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv3054/libavcodec Modified Files: Makefile avcodec.h allcodecs.c dvbsub.c Added Files: dvdsubenc.c Log Message: dvbsub encoder, patch by Wolfram Gloger < wmglo AH dent POIS med POIS uni-muenchen POIS de > Original thread: Date: 8 Oct 2005 09:35:38 -0000 Subject: [Ffmpeg-devel] [PATCH] dvdsub encoder -- 2nd version --- NEW FILE: dvdsubenc.c --- /* * DVD subtitle encoding for ffmpeg * Copyright (c) 2005 Wolfram Gloger. * * 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 "avcodec.h" #undef NDEBUG #include <assert.h> typedef struct DVDSubtitleContext { } DVDSubtitleContext; // ncnt is the nibble counter #define PUTNIBBLE(val)\ do {\ if (ncnt++ & 1)\ *q++ = bitbuf | ((val) & 0x0f);\ else\ bitbuf = (val) << 4;\ } while(0) static void dvd_encode_rle(uint8_t **pq, const uint8_t *bitmap, int linesize, int w, int h, const int cmap[256]) { uint8_t *q; unsigned int bitbuf = 0; int ncnt; int x, y, len, color; q = *pq; for (y = 0; y < h; ++y) { ncnt = 0; for(x = 0; x < w; x += len) { color = bitmap[x]; for (len=1; x+len < w; ++len) if (bitmap[x+len] != color) break; color = cmap[color]; assert(color < 4); if (len < 0x04) { PUTNIBBLE((len << 2)|color); } else if (len < 0x10) { PUTNIBBLE(len >> 2); PUTNIBBLE((len << 2)|color); } else if (len < 0x40) { PUTNIBBLE(0); PUTNIBBLE(len >> 2); PUTNIBBLE((len << 2)|color); } else if (x+len == w) { PUTNIBBLE(0); PUTNIBBLE(0); PUTNIBBLE(0); PUTNIBBLE(color); } else { if (len > 0xff) len = 0xff; PUTNIBBLE(0); PUTNIBBLE(len >> 6); PUTNIBBLE(len >> 2); PUTNIBBLE((len << 2)|color); } } /* end of line */ if (ncnt & 1) PUTNIBBLE(0); bitmap += linesize; } *pq = q; } static inline void putbe16(uint8_t **pq, uint16_t v) { uint8_t *q = *pq; *q++ = v >> 8; *q++ = v; *pq = q; } static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size, const AVSubtitle *h) { uint8_t *q, *qq; int object_id; int offset1[20], offset2[20]; int i, imax, color, alpha, rects = h->num_rects; unsigned long hmax; unsigned long hist[256]; int cmap[256]; if (rects == 0 || h->rects == NULL) return -1; if (rects > 20) rects = 20; // analyze bitmaps, compress to 4 colors for (i=0; i<256; ++i) { hist[i] = 0; cmap[i] = 0; } for (object_id = 0; object_id < rects; object_id++) for (i=0; i<h->rects[object_id].w*h->rects[object_id].h; ++i) { color = h->rects[object_id].bitmap[i]; // only count non-transparent pixels alpha = h->rects[object_id].rgba_palette[color] >> 24; hist[color] += alpha; } for (color=3;; --color) { hmax = 0; imax = 0; for (i=0; i<256; ++i) if (hist[i] > hmax) { imax = i; hmax = hist[i]; } if (hmax == 0) break; if (color == 0) color = 3; av_log(NULL, AV_LOG_DEBUG, "dvd_subtitle hist[%d]=%ld -> col %d\n", imax, hist[imax], color); cmap[imax] = color; hist[imax] = 0; } // encode data block q = outbuf + 4; for (object_id = 0; object_id < rects; object_id++) { offset1[object_id] = q - outbuf; // worst case memory requirement: 1 nibble per pixel.. if ((q - outbuf) + h->rects[object_id].w*h->rects[object_id].h/2 + 17*rects + 21 > outbuf_size) { av_log(NULL, AV_LOG_ERROR, "dvd_subtitle too big\n"); return -1; } dvd_encode_rle(&q, h->rects[object_id].bitmap, h->rects[object_id].w*2, h->rects[object_id].w, h->rects[object_id].h >> 1, cmap); offset2[object_id] = q - outbuf; dvd_encode_rle(&q, h->rects[object_id].bitmap + h->rects[object_id].w, h->rects[object_id].w*2, h->rects[object_id].w, h->rects[object_id].h >> 1, cmap); } // set data packet size qq = outbuf + 2; putbe16(&qq, q - outbuf); // send start display command putbe16(&q, (h->start_display_time*90) >> 10); putbe16(&q, (q - outbuf) /*- 2 */ + 8 + 12*rects + 2); *q++ = 0x03; // palette - 4 nibbles *q++ = 0x03; *q++ = 0x7f; *q++ = 0x04; // alpha - 4 nibbles *q++ = 0xf0; *q++ = 0x00; //*q++ = 0x0f; *q++ = 0xff; // XXX not sure if more than one rect can really be encoded.. // 12 bytes per rect for (object_id = 0; object_id < rects; object_id++) { int x2 = h->rects[object_id].x + h->rects[object_id].w - 1; int y2 = h->rects[object_id].y + h->rects[object_id].h - 1; *q++ = 0x05; // x1 x2 -> 6 nibbles *q++ = h->rects[object_id].x >> 4; *q++ = (h->rects[object_id].x << 4) | ((x2 >> 8) & 0xf); *q++ = x2; // y1 y2 -> 6 nibbles *q++ = h->rects[object_id].y >> 4; *q++ = (h->rects[object_id].y << 4) | ((y2 >> 8) & 0xf); *q++ = y2; *q++ = 0x06; // offset1, offset2 putbe16(&q, offset1[object_id]); putbe16(&q, offset2[object_id]); } *q++ = 0x01; // start command *q++ = 0xff; // terminating command // send stop display command last putbe16(&q, (h->end_display_time*90) >> 10); putbe16(&q, (q - outbuf) - 2 /*+ 4*/); *q++ = 0x02; // set end *q++ = 0xff; // terminating command qq = outbuf; putbe16(&qq, q - outbuf); av_log(NULL, AV_LOG_DEBUG, "subtitle_packet size=%d\n", q - outbuf); return q - outbuf; } static int dvdsub_init_encoder(AVCodecContext *avctx) { return 0; } static int dvdsub_close_encoder(AVCodecContext *avctx) { return 0; } static int dvdsub_encode(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) { //DVDSubtitleContext *s = avctx->priv_data; AVSubtitle *sub = data; int ret; ret = encode_dvd_subtitles(buf, buf_size, sub); return ret; } AVCodec dvdsub_encoder = { "dvdsub", CODEC_TYPE_SUBTITLE, CODEC_ID_DVD_SUBTITLE, sizeof(DVDSubtitleContext), dvdsub_init_encoder, dvdsub_encode, dvdsub_close_encoder, }; /* Local Variables: */ /* c-basic-offset:4 */ /* End: */ Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.210 retrieving revision 1.211 diff -u -d -r1.210 -r1.211 --- Makefile 7 Nov 2005 01:32:29 -0000 1.210 +++ Makefile 14 Nov 2005 22:17:29 -0000 1.211 @@ -17,8 +17,8 @@ ratecontrol.o adpcm.o eval.o error_resilience.o \ fft.o mdct.o raw.o golomb.o cabac.o\ dpcm.o adx.o faandct.o parser.o g726.o \ - vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o\ - opt.o + vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \ + dvdsub.o dvbsub.o dvbsubdec.o dvdsubenc.o opt.o ifeq ($(CONFIG_AASC_DECODER),yes) OBJS+= aasc.o Index: avcodec.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v retrieving revision 1.427 retrieving revision 1.428 diff -u -d -r1.427 -r1.428 --- avcodec.h 4 Nov 2005 23:24:24 -0000 1.427 +++ avcodec.h 14 Nov 2005 22:17:29 -0000 1.428 @@ -2124,6 +2124,7 @@ extern AVCodec dts_decoder; /* subtitles */ +extern AVCodec dvdsub_encoder; extern AVCodec dvdsub_decoder; extern AVCodec dvbsub_encoder; extern AVCodec dvbsub_decoder; Index: allcodecs.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- allcodecs.c 26 Oct 2005 12:51:10 -0000 1.113 +++ allcodecs.c 14 Nov 2005 22:17:29 -0000 1.114 @@ -570,6 +570,7 @@ /* subtitles */ #ifdef CONFIG_ENCODERS register_avcodec(&dvbsub_encoder); + register_avcodec(&dvdsub_encoder); #endif #ifdef CONFIG_DECODERS Index: dvbsub.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dvbsub.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dvbsub.c 17 Jul 2005 00:28:11 -0000 1.2 +++ dvbsub.c 14 Nov 2005 22:17:29 -0000 1.3 @@ -343,10 +343,10 @@ for (object_id = 0; object_id < h->num_rects; object_id++) { /* Object Data segment */ - if (h->rects[region_id].nb_colors <= 4) { + if (h->rects[object_id].nb_colors <= 4) { /* 2 bpp, some decoders do not support it correctly */ bpp_index = 0; - } else if (h->rects[region_id].nb_colors <= 16) { + } else if (h->rects[object_id].nb_colors <= 16) { /* 4 bpp, standard encoding */ bpp_index = 1; } else {

4 4

CVS: ffmpeg Changelog,1.53,1.54
by diego＠mplayerhq.hu 15 Nov '05

15 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv14079 Modified Files: Changelog Log Message: ffserver fixed Index: Changelog =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/Changelog,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- Changelog 25 Oct 2005 10:16:46 -0000 1.53 +++ Changelog 15 Nov 2005 10:28:48 -0000 1.54 @@ -23,6 +23,7 @@ - Duck TrueMotion 2 decoder - Support for decoding FLX and DTA extensions in FLIC files - H.264 custom quantization matrices support +- ffserver fixed, it should now be usable again version 0.4.9-pre1:

1 0

CVS: ffmpeg/libavcodec vp3.c,1.71,1.72
by alex＠mplayerhq.hu 13 Nov '05

13 Nov '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv28399 Modified Files: vp3.c Log Message: Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable. Index: vp3.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- vp3.c 13 Nov 2005 17:48:27 -0000 1.71 +++ vp3.c 13 Nov 2005 17:59:21 -0000 1.72 @@ -2407,7 +2407,11 @@ if (s->theora && get_bits1(&gb)) { - int ptype = get_bits(&gb, 7); +#if 1 + av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n"); + return -1; +#else + int ptype = get_bits(&gb, 7); skip_bits(&gb, 6*8); /* "theora" */ @@ -2424,6 +2428,7 @@ av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype); } return buf_size; +#endif } s->keyframe = !get_bits1(&gb); @@ -2667,12 +2672,27 @@ s->height = get_bits(&gb, 16) << 4; if(avcodec_check_dimensions(avctx, s->width, s->height)){ + av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height); s->width= s->height= 0; return -1; } - - skip_bits(&gb, 24); /* frame width */ - skip_bits(&gb, 24); /* frame height */ + + if (s->theora >= 0x030400) + { + skip_bits(&gb, 32); /* total number of superblocks in a frame */ + // fixme, the next field is 36bits long + skip_bits(&gb, 32); /* total number of blocks in a frame */ + skip_bits(&gb, 4); /* total number of blocks in a frame */ + skip_bits(&gb, 32); /* total number of macroblocks in a frame */ + + skip_bits(&gb, 24); /* frame width */ + skip_bits(&gb, 24); /* frame height */ + } + else + { + skip_bits(&gb, 24); /* frame width */ + skip_bits(&gb, 24); /* frame height */ + } skip_bits(&gb, 8); /* offset x */ skip_bits(&gb, 8); /* offset y */ @@ -2685,14 +2705,18 @@ if (s->theora < 0x030200) skip_bits(&gb, 5); /* keyframe frequency force */ skip_bits(&gb, 8); /* colorspace */ + if (s->theora >= 0x030400) + skip_bits(&gb, 2); /* pixel format: 420,res,422,444 */ skip_bits(&gb, 24); /* bitrate */ - skip_bits(&gb, 6); /* last(?) quality index */ + skip_bits(&gb, 6); /* quality hint */ if (s->theora >= 0x030200) { skip_bits(&gb, 5); /* keyframe frequency force */ - skip_bits(&gb, 5); /* spare bits */ + + if (s->theora < 0x030400) + skip_bits(&gb, 5); /* spare bits */ } // align_get_bits(&gb); @@ -2703,25 +2727,53 @@ return 0; } -static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb) +static inline int theora_get_32bit(GetBitContext gb) { - int nb_comments, i, tmp; + int ret = get_bits(&gb, 8); + ret += get_bits(&gb, 8) << 8; + ret += get_bits(&gb, 8) << 16; + ret += get_bits(&gb, 8) << 24; + + return ret; +} - tmp = get_bits_long(&gb, 32); - tmp = be2me_32(tmp); - while(tmp--) - skip_bits(&gb, 8); +static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb) +{ + Vp3DecodeContext *s = avctx->priv_data; + int len; - nb_comments = get_bits_long(&gb, 32); - nb_comments = be2me_32(nb_comments); - for (i = 0; i < nb_comments; i++) + if (s->theora <= 0x030200) { - tmp = get_bits_long(&gb, 32); - tmp = be2me_32(tmp); - while(tmp--) + int i, comments; + + // vendor string + len = get_bits_long(&gb, 32); + len = le2me_32(len); + while(len--) skip_bits(&gb, 8); + + // user comments + comments = get_bits_long(&gb, 32); + comments = le2me_32(comments); + for (i = 0; i < comments; i++) + { + len = get_bits_long(&gb, 32); + len = be2me_32(len); + while(len--) + skip_bits(&gb, 8); + } } - + else + { + do { + len = get_bits_long(&gb, 32); + len = le2me_32(len); + if (len <= 0) + break; + while (len--) + skip_bits(&gb, 8); + } while (1); + } return 0; } @@ -2758,7 +2810,7 @@ else n = 3; if (n != 3) { - av_log(NULL,AV_LOG_ERROR, "unsupported nbms : %d\n", n); + av_log(avctx,AV_LOG_ERROR, "unsupported nbms : %d\n", n); return -1; } /* y coeffs */ @@ -2793,7 +2845,7 @@ skip_bits(&gb, av_log2(2)+1); } if (qi > 63) - av_log(NULL, AV_LOG_ERROR, "error...\n"); + av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi); } } } @@ -2825,7 +2877,10 @@ s->theora = 1; if (!avctx->extradata_size) + { + av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n"); return -1; + } for(i=0;i<3;i++) { op_bytes = *(p++)<<8; @@ -2837,9 +2892,13 @@ ptype = get_bits(&gb, 8); debug_vp3("Theora headerpacket type: %x\n", ptype); - if (!(ptype & 0x80)) + if (!(ptype & 0x80)) + { + av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n"); return -1; - + } + + // FIXME: check for this aswell skip_bits(&gb, 6*8); /* "theora" */ switch(ptype) @@ -2853,6 +2912,9 @@ case 0x82: theora_decode_tables(avctx, gb); break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80); + break; } }

5 7

theora init
by castet.matthieu＠free.fr 13 Nov '05

13 Nov '05

Hi, I attach a more generic init. I was in my local ffmpeg tree for months. It add nothing new, just 3 that is now base_mats. Matthieu

2 1