December 2005 - ffmpeg-cvslog

CVS: ffmpeg/libavcodec wmadec.c,1.26,1.27
by rtognimp＠mplayerhq.hu 27 Dec '05

27 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv7877 Modified Files: wmadec.c Log Message: Fix wma2 audio decoder Patch by Reimar Doeffinger Index: wmadec.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/wmadec.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- wmadec.c 17 Dec 2005 18:14:31 -0000 1.26 +++ wmadec.c 27 Dec 2005 19:58:04 -0000 1.27 @@ -284,7 +284,7 @@ } bps = (float)s->bit_rate / (float)(s->nb_channels * s->sample_rate); - s->byte_offset_bits = av_log2((int)(bps * s->frame_len / 8.0)) + 2; + s->byte_offset_bits = av_log2((int)(bps * s->frame_len / 8.0 + 0.5)) + 2; /* compute high frequency value and choose if noise coding should be activated */

1 0

CVS: ffmpeg/libavcodec ratecontrol.c, 1.50, 1.51 mpegvideo.c, 1.494, 1.495 mpegvideo.h, 1.227, 1.228
by michael＠mplayerhq.hu 27 Dec '05

27 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv5393 Modified Files: ratecontrol.c mpegvideo.c mpegvideo.h Log Message: use correct qp & lambda for ME on the second pass Index: ratecontrol.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ratecontrol.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- ratecontrol.c 17 Dec 2005 18:14:29 -0000 1.50 +++ ratecontrol.c 19 Dec 2005 13:41:27 -0000 1.51 @@ -609,7 +609,7 @@ } //FIXME rd or at least approx for dquant -float ff_rate_estimate_qscale(MpegEncContext *s) +float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) { float q; int qmin, qmax; @@ -634,7 +634,7 @@ fps= 1/av_q2d(s->avctx->time_base); //printf("input_pic_num:%d pic_num:%d frame_rate:%d\n", s->input_picture_number, s->picture_number, s->frame_rate); /* update predictors */ - if(picture_number>2){ + if(picture_number>2 && !dry_run){ const int last_var= s->last_pict_type == I_TYPE ? rcc->last_mb_var_sum : rcc->last_mc_mb_var_sum; update_predictor(&rcc->pred[s->last_pict_type], rcc->last_qscale, sqrt(last_var), s->frame_bits); } @@ -735,9 +735,11 @@ else q= (int)(q + 0.5); - rcc->last_qscale= q; - rcc->last_mc_mb_var_sum= pic->mc_mb_var_sum; - rcc->last_mb_var_sum= pic->mb_var_sum; + if(!dry_run){ + rcc->last_qscale= q; + rcc->last_mc_mb_var_sum= pic->mc_mb_var_sum; + rcc->last_mb_var_sum= pic->mb_var_sum; + } #if 0 { static int mvsum=0, texsum=0; Index: mpegvideo.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v retrieving revision 1.494 retrieving revision 1.495 diff -u -d -r1.494 -r1.495 --- mpegvideo.c 19 Dec 2005 03:08:08 -0000 1.494 +++ mpegvideo.c 19 Dec 2005 13:41:27 -0000 1.495 @@ -5245,6 +5245,31 @@ flush_put_bits(&dst->pb); } +static void estimate_qp(MpegEncContext *s, int dry_run){ + if (!s->fixed_qscale) + s->current_picture_ptr->quality= + s->current_picture.quality = ff_rate_estimate_qscale(s, dry_run); + + if(s->adaptive_quant){ + switch(s->codec_id){ + case CODEC_ID_MPEG4: + ff_clean_mpeg4_qscales(s); + break; + case CODEC_ID_H263: + case CODEC_ID_H263P: + case CODEC_ID_FLV1: + ff_clean_h263_qscales(s); + break; + } + + s->lambda= s->lambda_table[0]; + //FIXME broken + }else + s->lambda= s->current_picture.quality; +//printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); + update_qscale(s); +} + static void encode_picture(MpegEncContext *s, int picture_number) { int i; @@ -5273,6 +5298,10 @@ s->no_rounding ^= 1; } + if(s->flags & CODEC_FLAG_PASS2) + estimate_qp(s, 1); + + s->mb_intra=0; //for the rate distortion & bit compare functions for(i=1; i<s->avctx->thread_count; i++){ ff_update_duplicate_context(s->thread_context[i], s); @@ -5369,28 +5398,7 @@ } } - if (!s->fixed_qscale) - s->current_picture_ptr->quality= - s->current_picture.quality = ff_rate_estimate_qscale(s); - - if(s->adaptive_quant){ - switch(s->codec_id){ - case CODEC_ID_MPEG4: - ff_clean_mpeg4_qscales(s); - break; - case CODEC_ID_H263: - case CODEC_ID_H263P: - case CODEC_ID_FLV1: - ff_clean_h263_qscales(s); - break; - } - - s->lambda= s->lambda_table[0]; - //FIXME broken - }else - s->lambda= s->current_picture.quality; -//printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); - update_qscale(s); + estimate_qp(s, 0); if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE)) s->qscale= 3; //reduce clipping problems Index: mpegvideo.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.h,v retrieving revision 1.227 retrieving revision 1.228 diff -u -d -r1.227 -r1.228 --- mpegvideo.h 17 Dec 2005 18:14:28 -0000 1.227 +++ mpegvideo.h 19 Dec 2005 13:41:27 -0000 1.228 @@ -972,7 +972,7 @@ /* rate control */ int ff_rate_control_init(MpegEncContext *s); -float ff_rate_estimate_qscale(MpegEncContext *s); +float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run); void ff_write_pass1_stats(MpegEncContext *s); void ff_rate_control_uninit(MpegEncContext *s); double ff_eval(char *s, double *const_value, const char **const_name,

8 8

CVS: ffmpeg/libavcodec avcodec.h, 1.435, 1.436 utils.c, 1.167, 1.168 mpegvideo.c, 1.499, 1.500
by michael＠mplayerhq.hu 26 Dec '05

26 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv16356 Modified Files: avcodec.h utils.c mpegvideo.c Log Message: support downscaling frames for dynamic b frame decission Index: avcodec.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v retrieving revision 1.435 retrieving revision 1.436 diff -u -d -r1.435 -r1.436 --- avcodec.h 23 Dec 2005 16:25:00 -0000 1.435 +++ avcodec.h 25 Dec 2005 18:34:02 -0000 1.436 @@ -1869,6 +1869,13 @@ * - decoding: unused */ int bidir_refine; + + /** + * + * - encoding: set by user. + * - decoding: unused + */ + int brd_scale; } AVCodecContext; /** Index: utils.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v retrieving revision 1.167 retrieving revision 1.168 diff -u -d -r1.167 -r1.168 --- utils.c 25 Dec 2005 17:43:52 -0000 1.167 +++ utils.c 25 Dec 2005 18:34:02 -0000 1.168 @@ -708,6 +708,7 @@ {"mb_lmax", NULL, OFFSET(mb_lmax), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"me_penalty_compensation", NULL, OFFSET(me_penalty_compensation), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"bidir_refine", NULL, OFFSET(bidir_refine), FF_OPT_TYPE_INT, DEFAULT, 0, 4, V|E}, +{"brd_scale", NULL, OFFSET(brd_scale), FF_OPT_TYPE_INT, DEFAULT, 0, 10, V|E}, {NULL}, }; Index: mpegvideo.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v retrieving revision 1.499 retrieving revision 1.500 diff -u -d -r1.499 -r1.500 --- mpegvideo.c 25 Dec 2005 17:30:52 -0000 1.499 +++ mpegvideo.c 25 Dec 2005 18:34:02 -0000 1.500 @@ -2145,9 +2145,9 @@ AVCodec *codec= avcodec_find_encoder(s->avctx->codec_id); AVCodecContext *c= avcodec_alloc_context(); AVFrame input[FF_MAX_B_FRAMES+2]; - const int scale= 0; + const int scale= s->avctx->brd_scale; int i, j, out_size; - int outbuf_size= (s->width * s->height) >> (2*scale); //FIXME + int outbuf_size= s->width * s->height; //FIXME uint8_t *outbuf= av_malloc(outbuf_size); ImgReSampleContext *resample; int64_t best_rd= INT64_MAX; @@ -2198,6 +2198,7 @@ input[0].pict_type= I_TYPE; input[0].quality= 2 * FF_QP2LAMBDA; out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[0]); + rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT; for(i=0; i<s->max_b_frames+1; i++){ int is_p= i % (j+1) == j || i==s->max_b_frames;

3 7

CVS: ffmpeg/doc ffmpeg-doc.texi,1.100,1.101
by al＠mplayerhq.hu 26 Dec '05

26 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/doc In directory mail:/var2/tmp/cvs-serv29858/doc Modified Files: ffmpeg-doc.texi Log Message: Mention libav versioning in CVS policy section with a short explanation. Index: ffmpeg-doc.texi =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffmpeg-doc.texi,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- ffmpeg-doc.texi 17 Dec 2005 18:14:26 -0000 1.100 +++ ffmpeg-doc.texi 26 Dec 2005 09:16:44 -0000 1.101 @@ -1263,6 +1263,16 @@ Never write to unallocated memory, never write over the end of arrays, always check values read from some untrusted source before using them as array index or other risky things. + at item + Remember to check if you need to bump versions for the specific libav + parts (libavutil,libavcodec,libavformat) you are changing. You need + to change the version integer and the version string. + Incrementing the first component means no backward compatibility to + previous version (e.g. removal of a function). + Incrementing the second component means backward compatible change + (e.g. addition of a function). + Incrementing the third component means a noteworthy binary compatible + change (e.g. encoder bug fix that matters for the decoder). @end enumerate We think our rules are not too hard. If you have comments, contact us.

1 0

CVS: ffmpeg/libavcodec dv.c,1.67,1.68
by michael＠mplayerhq.hu 25 Dec '05

25 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv28593/libavcodec Modified Files: dv.c Log Message: Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?) approved by Roman Shaposhnik Index: dv.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dv.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- dv.c 22 Dec 2005 01:10:07 -0000 1.67 +++ dv.c 25 Dec 2005 22:38:21 -0000 1.68 @@ -49,6 +49,9 @@ void (*get_pixels)(DCTELEM *block, const uint8_t *pixels, int line_size); void (*fdct[2])(DCTELEM *block); void (*idct_put[2])(uint8_t *dest, int line_size, DCTELEM *block); + + /* MultiThreading */ + uint8_t** dv_anchor; } DVVideoContext; #define TEX_VLC_BITS 9 @@ -61,9 +64,6 @@ #define DV_VLC_MAP_LEV_SIZE 512 //FIXME sign was removed so this should be /2 but needs check #endif -/* MultiThreading */ -static uint8_t** dv_anchor; - /* XXX: also include quantization */ static RL_VLC_ELEM *dv_rl_vlc; /* VLC encoding lookup table */ @@ -118,12 +118,12 @@ return -ENOMEM; /* dv_anchor lets each thread know its Id */ - dv_anchor = av_malloc(12*27*sizeof(void*)); - if (!dv_anchor) { + s->dv_anchor = av_malloc(12*27*sizeof(void*)); + if (!s->dv_anchor) { return -ENOMEM; } for (i=0; i<12*27; i++) - dv_anchor[i] = (void*)(size_t)i; + s->dv_anchor[i] = (void*)(size_t)i; /* it's faster to include sign bit in a generic VLC parsing scheme */ for (i=0, j=0; i<NB_DV_VLC; i++, j++) { @@ -149,9 +149,9 @@ init_vlc(&dv_vlc, TEX_VLC_BITS, j, new_dv_vlc_len, 1, 1, new_dv_vlc_bits, 2, 2, 0); - dv_rl_vlc = av_malloc(dv_vlc.table_size * sizeof(RL_VLC_ELEM)); + dv_rl_vlc = av_mallocz_static(dv_vlc.table_size * sizeof(RL_VLC_ELEM)); if (!dv_rl_vlc) { - av_free(dv_anchor); + av_free(s->dv_anchor); return -ENOMEM; } for(i = 0; i < dv_vlc.table_size; i++){ @@ -939,7 +939,7 @@ s->picture.top_field_first = 0; s->buf = buf; - avctx->execute(avctx, dv_decode_mt, (void**)&dv_anchor[0], NULL, + avctx->execute(avctx, dv_decode_mt, (void**)&s->dv_anchor[0], NULL, s->sys->difseg_size * 27); emms_c(); @@ -968,13 +968,23 @@ s->picture.pict_type = FF_I_TYPE; s->buf = buf; - c->execute(c, dv_encode_mt, (void**)&dv_anchor[0], NULL, + c->execute(c, dv_encode_mt, (void**)&s->dv_anchor[0], NULL, s->sys->difseg_size * 27); emms_c(); return s->sys->frame_size; } +static int dvvideo_close(AVCodecContext *c) +{ + DVVideoContext *s = c->priv_data; + + av_free(s->dv_anchor); + + return 0; +} + + #ifdef CONFIG_DVVIDEO_ENCODER AVCodec dvvideo_encoder = { "dvvideo", @@ -983,7 +993,7 @@ sizeof(DVVideoContext), dvvideo_init, dvvideo_encode_frame, - NULL, + dvvideo_close, NULL, CODEC_CAP_DR1, NULL @@ -997,7 +1007,7 @@ sizeof(DVVideoContext), dvvideo_init, NULL, - NULL, + dvvideo_close, dvvideo_decode_frame, CODEC_CAP_DR1, NULL

1 0

CVS: ffmpeg/libavcodec utils.c,1.166,1.167
by michael＠mplayerhq.hu 25 Dec '05

25 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv26191/libavcodec Modified Files: utils.c Log Message: 10l (didnt remove option from old ones after converting to AVOption) Index: utils.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v retrieving revision 1.166 retrieving revision 1.167 diff -u -d -r1.166 -r1.167 --- utils.c 23 Dec 2005 16:25:00 -0000 1.166 +++ utils.c 25 Dec 2005 17:43:52 -0000 1.167 @@ -506,7 +506,7 @@ {"max_b_frames", NULL, OFFSET(max_b_frames), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"b_quant_factor", NULL, OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, DEFAULT, FLT_MIN, FLT_MAX, V|E}, {"rc_strategy", NULL, OFFSET(rc_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, -{"b_frame_strategy", NULL, OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"b_strategy", NULL, OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, {"hurry_up", NULL, OFFSET(hurry_up), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D}, {"rtp_mode", NULL, OFFSET(rtp_mode), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"rtp_payload_size", NULL, OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},

1 0

CVS: ffmpeg ffmpeg.c,1.358,1.359
by michael＠mplayerhq.hu 25 Dec '05

25 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv26191 Modified Files: ffmpeg.c Log Message: 10l (didnt remove option from old ones after converting to AVOption) Index: ffmpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v retrieving revision 1.358 retrieving revision 1.359 diff -u -d -r1.358 -r1.359 --- ffmpeg.c 22 Dec 2005 01:10:05 -0000 1.358 +++ ffmpeg.c 25 Dec 2005 17:43:52 -0000 1.359 @@ -143,7 +143,6 @@ static int video_codec_tag = 0; static int same_quality = 0; static int b_frames = 0; -static int b_strategy = 0; static int pre_me = 0; static int do_deinterlace = 0; static int workaround_bugs = FF_BUG_AUTODETECT; @@ -3157,7 +3156,6 @@ if (b_frames) { video_enc->max_b_frames = b_frames; - video_enc->b_frame_strategy = b_strategy; video_enc->b_quant_factor = 2.0; } video_enc->qmin = video_qmin; @@ -4067,7 +4065,6 @@ { "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" }, { "ibias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ibias}, "intra quant bias", "bias" }, { "pbias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pbias}, "inter quant bias", "bias" }, - { "b_strategy", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&b_strategy}, "dynamic b frame selection strategy", "strategy" }, { "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" }, { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" }, { "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" },

1 0

CVS: ffmpeg/tests ffmpeg.regression.ref, 1.148, 1.149 rotozoom.regression.ref, 1.103, 1.104
by michael＠mplayerhq.hu 25 Dec '05

25 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/tests In directory mail:/var2/tmp/cvs-serv17458/tests Modified Files: ffmpeg.regression.ref rotozoom.regression.ref Log Message: dont discard least significant bits Index: ffmpeg.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/ffmpeg.regression.ref,v retrieving revision 1.148 retrieving revision 1.149 diff -u -d -r1.148 -r1.149 --- ffmpeg.regression.ref 24 Dec 2005 03:12:07 -0000 1.148 +++ ffmpeg.regression.ref 25 Dec 2005 16:34:12 -0000 1.149 @@ -71,14 +71,14 @@ 764896 ./data/a-mpeg4-thread.avi d10f9ee6af493233f46a2ff2b178940a *./data/out.yuv stddev: 12.32 PSNR:26.30 bytes:7602176 -50867a2530035615152f1e068c989bfc *./data/a-mpeg4-Q.avi -899514 ./data/a-mpeg4-Q.avi -cdb77818e108eab89c9ac4bcaf350e19 *./data/out.yuv +88cfdda74f0488cf4a8324667a1ec9e8 *./data/a-mpeg4-Q.avi +899452 ./data/a-mpeg4-Q.avi +af59c063ed644c7dc4151a0a2debbddd *./data/out.yuv stddev: 5.69 PSNR:33.00 bytes:7602176 -f89ab211c5a4a0267fc0318c02d735ca *./data/a-error-mpeg4-adv.avi -750788 ./data/a-error-mpeg4-adv.avi -83c96db61822c4ee2b9d46f1055264c5 *./data/out.yuv -stddev: 17.22 PSNR:23.40 bytes:7602176 +dd193b592a02864d612c64cbbf5e1258 *./data/a-error-mpeg4-adv.avi +766682 ./data/a-error-mpeg4-adv.avi +e90b201e20563ec7817f5dc4276902ed *./data/out.yuv +stddev: 15.90 PSNR:24.09 bytes:7602176 adf36cbca712f8202d474cf1f99bdcd0 *./data/a-mpeg4-nr.avi 689772 ./data/a-mpeg4-nr.avi 79f4e8263e40822c0cbf35725f375b24 *./data/out.yuv Index: rotozoom.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.regression.ref,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- rotozoom.regression.ref 24 Dec 2005 03:12:07 -0000 1.103 +++ rotozoom.regression.ref 25 Dec 2005 16:34:12 -0000 1.104 @@ -51,9 +51,9 @@ 868164 ./data/a-h263p.avi 80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv stddev: 1.91 PSNR:42.49 bytes:7602176 -0c19edbe67bfbb521569ee95ebdd3fa5 *./data/a-odivx.mp4 -120196 ./data/a-odivx.mp4 -8b7657a7f9fc7298cc016abb466d1d19 *./data/out.yuv +c23f4022c3af937da7200b3ce8547910 *./data/a-odivx.mp4 +120178 ./data/a-odivx.mp4 +e8c90899c32e11e7e4d1354dab0b8f28 *./data/out.yuv stddev: 5.34 PSNR:33.56 bytes:7602176 4a8912deb0182471aaaf4fc3ece39fb2 *./data/a-huffyuv.avi 6454196 ./data/a-huffyuv.avi @@ -63,26 +63,26 @@ 227834 ./data/a-mpeg4-rc.avi 2e02fa0261c21268d568ddde74f9431e *./data/out.yuv stddev: 4.26 PSNR:35.51 bytes:7602176 -6844785bcca74b4b9dc77ce6d21a3871 *./data/a-mpeg4-adv.avi -172538 ./data/a-mpeg4-adv.avi -49fecc1105d25ff1c2fc9c0d4cb821b0 *./data/out.yuv -stddev: 4.84 PSNR:34.41 bytes:7602176 -9f7f5a7da720ba720aa35d72ed062959 *./data/a-mpeg4-thread.avi -253448 ./data/a-mpeg4-thread.avi -672eff5de3b19df7b82ed3e6bed8642d *./data/out.yuv +49bb293a098ebf88870f663d590a02d9 *./data/a-mpeg4-adv.avi +172526 ./data/a-mpeg4-adv.avi +e3445dab9a3fa83a0f86457e24cb0cea *./data/out.yuv +stddev: 4.84 PSNR:34.42 bytes:7602176 +66de0faff3660a0893996b39742a4c02 *./data/a-mpeg4-thread.avi +253428 ./data/a-mpeg4-thread.avi +0f23dbeb37f14b71cfae86dfe6c0b0e4 *./data/out.yuv stddev: 4.05 PSNR:35.96 bytes:7602176 -1d39759d16065aeb96cc81aabd735f78 *./data/a-mpeg4-Q.avi -165034 ./data/a-mpeg4-Q.avi -b15dac581c3ba6e5e016df5dea360dc0 *./data/out.yuv +bb7f7889f0694a1c499041f3ee5e234d *./data/a-mpeg4-Q.avi +164998 ./data/a-mpeg4-Q.avi +b078f22c66083f0537bd3581509684d8 *./data/out.yuv stddev: 4.01 PSNR:36.05 bytes:7602176 -217c694a61eea2dd8896d558fed3fc05 *./data/a-error-mpeg4-adv.avi -175778 ./data/a-error-mpeg4-adv.avi -62106b2ae4c1cfc985face2dadb90cbc *./data/out.yuv -stddev: 10.05 PSNR:28.08 bytes:7602176 -75aeb8364b81a458af5523c4a2bfdb39 *./data/a-mpeg4-nr.avi -154392 ./data/a-mpeg4-nr.avi -33a6f702049ef4e074c6266b9d17d3e9 *./data/out.yuv -stddev: 4.73 PSNR:34.61 bytes:7602176 +74b9ddde044f90c8ee25042e9faaef68 *./data/a-error-mpeg4-adv.avi +177212 ./data/a-error-mpeg4-adv.avi +9fa0943825f364d6fb700dc75cf5d8bb *./data/out.yuv +stddev: 9.71 PSNR:28.37 bytes:7602176 +edf6bf425e6e5f78bdd1b992003aee9a *./data/a-mpeg4-nr.avi +154302 ./data/a-mpeg4-nr.avi +b69fc415185075bdb21bedeae03d20b8 *./data/out.yuv +stddev: 4.73 PSNR:34.62 bytes:7602176 1286f6db500a739f724994991be211b0 *./data/a-mpeg1b.mpg 231292 ./data/a-mpeg1b.mpg a0eeed27d5123995b32210dc35052cfe *./data/out.yuv

1 0

CVS: ffmpeg/libavformat rm.c,1.54,1.55
by rtognimp＠mplayerhq.hu 25 Dec '05

25 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv18096 Modified Files: rm.c Log Message: Support for 28_8 in old ar. files Index: rm.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/rm.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- rm.c 22 Dec 2005 01:10:11 -0000 1.54 +++ rm.c 25 Dec 2005 00:48:12 -0000 1.55 @@ -846,17 +846,7 @@ uint8_t *ptr; int flags; - if (rm->old_format) { - /* just read raw bytes */ - len = RAW_PACKET_SIZE; - len= av_get_packet(pb, pkt, len); - pkt->stream_index = 0; - if (len <= 0) { - return AVERROR_IO; - } - pkt->size = len; - st = s->streams[0]; - } else if (rm->audio_pkt_cnt) { + if (rm->audio_pkt_cnt) { // If there are queued audio packet return them first st = s->streams[rm->audio_stream_num]; av_new_packet(pkt, st->codec->block_align); @@ -866,6 +856,32 @@ rm->audio_pkt_cnt--; pkt->flags = 0; pkt->stream_index = rm->audio_stream_num; + } else if (rm->old_format) { + st = s->streams[0]; + if (st->codec->codec_id == CODEC_ID_RA_288) { + int x, y; + + for (y = 0; y < rm->sub_packet_h; y++) + for (x = 0; x < rm->sub_packet_h/2; x++) + if (get_buffer(pb, rm->audiobuf+x*2*rm->audio_framesize+y*rm->coded_framesize, rm->coded_framesize) <= 0) + return AVERROR_IO; + rm->audio_stream_num = 0; + rm->audio_pkt_cnt = rm->sub_packet_h * rm->audio_framesize / st->codec->block_align - 1; + // Release first audio packet + av_new_packet(pkt, st->codec->block_align); + memcpy(pkt->data, rm->audiobuf, st->codec->block_align); + pkt->flags |= PKT_FLAG_KEY; // Mark first packet as keyframe + pkt->stream_index = 0; + } else { + /* just read raw bytes */ + len = RAW_PACKET_SIZE; + len= av_get_packet(pb, pkt, len); + pkt->stream_index = 0; + if (len <= 0) { + return AVERROR_IO; + } + pkt->size = len; + } } else { int seq=1; resync:

1 0

CVS: ffmpeg/tests ffmpeg.regression.ref, 1.147, 1.148 rotozoom.regression.ref, 1.102, 1.103
by michael＠mplayerhq.hu 24 Dec '05

24 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/tests In directory mail:/var2/tmp/cvs-serv18981/tests Modified Files: ffmpeg.regression.ref rotozoom.regression.ref Log Message: slightly better mv_penalty table Index: ffmpeg.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/ffmpeg.regression.ref,v retrieving revision 1.147 retrieving revision 1.148 diff -u -d -r1.147 -r1.148 --- ffmpeg.regression.ref 23 Dec 2005 00:40:52 -0000 1.147 +++ ffmpeg.regression.ref 24 Dec 2005 03:12:07 -0000 1.148 @@ -51,25 +51,25 @@ 2414342 ./data/a-h263p.avi 28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv stddev: 2.07 PSNR:41.76 bytes:7602176 -9aceeacc860415019807c8f5f462dd1b *./data/a-odivx.mp4 -554440 ./data/a-odivx.mp4 -e400c9175dd1811cdeee7be5555d33f1 *./data/out.yuv +80e21d45a75c2dfce42a2894be750b03 *./data/a-odivx.mp4 +554527 ./data/a-odivx.mp4 +57aed19df5cbada4b05991527ee72ebe *./data/out.yuv stddev: 7.99 PSNR:30.06 bytes:7602176 8a9a98678a2e9c2e857f741cbb8e9ccb *./data/a-huffyuv.avi 7932708 ./data/a-huffyuv.avi 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -cd541209c9ef0c1824ac340d5087f0e0 *./data/a-mpeg4-rc.avi -824336 ./data/a-mpeg4-rc.avi -6656c0be50eba458b5ab91bfe6bf3077 *./data/out.yuv +cc4a9bf5046d4f471174800135867831 *./data/a-mpeg4-rc.avi +824318 ./data/a-mpeg4-rc.avi +df7de6d3ce1faf92393985485cdf287a *./data/out.yuv stddev: 10.41 PSNR:27.77 bytes:7602176 81078d7852dfd6041ff17b5dc8ed0ffc *./data/a-mpeg4-adv.avi 600240 ./data/a-mpeg4-adv.avi 0b7935cee2070f3b838478cea6dc4b3c *./data/out.yuv stddev: 10.25 PSNR:27.90 bytes:7602176 -5da70c628af00fc6d2dba685d24341b6 *./data/a-mpeg4-thread.avi -764920 ./data/a-mpeg4-thread.avi -6e3cc8569fd1f39a3657045a8249dbc6 *./data/out.yuv +b0235e9bf3cf3867064b9ff21cda76de *./data/a-mpeg4-thread.avi +764896 ./data/a-mpeg4-thread.avi +d10f9ee6af493233f46a2ff2b178940a *./data/out.yuv stddev: 12.32 PSNR:26.30 bytes:7602176 50867a2530035615152f1e068c989bfc *./data/a-mpeg4-Q.avi 899514 ./data/a-mpeg4-Q.avi Index: rotozoom.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.regression.ref,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- rotozoom.regression.ref 23 Dec 2005 00:40:52 -0000 1.102 +++ rotozoom.regression.ref 24 Dec 2005 03:12:07 -0000 1.103 @@ -71,9 +71,9 @@ 253448 ./data/a-mpeg4-thread.avi 672eff5de3b19df7b82ed3e6bed8642d *./data/out.yuv stddev: 4.05 PSNR:35.96 bytes:7602176 -ddcb9476113fac71ee609018984353ce *./data/a-mpeg4-Q.avi -165016 ./data/a-mpeg4-Q.avi -94d8bd3897ac20bb3bef9cf384f9abd0 *./data/out.yuv +1d39759d16065aeb96cc81aabd735f78 *./data/a-mpeg4-Q.avi +165034 ./data/a-mpeg4-Q.avi +b15dac581c3ba6e5e016df5dea360dc0 *./data/out.yuv stddev: 4.01 PSNR:36.05 bytes:7602176 217c694a61eea2dd8896d558fed3fc05 *./data/a-error-mpeg4-adv.avi 175778 ./data/a-error-mpeg4-adv.avi

1 0