September 2005 - ffmpeg-cvslog

CVS: ffmpeg configure,1.200,1.201
by diego＠mplayerhq.hu 23 Sep '05

23 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv19763 Modified Files: configure Log Message: Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS in libavformat to allow building (de)coders and (de)muxers independently at some point + support for this option in configure. Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.200 retrieving revision 1.201 diff -u -d -r1.200 -r1.201 --- configure 21 Aug 2005 20:33:00 -0000 1.200 +++ configure 23 Sep 2005 00:25:41 -0000 1.201 @@ -78,6 +78,8 @@ echo " --disable-codec=codec disables codec" echo " --disable-encoders disables all encoders" echo " --disable-decoders disables all decoders" +echo " --disable-muxers disables all muxers" +echo " --disable-demuxers disables all demuxers" echo "" echo "NOTE: The object files are build at the place where configure is launched" exit 1 @@ -218,6 +220,8 @@ pthreads="no" gpl="no" memalignhack="no" +muxers="yes" +demuxers="yes" # OS specific targetos=`uname -s` @@ -533,6 +537,10 @@ ;; --disable-decoders) CODEC_LIST="`echo $CODEC_LIST | sed 's/[-_a-zA-Z0-9]*decoder//g'`" ;; + --disable-muxers) muxers="no" + ;; + --disable-demuxers) demuxers="no" + ;; esac done @@ -1399,6 +1407,18 @@ echo "#define CONFIG_DECODERS 1" >> $TMPH echo "CONFIG_DECODERS=yes" >> config.mak +# muxers +if test "$muxers" = "yes" ; then + echo "#define CONFIG_MUXERS 1" >> $TMPH + echo "CONFIG_MUXERS=yes" >> config.mak +fi + +# demuxers +if test "$demuxers" = "yes" ; then + echo "#define CONFIG_DEMUXERS 1" >> $TMPH + echo "CONFIG_DEMUXERS=yes" >> config.mak +fi + # AC3 if test "$a52" = "yes" ; then echo "#define CONFIG_AC3 1" >> $TMPH

1 0

CVS: ffmpeg/libavcodec bitstream.h,1.155,1.156
by aurel＠mplayerhq.hu 22 Sep '05

22 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv8633/libavcodec Modified Files: bitstream.h Log Message: fix some pointer to intger without cast warnings (patch by Michel Bardiaux) Index: bitstream.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/bitstream.h,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 --- bitstream.h 20 Sep 2005 18:51:12 -0000 1.155 +++ bitstream.h 21 Sep 2005 23:18:52 -0000 1.156 @@ -53,8 +53,10 @@ static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size) { - if(buffer_size < 0) - buffer= buffer_size= 0; + if(buffer_size < 0) { + buffer_size = 0; + buffer = NULL; + } s->buf = buffer; s->buf_end = s->buf + buffer_size; @@ -676,8 +678,10 @@ const uint8_t *buffer, int bit_size) { int buffer_size= (bit_size+7)>>3; - if(buffer_size < 0 || bit_size < 0) - buffer= buffer_size= bit_size= 0; + if(buffer_size < 0 || bit_size < 0) { + buffer_size = bit_size = 0; + buffer = NULL; + } s->buffer= buffer; s->size_in_bits= bit_size;

5 4

CVS: ffmpeg/libavcodec oggvorbis.c, 1.23, 1.24 snow.c, 1.62, 1.63 vc9.c, 1.23, 1.24
by aurel＠mplayerhq.hu 22 Sep '05

22 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv7794/libavcodec Modified Files: oggvorbis.c snow.c vc9.c Log Message: fix unused variable warnings Index: oggvorbis.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/oggvorbis.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- oggvorbis.c 4 Sep 2005 09:04:52 -0000 1.23 +++ oggvorbis.c 21 Sep 2005 23:09:16 -0000 1.24 @@ -294,7 +294,7 @@ OggVorbisContext *context = avccontext->priv_data ; float **pcm ; ogg_packet *op= &context->op; - int samples, total_samples, total_bytes,i; + int samples, total_samples, total_bytes; if(!buf_size){ //FIXME flush Index: snow.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- snow.c 21 Aug 2005 22:17:41 -0000 1.62 +++ snow.c 21 Sep 2005 23:09:16 -0000 1.63 @@ -500,7 +500,6 @@ static DWTELEM * slice_buffer_load_line(slice_buffer * buf, int line) { - int i; int offset; DWTELEM * buffer; @@ -523,7 +522,6 @@ static void slice_buffer_release(slice_buffer * buf, int line) { - int i; int offset; DWTELEM * buffer; @@ -933,7 +931,7 @@ DWTELEM temp[width]; const int width2= width>>1; const int w2= (width+1)>>1; - int A1,A2,A3,A4, x; + int x; inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 0); inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 0); @@ -952,7 +950,7 @@ static void horizontal_composeX(DWTELEM *b, int width){ DWTELEM temp[width]; const int width2= width>>1; - int A1,A2,A3,A4, x; + int x; const int w2= (width+1)>>1; memcpy(temp, b, width*sizeof(int)); @@ -1010,7 +1008,7 @@ static void horizontal_decompose53i(DWTELEM *b, int width){ DWTELEM temp[width]; const int width2= width>>1; - int A1,A2,A3,A4, x; + int x; const int w2= (width+1)>>1; for(x=0; x<width2; x++){ @@ -1020,6 +1018,8 @@ if(width&1) temp[x ]= b[2*x ]; #if 0 + { + int A1,A2,A3,A4; A2= temp[1 ]; A4= temp[0 ]; A1= temp[0+width2]; @@ -1047,6 +1047,7 @@ A2 += (A1 + A3 + 2)>>2; b[width -1] = A3; b[width2-1] = A2; + } #else lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0); lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0); @@ -1268,9 +1269,10 @@ DWTELEM temp[width]; const int width2= width>>1; const int w2= (width+1)>>1; - int A1,A2,A3,A4, x; + int x; #if 0 + int A1,A2,A3,A4; A2= temp[1 ]; A4= temp[0 ]; A1= temp[0+width2]; @@ -1452,7 +1454,9 @@ int i; for(i=0; i<width; i++){ +#ifndef lift5 int r; +#endif b4[i] -= (W_DM*(b3[i] + b5[i])+W_DO)>>W_DS; #ifdef lift5 b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS; @@ -1877,7 +1881,7 @@ static inline void decode_subband_slice_buffered(SnowContext *s, SubBand *b, slice_buffer * sb, int start_y, int h, int save_state[1]){ const int w= b->width; - int x,y; + int y; const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16); int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT); int qadd= (s->qbias*qmul)>>QBIAS_SHIFT; @@ -2583,7 +2587,6 @@ START_TIMER - int block_index = 0; for(y=0; y<b_h; y++){ //FIXME ugly missue of obmc_stride uint8_t *obmc1= obmc + y*obmc_stride; @@ -2908,7 +2911,7 @@ const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16); const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT); int x,y, thres1, thres2; - START_TIMER +// START_TIMER if(s->qlog == LOSSLESS_QLOG) return; @@ -2964,7 +2967,6 @@ static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int start_y, int end_y){ const int w= b->width; - const int h= b->height; const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16); const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT); const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT; @@ -3042,7 +3044,6 @@ static void correlate_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median, int start_y, int end_y){ const int w= b->width; - const int h= b->height; int x,y; // START_TIMER Index: vc9.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vc9.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- vc9.c 2 Jul 2005 19:28:32 -0000 1.23 +++ vc9.c 21 Sep 2005 23:09:16 -0000 1.24 @@ -1983,7 +1983,7 @@ { int i, cbp, val; uint8_t *coded_val; - uint32_t * const mb_type_ptr= &v->s.current_picture.mb_type[ v->s.mb_x + v->s.mb_y*v->s.mb_stride ]; +// uint32_t * const mb_type_ptr= &v->s.current_picture.mb_type[ v->s.mb_x + v->s.mb_y*v->s.mb_stride ]; v->s.mb_intra = 1; cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);

1 0

CVS: ffmpeg/libavformat ogg.c,1.24,1.25
by aurel＠mplayerhq.hu 22 Sep '05

22 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv7794/libavformat Modified Files: ogg.c Log Message: fix unused variable warnings Index: ogg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ogg.c 15 Aug 2005 20:42:56 -0000 1.24 +++ ogg.c 21 Sep 2005 23:09:16 -0000 1.25 @@ -34,7 +34,7 @@ { OggContext *context = avfcontext->priv_data; ogg_packet *op= &context->op; - int n, i; + int n; ogg_stream_init(&context->os, 31415); @@ -44,7 +44,7 @@ int headers_len = codec->extradata_size; uint8_t *header_start[3]; int header_len[3]; - int i, j, hdr_type; + int i, j; av_set_pts_info(avfcontext->streams[n], 60, 1, AV_TIME_BASE);

1 0

CVS: ffmpeg/libavcodec/i386 dsputil_mmx.c, 1.101, 1.102 mpegvideo_mmx_template.c, 1.25, 1.26
by michael＠mplayerhq.hu 21 Sep '05

21 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/i386 In directory mail:/var2/tmp/cvs-serv17066 Modified Files: dsputil_mmx.c mpegvideo_mmx_template.c Log Message: replace a few mov + psrlq with pshufw, there are more cases which could benefit from this but they would require us to duplicate some functions ... the trick is from various places (my own code in libpostproc, a patch on the x264 list, ...) Index: dsputil_mmx.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- dsputil_mmx.c 10 Sep 2005 19:30:40 -0000 1.101 +++ dsputil_mmx.c 21 Sep 2005 21:17:09 -0000 1.102 @@ -1621,11 +1621,9 @@ "movq 64(%1), %%mm1 \n\t" MMABS_SUM_MMX2(%%mm1, %%mm7, %%mm0) - "movq %%mm0, %%mm1 \n\t" - "psrlq $32, %%mm0 \n\t" + "pshufw $0x0E, %%mm0, %%mm1 \n\t" "paddusw %%mm1, %%mm0 \n\t" - "movq %%mm0, %%mm1 \n\t" - "psrlq $16, %%mm0 \n\t" + "pshufw $0x01, %%mm0, %%mm1 \n\t" "paddusw %%mm1, %%mm0 \n\t" "movd %%mm0, %0 \n\t" Index: mpegvideo_mmx_template.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- mpegvideo_mmx_template.c 28 Oct 2004 10:12:57 -0000 1.25 +++ mpegvideo_mmx_template.c 21 Sep 2005 21:17:09 -0000 1.26 @@ -22,7 +22,11 @@ #ifdef HAVE_MMX2 #define SPREADW(a) "pshufw $0, " #a ", " #a " \n\t" #define PMAXW(a,b) "pmaxsw " #a ", " #b " \n\t" - +#define PMAX(a,b) \ + "pshufw $0x0E," #a ", " #b " \n\t"\ + PMAXW(b, a)\ + "pshufw $0x01," #a ", " #b " \n\t"\ + PMAXW(b, a) #else #define SPREADW(a) \ "punpcklwd " #a ", " #a " \n\t"\ @@ -30,6 +34,14 @@ #define PMAXW(a,b) \ "psubusw " #a ", " #b " \n\t"\ "paddw " #a ", " #b " \n\t" +#define PMAX(a,b) \ + "movq " #a ", " #b " \n\t"\ + "psrlq $32, " #a " \n\t"\ + PMAXW(b, a)\ + "movq " #a ", " #b " \n\t"\ + "psrlq $16, " #a " \n\t"\ + PMAXW(b, a) + #endif static int RENAME(dct_quantize)(MpegEncContext *s, @@ -119,12 +131,7 @@ PMAXW(%%mm0, %%mm3) "add $8, %%"REG_a" \n\t" " js 1b \n\t" - "movq %%mm3, %%mm0 \n\t" - "psrlq $32, %%mm3 \n\t" - PMAXW(%%mm0, %%mm3) - "movq %%mm3, %%mm0 \n\t" - "psrlq $16, %%mm3 \n\t" - PMAXW(%%mm0, %%mm3) + PMAX(%%mm3, %%mm0) "movd %%mm3, %%"REG_a" \n\t" "movzb %%al, %%"REG_a" \n\t" // last_non_zero_p1 : "+a" (last_non_zero_p1) @@ -170,12 +177,7 @@ PMAXW(%%mm0, %%mm3) "add $8, %%"REG_a" \n\t" " js 1b \n\t" - "movq %%mm3, %%mm0 \n\t" - "psrlq $32, %%mm3 \n\t" - PMAXW(%%mm0, %%mm3) - "movq %%mm3, %%mm0 \n\t" - "psrlq $16, %%mm3 \n\t" - PMAXW(%%mm0, %%mm3) + PMAX(%%mm3, %%mm0) "movd %%mm3, %%"REG_a" \n\t" "movzb %%al, %%"REG_a" \n\t" // last_non_zero_p1 : "+a" (last_non_zero_p1)

1 0

CVS: ffmpeg/libavcodec h264.c,1.155,1.156
by michael＠mplayerhq.hu 21 Sep '05

21 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv15947 Modified Files: h264.c Log Message: Just noticed there is a memory leak in h264.c with the usage of rbsp_buffer. Here is a patch which frees the rbsp_buffer in decode_end(). patch by (G?bor Kov?cs | picard / demoscene \ hu) Index: h264.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 --- h264.c 17 Sep 2005 08:15:07 -0000 1.155 +++ h264.c 21 Sep 2005 08:14:17 -0000 1.156 @@ -7807,6 +7807,7 @@ H264Context *h = avctx->priv_data; MpegEncContext *s = &h->s; + av_freep(&h->rbsp_buffer); free_tables(h); //FIXME cleanup init stuff perhaps MPV_common_end(s);

1 0

CVS: ffmpeg/tests libav.regression.ref, 1.75, 1.76 regression.sh, 1.82, 1.83 rotozoom.c, 1.5, 1.6 test.conf, 1.7, 1.8 videogen.c, 1.4, 1.5
by diego＠mplayerhq.hu 21 Sep '05

21 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/tests In directory mail:/var2/tmp/cvs-serv28938 Modified Files: libav.regression.ref regression.sh rotozoom.c test.conf videogen.c Log Message: Add a leading zero to the sequence files generated by the testsuite so they always appear in proper order. patch by Sam Hocevar < sam -- at -- zoy -- dot -- org > Index: libav.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/libav.regression.ref,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- libav.regression.ref 12 Sep 2005 10:23:52 -0000 1.75 +++ libav.regression.ref 21 Sep 2005 00:09:02 -0000 1.76 @@ -44,9 +44,9 @@ 2906382 ./data/b-libav.gif b977a4fedff90a79baf70c8e02986820 *./data/b-libav.y4m 3801810 ./data/b-libav.y4m -./data/b-libav%d.pgm CRC=84c09106 -./data/b-libav%d.ppm CRC=25c06ecf -./data/b-libav%d.jpg CRC=62328baa +./data/b-libav%02d.pgm CRC=84c09106 +./data/b-libav%02d.ppm CRC=25c06ecf +./data/b-libav%02d.jpg CRC=62328baa b0a8c8063d81921db5d7c8f50a1cc454 *./data/b-libav.wav 89132 ./data/b-libav.wav ./data/b-libav.wav CRC=2a09519c Index: regression.sh =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/regression.sh,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- regression.sh 12 Sep 2005 19:16:07 -0000 1.82 +++ regression.sh 21 Sep 2005 00:09:02 -0000 1.83 @@ -86,7 +86,7 @@ tiny_psnr="./tiny_psnr" reffile="$2" benchfile="$datadir/ffmpeg.bench" -raw_src="$3/%d.pgm" +raw_src="$3/%02d.pgm" raw_dst="$datadir/out.yuv" raw_ref="$datadir/ref.yuv" pcm_src="asynth1.sw" @@ -640,17 +640,17 @@ #################### # image formats # pgm (we do not do md5 on image files yet) -file=${outfile}libav%d.pgm +file=${outfile}libav%02d.pgm $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file do_ffmpeg_crc $file -i $file # ppm (we do not do md5 on image files yet) -file=${outfile}libav%d.ppm +file=${outfile}libav%02d.ppm $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file do_ffmpeg_crc $file -i $file # jpeg (we do not do md5 on image files yet) -file=${outfile}libav%d.jpg +file=${outfile}libav%02d.jpg $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src -flags +bitexact -dct fastint -idct simple -pix_fmt yuvj420p -f image2 $file do_ffmpeg_crc $file -f image2 -i $file Index: rotozoom.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rotozoom.c 24 Dec 2004 12:34:11 -0000 1.5 +++ rotozoom.c 21 Sep 2005 00:09:02 -0000 1.6 @@ -279,7 +279,7 @@ init_demo(argv[2]); for(i=0;i<DEFAULT_NB_PICT;i++) { - snprintf(buf, sizeof(buf), "%s%d.pgm", argv[1], i); + snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i); gen_image(i, w, h); pgmyuv_save(buf, w, h, rgb_tab); } Index: test.conf =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/test.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- test.conf 18 Jul 2005 09:02:58 -0000 1.7 +++ test.conf 21 Sep 2005 00:09:02 -0000 1.8 @@ -57,7 +57,7 @@ # Fire up ffmpeg pointing at this stream -Launch -loop -bitexact -dct_algo 1 -idct_algo 2 -y -f pgmyuv -i vsynth1/%d.pgm +Launch -loop -bitexact -dct_algo 1 -idct_algo 2 -y -f pgmyuv -i vsynth1/%02d.pgm acl allow localhost </Feed> Index: videogen.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/videogen.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- videogen.c 15 Oct 2003 01:22:50 -0000 1.4 +++ videogen.c 21 Sep 2005 00:09:02 -0000 1.5 @@ -268,7 +268,7 @@ height = h; for(i=0;i<DEFAULT_NB_PICT;i++) { - snprintf(buf, sizeof(buf), "%s%d.pgm", argv[1], i); + snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i); gen_image(i, w, h); pgmyuv_save(buf, w, h, rgb_tab); }

1 0

CVS: ffmpeg/tests .cvsignore,1.1,1.2
by diego＠mplayerhq.hu 21 Sep '05

21 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/tests In directory mail:/var2/tmp/cvs-serv7325 Modified Files: .cvsignore Log Message: Add some files generated by regression tests. Index: .cvsignore =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 27 May 2002 08:36:05 -0000 1.1 +++ .cvsignore 21 Sep 2005 00:04:42 -0000 1.2 @@ -6,3 +6,11 @@ .depend dsptest dsptestpic +asynth1.sw +audiogen +data +rotozoom +tiny_psnr +videogen +vsynth1 +vsynth2

1 0

CVS: ffmpeg/libavformat mmf.c,1.2,1.3
by diego＠mplayerhq.hu 21 Sep '05

21 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv25555/libavformat Modified Files: mmf.c Log Message: Misplaced #ifdef, the MMFContext struct is needed outside CONFIG_ENCODERS. Index: mmf.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mmf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mmf.c 17 Jul 2005 22:24:35 -0000 1.2 +++ mmf.c 20 Sep 2005 23:52:29 -0000 1.3 @@ -19,12 +19,12 @@ #include "avformat.h" #include "avi.h" -#ifdef CONFIG_ENCODERS typedef struct { offset_t atrpos, atsqpos, awapos; offset_t data_size; } MMFContext; +#ifdef CONFIG_ENCODERS static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 }; static int mmf_rate_code(int rate)

1 0

CVS: ffmpeg ffmpeg.c,1.352,1.353
by michael＠mplayerhq.hu 20 Sep '05

20 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv29293 Modified Files: ffmpeg.c Log Message: changing a few options to AVOptions Index: ffmpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v retrieving revision 1.352 retrieving revision 1.353 diff -u -d -r1.352 -r1.353 --- ffmpeg.c 12 Sep 2005 18:24:47 -0000 1.352 +++ ffmpeg.c 20 Sep 2005 21:43:44 -0000 1.353 @@ -145,29 +145,16 @@ static int b_frames = 0; static int b_strategy = 0; static int pre_me = 0; -static float lumi_mask = 0; -static float dark_mask = 0; -static float scplx_mask = 0; -static float tcplx_mask = 0; -static float p_mask = 0; -static int qns = 0; static int do_deinterlace = 0; static int workaround_bugs = FF_BUG_AUTODETECT; -static int error_resilience = FF_ER_CAREFUL; -static int error_concealment = 3; static int packet_size = 0; static int error_rate = 0; static int strict = 0; static int top_field_first = -1; -static int noise_reduction = 0; static int sc_threshold = 0; static int me_threshold = 0; static int mb_threshold = 0; static int intra_dc_precision = 8; -static int coder = 0; -static int context = 0; -static int predictor = 0; -static int nsse_weight = 8; static int me_penalty_compensation= 256; static int frame_skip_threshold= 0; static int frame_skip_factor= 0; @@ -2263,16 +2250,6 @@ mb_threshold = atoi(arg); } -static void opt_error_resilience(const char *arg) -{ - error_resilience = atoi(arg); -} - -static void opt_error_concealment(const char *arg) -{ - error_concealment = atoi(arg); -} - static void opt_verbose(const char *arg) { verbose = atoi(arg); @@ -2508,31 +2485,6 @@ pre_me = atoi(arg); } -static void opt_lumi_mask(const char *arg) -{ - lumi_mask = atof(arg); -} - -static void opt_dark_mask(const char *arg) -{ - dark_mask = atof(arg); -} - -static void opt_scplx_mask(const char *arg) -{ - scplx_mask = atof(arg); -} - -static void opt_tcplx_mask(const char *arg) -{ - tcplx_mask = atof(arg); -} - -static void opt_p_mask(const char *arg) -{ - p_mask = atof(arg); -} - static void opt_qscale(const char *arg) { video_qscale = atof(arg); @@ -2673,16 +2625,6 @@ top_field_first= atoi(arg); } -static void opt_noise_reduction(const char *arg) -{ - noise_reduction= atoi(arg); -} - -static void opt_qns(const char *arg) -{ - qns= atoi(arg); -} - static void opt_sc_threshold(const char *arg) { sc_threshold= atoi(arg); @@ -3007,8 +2949,6 @@ rfps = ic->streams[i]->r_frame_rate.num; rfps_base = ic->streams[i]->r_frame_rate.den; enc->workaround_bugs = workaround_bugs; - enc->error_resilience = error_resilience; - enc->error_concealment = error_concealment; if(enc->lowres) enc->flags |= CODEC_FLAG_EMU_EDGE; if(me_threshold) enc->debug |= FF_DEBUG_MV; @@ -3201,12 +3141,6 @@ video_enc->inter_matrix = inter_matrix; video_enc->pre_me = pre_me; - video_enc->lumi_masking = lumi_mask; - video_enc->dark_masking = dark_mask; - video_enc->spatial_cplx_masking = scplx_mask; - video_enc->temporal_cplx_masking = tcplx_mask; - video_enc->p_masking = p_mask; - video_enc->quantizer_noise_shaping= qns; if (b_frames) { video_enc->max_b_frames = b_frames; @@ -3269,13 +3203,8 @@ video_enc->intra_dc_precision= intra_dc_precision - 8; video_enc->strict_std_compliance = strict; video_enc->error_rate = error_rate; - video_enc->noise_reduction= noise_reduction; video_enc->scenechange_threshold= sc_threshold; video_enc->me_range = me_range; - video_enc->coder_type= coder; - video_enc->context_model= context; - video_enc->prediction_method= predictor; - video_enc->nsse_weight= nsse_weight; video_enc->me_penalty_compensation= me_penalty_compensation; video_enc->frame_skip_threshold= frame_skip_threshold; video_enc->frame_skip_factor= frame_skip_factor; @@ -4137,15 +4066,8 @@ "method" }, { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" }, { "mb_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_threshold}, "macroblock threshold", "" }, - { "er", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_resilience}, "set error resilience", "n" }, - { "ec", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_concealment}, "set error concealment", "bit_mask" }, { "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" }, { "preme", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_me}, "pre motion estimation", "" }, - { "lumi_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lumi_mask}, "luminance masking", "" }, - { "dark_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dark_mask}, "darkness masking", "" }, - { "scplx_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_scplx_mask}, "spatial complexity masking", "" }, - { "tcplx_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_tcplx_mask}, "temporal complexity masking", "" }, - { "p_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_p_mask}, "inter masking", "" }, { "bug", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_workaround_bugs}, "workaround not auto detected encoder bugs", "param" }, { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" }, { "error", HAS_ARG | OPT_EXPERT, {(void*)opt_error_rate}, "error rate", "rate" }, @@ -4162,15 +4084,9 @@ { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" }, { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" }, - { "nr", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_noise_reduction}, "noise reduction", "" }, - { "qns", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qns}, "quantization noise shaping", "" }, { "sc_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sc_threshold}, "scene change threshold", "threshold" }, { "me_range", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_range}, "limit motion vectors range (1023 for DivX player)", "range" }, { "dc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_dc_precision}, "intra_dc_precision", "precision" }, - { "coder", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&coder}, "coder type", "" }, - { "context", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&context}, "context model", "" }, - { "pred", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&predictor}, "prediction method", "" }, - { "nssew", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&nsse_weight}, "weight", "" }, { "mepc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&me_penalty_compensation}, "motion estimation bitrate penalty compensation", "factor (1.0 = 256)" }, { "vtag", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_tag}, "force video tag/fourcc", "fourcc/tag" }, { "skip_threshold", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_threshold}, "frame skip threshold", "threshold" },

1 0