May 2005 - ffmpeg-cvslog - lists.ffmpeg.org

CVS: ffmpeg/libavcodec/i386 dsputil_mmx.c, 1.95, 1.96 idct_mmx.c, 1.4, 1.5
by lorenm＠mplayerhq.hu 01 Jun '05

01 Jun '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/i386 In directory mail:/var2/tmp/cvs-serv9738/i386 Modified Files: dsputil_mmx.c idct_mmx.c Log Message: MMX for H.264 iDCT (adapted from x264) Index: dsputil_mmx.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- dsputil_mmx.c 25 May 2005 08:05:41 -0000 1.95 +++ dsputil_mmx.c 31 May 2005 22:48:33 -0000 1.96 @@ -3205,6 +3205,8 @@ void ff_vp3_idct_mmx(int16_t *data); void ff_vp3_dsp_init_mmx(void); +void ff_h264_idct_add_mmx2(uint8_t *dst, int16_t *block, int stride); + /* XXX: those functions should be suppressed ASAP when all IDCTs are converted */ static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size, DCTELEM *block) @@ -3424,6 +3426,8 @@ c->vsad[4]= vsad_intra16_mmx2; #endif //CONFIG_ENCODERS + c->h264_idct_add= ff_h264_idct_add_mmx2; + if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_mmx2; c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_mmx2; Index: idct_mmx.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/idct_mmx.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- idct_mmx.c 18 May 2004 17:09:46 -0000 1.4 +++ idct_mmx.c 31 May 2005 22:48:33 -0000 1.5 @@ -597,3 +597,89 @@ declare_idct (ff_mmx_idct, mmx_table, mmx_row_head, mmx_row, mmx_row_tail, mmx_row_mid) + + + +/* in/out: mma=mma+mmb, mmb=mmb-mma */ +#define SUMSUB_BA( a, b ) \ + "paddw "#b", "#a" \n\t"\ + "paddw "#b", "#b" \n\t"\ + "psubw "#a", "#b" \n\t" + +#define SUMSUB_BADC( a, b, c, d ) \ + "paddw "#b", "#a" \n\t"\ + "paddw "#d", "#c" \n\t"\ + "paddw "#b", "#b" \n\t"\ + "paddw "#d", "#d" \n\t"\ + "psubw "#a", "#b" \n\t"\ + "psubw "#c", "#d" \n\t" + +/* in: a,b out: a,s */ +#define SUMSUBD2_AB( a, b, t, s ) \ + "movq "#a", "#s" \n\t"\ + "movq "#b", "#t" \n\t"\ + "psraw $1 , "#b" \n\t"\ + "psraw $1 , "#s" \n\t"\ + "paddw "#b", "#a" \n\t"\ + "psubw "#t", "#s" \n\t" + +#define IDCT4_1D( s02, s13, d02, d13, t, u ) \ + SUMSUB_BA ( s02, d02 )\ + SUMSUBD2_AB( s13, d13, u, t )\ + SUMSUB_BADC( s13, s02, t, d02 ) + +#define SBUTTERFLY( a, b, t, n ) \ + "movq "#a", "#t" \n\t" /* abcd */\ + "punpckl"#n" "#b", "#a" \n\t" /* aebf */\ + "punpckh"#n" "#b", "#t" \n\t" /* cgdh */ + +#define TRANSPOSE4( a, b, c, d, t ) \ + SBUTTERFLY( a, b, t, wd ) /* a=aebf t=cgdh */\ + SBUTTERFLY( c, d, b, wd ) /* c=imjn b=kolp */\ + SBUTTERFLY( a, c, d, dq ) /* a=aeim d=bfjn */\ + SBUTTERFLY( t, b, c, dq ) /* t=cgko c=dhlp */ + +#define STORE_DIFF_4P( p, t, pw32, z, dst ) \ + asm volatile(\ + "paddw "#pw32", "#p" \n\t"\ + "psraw $6, "#p" \n\t"\ + "movd (%0), "#t" \n\t"\ + "punpcklbw "#z", "#t" \n\t"\ + "paddsw "#t", "#p" \n\t"\ + "packuswb "#z", "#p" \n\t"\ + "movd "#p", (%0) \n\t" :: "r"(dst) ) + +static const uint64_t ff_pw_32 attribute_used __attribute__ ((aligned(8))) = 0x0020002000200020ULL; + +void ff_h264_idct_add_mmx2(uint8_t *dst, int16_t *block, int stride) +{ + /* Load dct coeffs */ + asm volatile( + "movq (%0), %%mm0 \n\t" + "movq 8(%0), %%mm1 \n\t" + "movq 16(%0), %%mm2 \n\t" + "movq 24(%0), %%mm3 \n\t" + :: "r"(block) ); + + asm volatile( + /* mm1=s02+s13 mm2=s02-s13 mm4=d02+d13 mm0=d02-d13 */ + IDCT4_1D( %%mm2, %%mm1, %%mm0, %%mm3, %%mm4, %%mm5 ) + + /* in: 1,4,0,2 out: 1,2,3,0 */ + TRANSPOSE4( %%mm1, %%mm4, %%mm0, %%mm2, %%mm3 ) + + /* mm2=s02+s13 mm3=s02-s13 mm4=d02+d13 mm1=d02-d13 */ + IDCT4_1D( %%mm3, %%mm2, %%mm1, %%mm0, %%mm4, %%mm5 ) + + /* in: 2,4,1,3 out: 2,3,0,1 */ + TRANSPOSE4( %%mm2, %%mm4, %%mm1, %%mm3, %%mm0 ) + + "pxor %%mm7, %%mm7 \n\t" + "movq ff_pw_32, %%mm6 \n\t" + :: ); + + STORE_DIFF_4P( %%mm2, %%mm4, %%mm6, %%mm7, &dst[0*stride] ); + STORE_DIFF_4P( %%mm3, %%mm4, %%mm6, %%mm7, &dst[1*stride] ); + STORE_DIFF_4P( %%mm0, %%mm4, %%mm6, %%mm7, &dst[2*stride] ); + STORE_DIFF_4P( %%mm1, %%mm4, %%mm6, %%mm7, &dst[3*stride] ); +}

4 5

CVS: ffmpeg ffmpeg.c,1.330,1.331
by mru＠mplayerhq.hu 31 May '05

31 May '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv26077 Modified Files: ffmpeg.c Log Message: add -gray command line flag Index: ffmpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v retrieving revision 1.330 retrieving revision 1.331 diff -u -d -r1.330 -r1.331 --- ffmpeg.c 26 May 2005 08:59:05 -0000 1.330 +++ ffmpeg.c 31 May 2005 11:49:55 -0000 1.331 @@ -209,6 +209,7 @@ static int frame_skip_exp= 0; static int frame_skip_cmp= FF_CMP_DCTMAX; extern int loop_input; /* currently a hack */ +static int gray_only = 0; static int gop_size = 12; static int intra_only = 0; @@ -2987,6 +2988,8 @@ enc->flags|= CODEC_FLAG_BITEXACT; if(me_threshold) enc->debug |= FF_DEBUG_MV; + if(gray_only) + enc->flags |= CODEC_FLAG_GRAY; if (enc->time_base.den != rfps || enc->time_base.num != rfps_base) { @@ -3292,6 +3295,9 @@ if (no_output) { video_enc->flags2 |= CODEC_FLAG2_NO_OUTPUT; } + if (gray_only) { + video_enc->flags |= CODEC_FLAG_GRAY; + } video_enc->qmin = video_qmin; video_enc->qmax = video_qmax; video_enc->lmin = video_lmin; @@ -4126,6 +4132,7 @@ { "skip_factor", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_factor}, "frame skip factor", "factor" }, { "skip_exp", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_exp}, "frame skip exponent", "exponent" }, { "skip_cmp", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_cmp}, "frame skip compare function", "compare function" }, + { "gray", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { &gray_only }, "encode/decode grayscale" }, /* audio options */ { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", },

1 0

CVS: ffmpeg/libavcodec x264.c,1.7,1.8
by mru＠mplayerhq.hu 31 May '05

31 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv16210/libavcodec Modified Files: x264.c Log Message: enable x264 multi-threading Index: x264.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/x264.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- x264.c 14 May 2005 21:02:49 -0000 1.7 +++ x264.c 30 May 2005 20:34:02 -0000 1.8 @@ -154,6 +154,8 @@ x4->params.i_fps_num = avctx->time_base.den; x4->params.i_fps_den = avctx->time_base.num; + x4->params.i_threads = avctx->thread_count; + x4->enc = x264_encoder_open(&x4->params); if(!x4->enc) return -1;

2 1

[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec vorbis.c, 1.10, 1.11 vorbis.h, 1.2, 1.3
by michael＠mplayerhq.hu 30 May '05

30 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv7417 Modified Files: vorbis.c vorbis.h Log Message: decrease V_NB_BITS if possible Index: vorbis.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- vorbis.c 30 May 2005 20:34:05 -0000 1.10 +++ vorbis.c 30 May 2005 22:02:00 -0000 1.11 @@ -30,7 +30,8 @@ #include "vorbis.h" -#define V_NB_BITS 11 +#define V_NB_BITS 8 +#define V_NB_BITS2 11 #define V_MAX_VLCS (1<<16) #ifndef V_DEBUG @@ -361,9 +362,12 @@ for(t=0;t<entries;++t) if (tmp_vlc_bits[t]>=codebook_setup->maxdepth) codebook_setup->maxdepth=tmp_vlc_bits[t]; - codebook_setup->maxdepth=(codebook_setup->maxdepth+V_NB_BITS-1)/V_NB_BITS; + if(codebook_setup->maxdepth > 3*V_NB_BITS) codebook_setup->nb_bits=V_NB_BITS2; + else codebook_setup->nb_bits=V_NB_BITS; - if (init_vlc(&codebook_setup->vlc, V_NB_BITS, entries, tmp_vlc_bits, sizeof(*tmp_vlc_bits), sizeof(*tmp_vlc_bits), tmp_vlc_codes, sizeof(*tmp_vlc_codes), sizeof(*tmp_vlc_codes), INIT_VLC_LE)) { + codebook_setup->maxdepth=(codebook_setup->maxdepth+codebook_setup->nb_bits-1)/codebook_setup->nb_bits; + + if (init_vlc(&codebook_setup->vlc, codebook_setup->nb_bits, entries, tmp_vlc_bits, sizeof(*tmp_vlc_bits), sizeof(*tmp_vlc_bits), tmp_vlc_codes, sizeof(*tmp_vlc_codes), sizeof(*tmp_vlc_codes), INIT_VLC_LE)) { av_log(vc->avccontext, AV_LOG_ERROR, " Error generating vlc tables. \n"); goto error; } @@ -899,7 +903,7 @@ if (cbits) { // this reads all subclasses for this partition's class cval=get_vlc2(gb, vc->codebooks[vf->class_masterbook[class_]].vlc.table, - V_NB_BITS, 3); + vc->codebooks[vf->class_masterbook[class_]].nb_bits, 3); } for(j=0;j<cdim;++j) { @@ -910,7 +914,7 @@ cval=cval>>cbits; if (book>0) { floor1_Y[offset+j]=get_vlc2(gb, vc->codebooks[book].vlc.table, - V_NB_BITS, 3); + vc->codebooks[book].nb_bits, 3); } else { floor1_Y[offset+j]=0; } @@ -1096,7 +1100,7 @@ for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) { if (!do_not_decode[j]) { uint_fast32_t temp=get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table, - V_NB_BITS, 3); + vc->codebooks[vr->classbook].nb_bits, 3); AV_DEBUG("Classword: %d \n", temp); @@ -1129,7 +1133,7 @@ voffs=voffset+j*vlen; for(k=0;k<step;++k) { - coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * codebook.dimensions; for(l=0;l<codebook.dimensions;++l) { vec[voffs+k+l*step]+=codebook.codevectors[coffs+l]; // FPMATH } @@ -1138,7 +1142,7 @@ else if (vr->type==1) { voffs=voffset+j*vlen; for(k=0;k<step;++k) { - coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * codebook.dimensions; for(l=0;l<codebook.dimensions;++l, ++voffs) { vec[voffs]+=codebook.codevectors[coffs+l]; // FPMATH @@ -1150,7 +1154,7 @@ voffs=voffset>>1; for(k=0;k<step;++k) { - coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * codebook.dimensions; for(l=0;l<codebook.dimensions;l+=2, voffs++) { vec[voffs ]+=codebook.codevectors[coffs+l ]; // FPMATH vec[voffs+vlen]+=codebook.codevectors[coffs+l+1]; // FPMATH @@ -1164,7 +1168,7 @@ voffs=voffset; for(k=0;k<step;++k) { - coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * codebook.dimensions; for(l=0;l<codebook.dimensions;++l, ++voffs) { vec[voffs/ch+(voffs%ch)*vlen]+=codebook.codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and % Index: vorbis.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vorbis.h 29 May 2005 22:11:05 -0000 1.2 +++ vorbis.h 30 May 2005 22:02:00 -0000 1.3 @@ -9,6 +9,7 @@ uint_fast8_t maxdepth; VLC vlc; float *codevectors; + unsigned int nb_bits; } vorbis_codebook; typedef struct {

1 0

CVS: ffmpeg/libavcodec vorbis.c,1.9,1.10
by michael＠mplayerhq.hu 30 May '05

30 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv31511 Modified Files: vorbis.c Log Message: more trivial optimizations Index: vorbis.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- vorbis.c 30 May 2005 19:14:50 -0000 1.9 +++ vorbis.c 30 May 2005 20:34:05 -0000 1.10 @@ -37,7 +37,8 @@ #define AV_DEBUG(...) #endif - +#undef NDEBUG +#include <assert.h> /* Helper functions */ @@ -1099,10 +1100,11 @@ AV_DEBUG("Classword: %d \n", temp); + assert(vr->classifications > 1 && vr->classifications<256 && temp<=65536); //needed for inverse[] for(i=0;i<c_p_c;++i) { uint_fast32_t temp2; - temp2=temp/vr->classifications; + temp2=(((uint_fast64_t)temp) * inverse[vr->classifications])>>32; classifs[j_times_ptns_to_read+partition_count+c_p_c-1-i]=temp-temp2*vr->classifications; temp=temp2; } @@ -1120,41 +1122,40 @@ if (vqbook>=0) { uint_fast16_t coffs; + uint_fast16_t step=vr->partition_size/vc->codebooks[vqbook].dimensions; + vorbis_codebook codebook= vc->codebooks[vqbook]; if (vr->type==0) { - uint_fast16_t step=vr->partition_size/vc->codebooks[vqbook].dimensions; voffs=voffset+j*vlen; for(k=0;k<step;++k) { - coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; - for(l=0;l<vc->codebooks[vqbook].dimensions;++l) { - vec[voffs+k+l*step]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH + coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + for(l=0;l<codebook.dimensions;++l) { + vec[voffs+k+l*step]+=codebook.codevectors[coffs+l]; // FPMATH } } } else if (vr->type==1) { voffs=voffset+j*vlen; - for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { - coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; - for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { - vec[voffs]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH + for(k=0;k<step;++k) { + coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + for(l=0;l<codebook.dimensions;++l, ++voffs) { + vec[voffs]+=codebook.codevectors[coffs+l]; // FPMATH - AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d \n", pass, voffs, vec[voffs], vc->codebooks[vqbook].codevectors[coffs+l], coffs); + AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d \n", pass, voffs, vec[voffs], codebook.codevectors[coffs+l], coffs); } } } - else if (vr->type==2 && ch==2) { // most frequent case optimized - voffs=voffset; + else if (vr->type==2 && ch==2 && (voffset&1)==0 && (codebook.dimensions&1)==0) { // most frequent case optimized + voffs=voffset>>1; - for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { - coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; - for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { - vec[(voffs>>1)+((voffs&1) ? vlen : 0)]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH + for(k=0;k<step;++k) { + coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + for(l=0;l<codebook.dimensions;l+=2, voffs++) { + vec[voffs ]+=codebook.codevectors[coffs+l ]; // FPMATH + vec[voffs+vlen]+=codebook.codevectors[coffs+l+1]; // FPMATH - AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset/ch+(voffs%ch)*vlen, vec[voffset/ch+(voffs%ch)*vlen], vc->codebooks[vqbook].codevectors[coffs+l], coffs, l); + AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset/ch+(voffs%ch)*vlen, vec[voffset/ch+(voffs%ch)*vlen], codebook.codevectors[coffs+l], coffs, l); } } @@ -1162,13 +1163,12 @@ else if (vr->type==2) { voffs=voffset; - for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { - coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; - for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { - vec[voffs/ch+(voffs%ch)*vlen]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and % + for(k=0;k<step;++k) { + coffs=get_vlc2(gb, codebook.vlc.table, V_NB_BITS, 3) * codebook.dimensions; + for(l=0;l<codebook.dimensions;++l, ++voffs) { + vec[voffs/ch+(voffs%ch)*vlen]+=codebook.codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and % - AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset/ch+(voffs%ch)*vlen, vec[voffset/ch+(voffs%ch)*vlen], vc->codebooks[vqbook].codevectors[coffs+l], coffs, l); + AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset/ch+(voffs%ch)*vlen, vec[voffset/ch+(voffs%ch)*vlen], codebook.codevectors[coffs+l], coffs, l); } } } else {

1 0

CVS: ffmpeg/libavcodec vorbis.c,1.8,1.9
by michael＠mplayerhq.hu 30 May '05

30 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv25599 Modified Files: vorbis.c Log Message: maxdepth is supposed to be a constant, its faster if its too large then if its non constant Index: vorbis.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- vorbis.c 30 May 2005 15:03:06 -0000 1.8 +++ vorbis.c 30 May 2005 19:14:50 -0000 1.9 @@ -898,7 +898,7 @@ if (cbits) { // this reads all subclasses for this partition's class cval=get_vlc2(gb, vc->codebooks[vf->class_masterbook[class_]].vlc.table, - V_NB_BITS, vc->codebooks[vf->class_masterbook[class_]].maxdepth); + V_NB_BITS, 3); } for(j=0;j<cdim;++j) { @@ -909,7 +909,7 @@ cval=cval>>cbits; if (book>0) { floor1_Y[offset+j]=get_vlc2(gb, vc->codebooks[book].vlc.table, - V_NB_BITS, vc->codebooks[book].maxdepth); + V_NB_BITS, 3); } else { floor1_Y[offset+j]=0; } @@ -1095,7 +1095,7 @@ for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) { if (!do_not_decode[j]) { uint_fast32_t temp=get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth); + V_NB_BITS, 3); AV_DEBUG("Classword: %d \n", temp); @@ -1127,7 +1127,7 @@ voffs=voffset+j*vlen; for(k=0;k<step;++k) { coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;l<vc->codebooks[vqbook].dimensions;++l) { vec[voffs+k+l*step]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH } @@ -1137,7 +1137,7 @@ voffs=voffset+j*vlen; for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { vec[voffs]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH @@ -1150,7 +1150,7 @@ for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { vec[(voffs>>1)+((voffs&1) ? vlen : 0)]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH @@ -1164,7 +1164,7 @@ for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, - V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; + V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions; for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { vec[voffs/ch+(voffs%ch)*vlen]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and %

1 0

CVS: ffmpeg/libavformat movenc.c,1.39,1.40
by nicodvb＠mplayerhq.hu 30 May '05

30 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv4382 Modified Files: movenc.c Log Message: according to the standard the object_type for H264 is 33, not 241 Index: movenc.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- movenc.c 14 May 2005 19:48:32 -0000 1.39 +++ movenc.c 30 May 2005 17:32:02 -0000 1.40 @@ -79,7 +79,7 @@ { CODEC_ID_MPEG2VIDEO, 96 },//mpeg2 profiles { CODEC_ID_MP2 , 107 },//FIXME mpeg2 mpeg audio -> 105 { CODEC_ID_MP3 , 107 },//FIXME mpeg2 mpeg audio -> 105 - { CODEC_ID_H264 , 241 }, + { CODEC_ID_H264 , 33 }, { CODEC_ID_H263 , 242 }, { CODEC_ID_H261 , 243 }, { CODEC_ID_MJPEG , 108 }, @@ -459,6 +459,8 @@ // Object type indication put_byte(pb, codec_get_tag(ff_mov_obj_type, track->enc->codec_id)); + // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio) + // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved) if(track->enc->codec_type == CODEC_TYPE_AUDIO) put_byte(pb, 0x15); // flags (= Audiostream) else

1 0

[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avio.h, 1.19, 1.20 aviobuf.c, 1.26, 1.27
by michael＠mplayerhq.hu 30 May '05

30 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv14904 Modified Files: avio.h aviobuf.c Log Message: Fix url_fsize for large files patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de) Index: avio.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avio.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- avio.h 19 May 2005 00:06:26 -0000 1.19 +++ avio.h 30 May 2005 16:45:08 -0000 1.20 @@ -71,7 +71,7 @@ void *opaque; int (*read_packet)(void *opaque, uint8_t *buf, int buf_size); int (*write_packet)(void *opaque, uint8_t *buf, int buf_size); - int (*seek)(void *opaque, offset_t offset, int whence); + offset_t (*seek)(void *opaque, offset_t offset, int whence); offset_t pos; /* position in the file of the current buffer */ int must_flush; /* true if the next seek should flush */ int eof_reached; /* true if eof reached */ @@ -91,7 +91,7 @@ void *opaque, int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), - int (*seek)(void *opaque, offset_t offset, int whence)); + offset_t (*seek)(void *opaque, offset_t offset, int whence)); void put_byte(ByteIOContext *s, int b); void put_buffer(ByteIOContext *s, const unsigned char *buf, int size); Index: aviobuf.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/aviobuf.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- aviobuf.c 19 May 2005 00:06:26 -0000 1.26 +++ aviobuf.c 30 May 2005 16:45:08 -0000 1.27 @@ -29,7 +29,7 @@ void *opaque, int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), - int (*seek)(void *opaque, offset_t offset, int whence)) + offset_t (*seek)(void *opaque, offset_t offset, int whence)) { s->buffer = buffer; s->buffer_size = buffer_size; @@ -491,7 +491,7 @@ return url_read(h, buf, buf_size); } -static int url_seek_packet(void *opaque, int64_t offset, int whence) +static offset_t url_seek_packet(void *opaque, offset_t offset, int whence) { URLContext *h = opaque; return url_seek(h, offset, whence); @@ -701,7 +701,7 @@ return dyn_buf_write(opaque, buf, buf_size); } -static int dyn_buf_seek(void *opaque, offset_t offset, int whence) +static offset_t dyn_buf_seek(void *opaque, offset_t offset, int whence) { DynBuffer *d = opaque;

1 0

CVS: ffmpeg/libavformat rtp.c,1.17,1.18
by michael＠mplayerhq.hu 30 May '05

30 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv24646 Modified Files: rtp.c Log Message: trivial pre-C99 fix for rtp.c by (Wolfram Gloger: wmglo, dent med uni-muenchen de) Index: rtp.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/rtp.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- rtp.c 26 May 2005 07:47:51 -0000 1.17 +++ rtp.c 30 May 2005 16:42:36 -0000 1.18 @@ -482,6 +482,7 @@ case CODEC_ID_MPEG4AAC: if (rtp_parse_mp4_au(s, buf)) return -1; + { rtp_payload_data_t *infos = s->rtp_payload_data; if (infos == NULL) return -1; @@ -494,6 +495,7 @@ memcpy(pkt->data, buf, infos->au_headers[0].size); buf += infos->au_headers[0].size; len -= infos->au_headers[0].size; + } s->read_buf_size = len; s->buf_ptr = (char *)buf; pkt->stream_index = s->st->index;

1 0

CVS: ffmpeg/libavcodec vorbis.c,1.7,1.8
by michael＠mplayerhq.hu 30 May '05

30 May '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv32569 Modified Files: vorbis.c Log Message: optimizations Index: vorbis.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- vorbis.c 30 May 2005 00:07:52 -0000 1.7 +++ vorbis.c 30 May 2005 15:03:06 -0000 1.8 @@ -1188,7 +1188,7 @@ } // Decode the audio packet using the functions above -#define BIAS 384 +#define BIAS 385 static int vorbis_parse_audio_packet(vorbis_context *vc) { GetBitContext *gb=&vc->gb; @@ -1342,27 +1342,34 @@ } retlen=vc->blocksize_1/2; } else { + buf += (vc->blocksize_1-vc->blocksize_0)/4; for(k=j, i=0;i<vc->blocksize_0/2;++i, k+=step) { - ret[k]=saved[i]+buf[(vc->blocksize_1-vc->blocksize_0)/4+i]*swin[i]+BIAS; + ret[k]=saved[i]+buf[i]*swin[i]+BIAS; } + buf += vc->blocksize_0/2; for(i=0;i<(vc->blocksize_1-vc->blocksize_0)/4;++i, k+=step) { - ret[k]=buf[vc->blocksize_0/2+(vc->blocksize_1-vc->blocksize_0)/4+i]+BIAS; + ret[k]=buf[i]+BIAS; } + buf=vc->buf; retlen=vc->blocksize_0/2+(vc->blocksize_1-vc->blocksize_0)/4; } // -- save if (next_window) { + buf += vc->blocksize_1/2; + lwin += vc->blocksize_1/2-1; for(i=0;i<vc->blocksize_1/2;++i) { - saved[i]=buf[vc->blocksize_1/2+i]*lwin[vc->blocksize_1/2-1-i]; + saved[i]=buf[i]*lwin[-i]; } saved_start=0; } else { saved_start=(vc->blocksize_1-vc->blocksize_0)/4; + buf += vc->blocksize_1/2; for(i=0;i<saved_start;++i) { - saved[i]=buf[vc->blocksize_1/2+i]; + saved[i]=buf[i]; } + swin += vc->blocksize_0/2-1; for(i=0;i<vc->blocksize_0/2;++i) { - saved[saved_start+i]=buf[vc->blocksize_1/2+saved_start+i]*swin[vc->blocksize_0/2-1-i]; + saved[saved_start+i]=buf[saved_start+i]*swin[-i]; } } } else { @@ -1375,8 +1382,10 @@ } retlen=saved_start+vc->blocksize_0/2; // -- save + buf += vc->blocksize_0/2; + swin += vc->blocksize_0/2-1; for(i=0;i<vc->blocksize_0/2;++i) { - saved[i]=buf[vc->blocksize_0/2+i]*swin[vc->blocksize_0/2-1-i]; + saved[i]=buf[i]*swin[-i]; } saved_start=0; } @@ -1422,11 +1431,12 @@ for(i=0;i<len;++i) { int_fast32_t tmp= ((int32_t*)vc->ret)[i]; - if(tmp > 0x43c07fff) - tmp= 32767; - else if(tmp < 0x43bf8000) - tmp= -32768; - ((int16_t*)data)[i]=tmp; + if(tmp & 0xf0000){ +// tmp= (0x43c0ffff - tmp)>>31; //ask gcc devs why this is slower + if(tmp > 0x43c0ffff) tmp= 0xFFFF; + else tmp= 0; + } + ((int16_t*)data)[i]=tmp - 0x8000; } *data_size=len*2;

2 1