October 2005 - ffmpeg-cvslog - lists.ffmpeg.org

CVS: ffmpeg/libavformat flic.c,1.7,1.8
by melanson＠mplayerhq.hu 13 Oct '05

13 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv20847/libavformat Modified Files: flic.c Log Message: support for FLX and DTA extensions in the FLIC format, courtesy of Steven Johnson (mplayer -at- sakuraindustries.com) Index: flic.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/flic.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- flic.c 17 Jul 2005 22:24:35 -0000 1.7 +++ flic.c 13 Oct 2005 04:35:31 -0000 1.8 @@ -33,6 +33,8 @@ #define FLIC_FILE_MAGIC_1 0xAF11 #define FLIC_FILE_MAGIC_2 0xAF12 +#define FLIC_FILE_MAGIC_3 0xAF44 /* Flic Type for Extended FLX Format which + originated in Dave's Targa Animator (DTA) */ #define FLIC_CHUNK_MAGIC_1 0xF1FA #define FLIC_CHUNK_MAGIC_2 0xF5FA #define FLIC_MC_PTS_INC 6000 /* pts increment for Magic Carpet game FLIs */ @@ -56,7 +58,8 @@ magic_number = LE_16(&p->buf[4]); if ((magic_number != FLIC_FILE_MAGIC_1) && - (magic_number != FLIC_FILE_MAGIC_2)) + (magic_number != FLIC_FILE_MAGIC_2) && + (magic_number != FLIC_FILE_MAGIC_3)) return 0; return AVPROBE_SCORE_MAX; @@ -129,7 +132,8 @@ * therefore, the frame pts increment = n * 1285.7 */ flic->frame_pts_inc = speed * 1285.7; - } else if (magic_number == FLIC_FILE_MAGIC_2) { + } else if ((magic_number == FLIC_FILE_MAGIC_2) || + (magic_number == FLIC_FILE_MAGIC_3)) { /* * in this case, the speed (n) is number of milliseconds between frames: * @@ -206,7 +210,7 @@ static AVInputFormat flic_iformat = { "flic", - "FLI/FLC animation format", + "FLI/FLC/FLX animation format", sizeof(FlicDemuxContext), flic_probe, flic_read_header,

1 0

CVS: ffmpeg/libavformat avienc.c,1.112,1.113
by melanson＠mplayerhq.hu 13 Oct '05

13 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv19767/libavformat Modified Files: avienc.c Log Message: Duck TrueMotion 2 video decoder, courtesy of Konstantin Shishkov Index: avienc.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- avienc.c 23 Sep 2005 00:25:41 -0000 1.112 +++ avienc.c 13 Oct 2005 04:31:55 -0000 1.113 @@ -188,6 +188,7 @@ { CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') }, { CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') }, { CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') }, + { CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') }, { CODEC_ID_RAWVIDEO, 0 }, { 0, 0 }, };

1 0

CVS: ffmpeg ffmpeg.c,1.353,1.354
by alex＠mplayerhq.hu 13 Oct '05

13 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv30739 Modified Files: ffmpeg.c Log Message: fix ffserver, it is working for me now again, a more elegant fix is needed though Index: ffmpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v retrieving revision 1.353 retrieving revision 1.354 diff -u -d -r1.353 -r1.354 --- ffmpeg.c 20 Sep 2005 21:43:44 -0000 1.353 +++ ffmpeg.c 12 Oct 2005 23:38:39 -0000 1.354 @@ -420,8 +420,11 @@ for(i=0;i<ic->nb_streams;i++) { AVStream *st; + // FIXME: a more elegant solution is needed st = av_mallocz(sizeof(AVStream)); memcpy(st, ic->streams[i], sizeof(AVStream)); + st->codec = avcodec_alloc_context(); + memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext)); s->streams[i] = st; } @@ -1742,8 +1745,8 @@ goto fail; ost->img_resample_ctx = img_resample_full_init( - ost->st->codec->width, ost->st->codec->height, - ist->st->codec->width, ist->st->codec->height, + codec->width, codec->height, + icodec->width, icodec->height, frame_topBand, frame_bottomBand, frame_leftBand, frame_rightBand, frame_padtop, frame_padbottom,

1 0

CVS: ffmpeg/libavformat ffm.c,1.45,1.46
by alex＠mplayerhq.hu 13 Oct '05

13 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv27982 Modified Files: ffm.c Log Message: fix feed read_header, avoid using put_tag in write_header, to be consistent with read_header, also some minor cosmetics Index: ffm.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ffm.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- ffm.c 23 Sep 2005 00:25:41 -0000 1.45 +++ ffm.c 12 Oct 2005 23:25:15 -0000 1.46 @@ -132,7 +132,7 @@ ffm->packet_size = FFM_PACKET_SIZE; /* header */ - put_tag(pb, "FFM1"); + put_le32(pb, MKTAG('F', 'F', 'M', '1')); put_be32(pb, ffm->packet_size); /* XXX: store write position in other file ? */ put_be64(pb, ffm->packet_size); /* current write position */ @@ -480,6 +480,7 @@ fst = av_mallocz(sizeof(FFMStream)); if (!fst) goto fail; + s->streams[i] = st; av_set_pts_info(st, 64, 1, 1000000); @@ -487,10 +488,10 @@ codec = st->codec; /* generic info */ - st->codec->codec_id = get_be32(pb); - st->codec->codec_type = get_byte(pb); /* codec_type */ + codec->codec_id = get_be32(pb); + codec->codec_type = get_byte(pb); /* codec_type */ codec->bit_rate = get_be32(pb); - st->quality = get_be32(pb); + st->quality = get_be32(pb); codec->flags = get_be32(pb); codec->flags2 = get_be32(pb); codec->debug = get_be32(pb);

1 0

CVS: ffmpeg/libavcodec golomb.h,1.14,1.15
by alex＠mplayerhq.hu 12 Oct '05

12 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv26838 Modified Files: golomb.h Log Message: set_se_golomb can only write 16bits, add a note about this (ok, maybe it's brain dead using it with more than 16bits, but..) Index: golomb.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/golomb.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- golomb.h 26 Feb 2005 03:36:03 -0000 1.14 +++ golomb.h 12 Oct 2005 22:43:12 -0000 1.15 @@ -391,9 +391,11 @@ } /** - * write signed exp golomb code. + * write signed exp golomb code. 16 bits at most. */ static inline void set_se_golomb(PutBitContext *pb, int i){ +// if (i>32767 || i<-32767) +// av_log(NULL,AV_LOG_ERROR,"value out of range %d\n", i); #if 0 if(i<=0) i= -2*i; else i= 2*i-1;

1 0

CVS: ffmpeg/libavcodec imgresample.c,1.25,1.26
by alex＠mplayerhq.hu 12 Oct '05

12 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv7540 Modified Files: imgresample.c Log Message: sanity check whether dimensions are non-null Index: imgresample.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/imgresample.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- imgresample.c 26 Aug 2005 19:05:44 -0000 1.25 +++ imgresample.c 12 Oct 2005 22:40:10 -0000 1.26 @@ -558,6 +558,9 @@ { ImgReSampleContext *s; + if (!owidth || !oheight || !iwidth || !iheight) + return NULL; + s = av_mallocz(sizeof(ImgReSampleContext)); if (!s) return NULL;

1 0

CVS: ffmpeg/libavformat grab.c,1.35,1.36
by alex＠mplayerhq.hu 12 Oct '05

12 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv918 Modified Files: grab.c Log Message: lame bit_rate calculation Index: grab.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/grab.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- grab.c 17 Jul 2005 22:24:35 -0000 1.35 +++ grab.c 12 Oct 2005 22:35:06 -0000 1.36 @@ -267,6 +267,7 @@ st->codec->height = height; st->codec->time_base.den = frame_rate; st->codec->time_base.num = frame_rate_base; + st->codec->bit_rate = frame_size * 1/av_q2d(st->codec->time_base) * 8; return 0; fail:

1 0

CVS: ffmpeg configure,1.210,1.211
by alex＠mplayerhq.hu 12 Oct '05

12 Oct '05

1 0

CVS: ffmpeg/libavcodec/i386 dsputil_mmx.c, 1.103, 1.104 h264dsp_mmx.c, 1.2, 1.3
by lorenm＠mplayerhq.hu 10 Oct '05

10 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/i386 In directory mail:/var2/tmp/cvs-serv4293/i386 Modified Files: dsputil_mmx.c h264dsp_mmx.c Log Message: h264 mmx weighted prediction. up to 3% overall speedup. Index: dsputil_mmx.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- dsputil_mmx.c 30 Sep 2005 02:31:47 -0000 1.103 +++ dsputil_mmx.c 9 Oct 2005 23:38:52 -0000 1.104 @@ -2832,6 +2832,24 @@ c->h264_v_loop_filter_chroma_intra= h264_v_loop_filter_chroma_intra_mmx2; c->h264_h_loop_filter_chroma_intra= h264_h_loop_filter_chroma_intra_mmx2; + c->weight_h264_pixels_tab[0]= ff_h264_weight_16x16_mmx2; + c->weight_h264_pixels_tab[1]= ff_h264_weight_16x8_mmx2; + c->weight_h264_pixels_tab[2]= ff_h264_weight_8x16_mmx2; + c->weight_h264_pixels_tab[3]= ff_h264_weight_8x8_mmx2; + c->weight_h264_pixels_tab[4]= ff_h264_weight_8x4_mmx2; + c->weight_h264_pixels_tab[5]= ff_h264_weight_4x8_mmx2; + c->weight_h264_pixels_tab[6]= ff_h264_weight_4x4_mmx2; + c->weight_h264_pixels_tab[7]= ff_h264_weight_4x2_mmx2; + + c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16x16_mmx2; + c->biweight_h264_pixels_tab[1]= ff_h264_biweight_16x8_mmx2; + c->biweight_h264_pixels_tab[2]= ff_h264_biweight_8x16_mmx2; + c->biweight_h264_pixels_tab[3]= ff_h264_biweight_8x8_mmx2; + c->biweight_h264_pixels_tab[4]= ff_h264_biweight_8x4_mmx2; + c->biweight_h264_pixels_tab[5]= ff_h264_biweight_4x8_mmx2; + c->biweight_h264_pixels_tab[6]= ff_h264_biweight_4x4_mmx2; + c->biweight_h264_pixels_tab[7]= ff_h264_biweight_4x2_mmx2; + #ifdef CONFIG_ENCODERS c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_mmx2; #endif //CONFIG_ENCODERS Index: h264dsp_mmx.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/h264dsp_mmx.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- h264dsp_mmx.c 3 Sep 2005 09:17:30 -0000 1.2 +++ h264dsp_mmx.c 9 Oct 2005 23:38:52 -0000 1.3 @@ -909,3 +909,100 @@ #undef H264_CHROMA_OP #undef H264_CHROMA_MC8_TMPL +/***********************************/ +/* weighted prediction */ + +static inline void ff_h264_weight_WxH_mmx2(uint8_t *dst, int stride, int log2_denom, int weight, int offset, int w, int h) +{ + int x, y; + offset <<= log2_denom; + offset += (1 << log2_denom) >> 1; + asm volatile( + "movd %0, %%mm4 \n\t" + "movd %1, %%mm5 \n\t" + "movd %2, %%mm6 \n\t" + "pshufw $0, %%mm4, %%mm4 \n\t" + "pshufw $0, %%mm5, %%mm5 \n\t" + "pxor %%mm7, %%mm7 \n\t" + :: "g"(weight), "g"(offset), "g"(log2_denom) + ); + for(y=0; y<h; y+=2){ + for(x=0; x<w; x+=4){ + asm volatile( + "movd %0, %%mm0 \n\t" + "movd %1, %%mm1 \n\t" + "punpcklbw %%mm7, %%mm0 \n\t" + "punpcklbw %%mm7, %%mm1 \n\t" + "pmullw %%mm4, %%mm0 \n\t" + "pmullw %%mm4, %%mm1 \n\t" + "paddw %%mm5, %%mm0 \n\t" + "paddw %%mm5, %%mm1 \n\t" + "psraw %%mm6, %%mm0 \n\t" + "psraw %%mm6, %%mm1 \n\t" + "packuswb %%mm7, %%mm0 \n\t" + "packuswb %%mm7, %%mm1 \n\t" + "movd %%mm0, %0 \n\t" + "movd %%mm1, %1 \n\t" + : "+m"(*(uint32_t*)(dst+x)), + "+m"(*(uint32_t*)(dst+x+stride)) + ); + } + dst += 2*stride; + } +} + +static inline void ff_h264_biweight_WxH_mmx2(uint8_t *dst, uint8_t *src, int stride, int log2_denom, int weightd, int weights, int offsetd, int offsets, int w, int h) +{ + int x, y; + int offset = ((offsets + offsetd + 1) | 1) << log2_denom; + asm volatile( + "movd %0, %%mm3 \n\t" + "movd %1, %%mm4 \n\t" + "movd %2, %%mm5 \n\t" + "movd %3, %%mm6 \n\t" + "pshufw $0, %%mm3, %%mm3 \n\t" + "pshufw $0, %%mm4, %%mm4 \n\t" + "pshufw $0, %%mm5, %%mm5 \n\t" + "pxor %%mm7, %%mm7 \n\t" + :: "g"(weightd), "g"(weights), "g"(offset), "g"(log2_denom+1) + ); + for(y=0; y<h; y++){ + for(x=0; x<w; x+=4){ + asm volatile( + "movd %0, %%mm0 \n\t" + "movd %1, %%mm1 \n\t" + "punpcklbw %%mm7, %%mm0 \n\t" + "punpcklbw %%mm7, %%mm1 \n\t" + "pmullw %%mm3, %%mm0 \n\t" + "pmullw %%mm4, %%mm1 \n\t" + "paddw %%mm5, %%mm0 \n\t" + "paddw %%mm1, %%mm0 \n\t" + "psraw %%mm6, %%mm0 \n\t" + "packuswb %%mm0, %%mm0 \n\t" + "movd %%mm0, %0 \n\t" + : "+m"(*(uint32_t*)(dst+x)) + : "m"(*(uint32_t*)(src+x)) + ); + } + src += stride; + dst += stride; + } +} + +#define H264_WEIGHT(W,H) \ +static void ff_h264_biweight_ ## W ## x ## H ## _mmx2(uint8_t *dst, uint8_t *src, int stride, int log2_denom, int weightd, int weights, int offsetd, int offsets){ \ + ff_h264_biweight_WxH_mmx2(dst, src, stride, log2_denom, weightd, weights, offsetd, offsets, W, H); \ +} \ +static void ff_h264_weight_ ## W ## x ## H ## _mmx2(uint8_t *dst, int stride, int log2_denom, int weight, int offset){ \ + ff_h264_weight_WxH_mmx2(dst, stride, log2_denom, weight, offset, W, H); \ +} + +H264_WEIGHT(16,16) +H264_WEIGHT(16, 8) +H264_WEIGHT( 8,16) +H264_WEIGHT( 8, 8) +H264_WEIGHT( 8, 4) +H264_WEIGHT( 4, 8) +H264_WEIGHT( 4, 4) +H264_WEIGHT( 4, 2) +

1 0

CVS: ffmpeg/libavcodec .cvsignore,1.1,1.2
by diego＠mplayerhq.hu 06 Oct '05

06 Oct '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv30940/libavcodec Modified Files: .cvsignore Log Message: Ignore AMR directories. Index: .cvsignore =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 26 Apr 2002 07:18:57 -0000 1.1 +++ .cvsignore 6 Oct 2005 12:13:25 -0000 1.2 @@ -1,2 +1,4 @@ Makefile.* .depend +amr +amr*_float

1 0