December 2005 - ffmpeg-cvslog

CVS: ffmpeg/tests ffmpeg.regression.ref, 1.149, 1.150 rotozoom.regression.ref, 1.104, 1.105
by michael＠mplayerhq.hu 29 Dec '05

29 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/tests In directory mail:/var2/tmp/cvs-serv14068/tests Modified Files: ffmpeg.regression.ref rotozoom.regression.ref Log Message: second try of improved lambda/qp guessing for motion estimation RD in first pass Index: ffmpeg.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/ffmpeg.regression.ref,v retrieving revision 1.149 retrieving revision 1.150 diff -u -d -r1.149 -r1.150 --- ffmpeg.regression.ref 25 Dec 2005 16:34:12 -0000 1.149 +++ ffmpeg.regression.ref 29 Dec 2005 15:46:22 -0000 1.150 @@ -59,18 +59,18 @@ 7932708 ./data/a-huffyuv.avi 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -cc4a9bf5046d4f471174800135867831 *./data/a-mpeg4-rc.avi -824318 ./data/a-mpeg4-rc.avi -df7de6d3ce1faf92393985485cdf287a *./data/out.yuv -stddev: 10.41 PSNR:27.77 bytes:7602176 +d37d4d4b5acfffe3a01a72f51c162a82 *./data/a-mpeg4-rc.avi +822270 ./data/a-mpeg4-rc.avi +3ecd1afdaf2d691d01628737326dda35 *./data/out.yuv +stddev: 10.41 PSNR:27.76 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 -b0235e9bf3cf3867064b9ff21cda76de *./data/a-mpeg4-thread.avi -764896 ./data/a-mpeg4-thread.avi -d10f9ee6af493233f46a2ff2b178940a *./data/out.yuv -stddev: 12.32 PSNR:26.30 bytes:7602176 +052f9e98112011ddc302b521e34d6385 *./data/a-mpeg4-thread.avi +764686 ./data/a-mpeg4-thread.avi +252d1e8cc1ee88eea693cebd6b4e7e53 *./data/out.yuv +stddev: 12.32 PSNR:26.31 bytes:7602176 88cfdda74f0488cf4a8324667a1ec9e8 *./data/a-mpeg4-Q.avi 899452 ./data/a-mpeg4-Q.avi af59c063ed644c7dc4151a0a2debbddd *./data/out.yuv Index: rotozoom.regression.ref =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.regression.ref,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- rotozoom.regression.ref 25 Dec 2005 16:34:12 -0000 1.104 +++ rotozoom.regression.ref 29 Dec 2005 15:46:22 -0000 1.105 @@ -59,18 +59,18 @@ 6454196 ./data/a-huffyuv.avi dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -95e95dfe42fce9cdbe72688e821022ca *./data/a-mpeg4-rc.avi -227834 ./data/a-mpeg4-rc.avi -2e02fa0261c21268d568ddde74f9431e *./data/out.yuv -stddev: 4.26 PSNR:35.51 bytes:7602176 +8375752d50a0a11c85370eebfb601d5d *./data/a-mpeg4-rc.avi +227618 ./data/a-mpeg4-rc.avi +addcb0b8e42d71c25a0590d10e8e41c6 *./data/out.yuv +stddev: 4.27 PSNR:35.51 bytes:7602176 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 +4b88839dd9696ff5500bea89b9ca66be *./data/a-mpeg4-thread.avi +253268 ./data/a-mpeg4-thread.avi +d6f1714d6fe1f969fc4ca416c6f8ba6c *./data/out.yuv +stddev: 4.04 PSNR:35.98 bytes:7602176 bb7f7889f0694a1c499041f3ee5e234d *./data/a-mpeg4-Q.avi 164998 ./data/a-mpeg4-Q.avi b078f22c66083f0537bd3581509684d8 *./data/out.yuv

1 0

CVS: ffmpeg/libavcodec avcodec.h, 1.437, 1.438 utils.c, 1.168, 1.169 x264.c, 1.13, 1.14
by lorenm＠mplayerhq.hu 29 Dec '05

29 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv31510/libavcodec Modified Files: avcodec.h utils.c x264.c Log Message: update x264 wrapper. patch by Robert Swain. Index: avcodec.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v retrieving revision 1.437 retrieving revision 1.438 diff -u -d -r1.437 -r1.438 --- avcodec.h 28 Dec 2005 15:43:53 -0000 1.437 +++ avcodec.h 29 Dec 2005 07:24:23 -0000 1.438 @@ -363,6 +363,13 @@ #define CODEC_FLAG2_STRICT_GOP 0x00000002 ///< strictly enforce GOP size #define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< skip bitstream encoding #define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< place global headers at every keyframe instead of in extradata +#define CODEC_FLAG2_BPYRAMID 0x00000010 ///< H.264 allow b-frames to be used as references +#define CODEC_FLAG2_WPRED 0x00000020 ///< H.264 weighted biprediction for b-frames +#define CODEC_FLAG2_MIXED_REFS 0x00000040 ///< H.264 multiple references per partition +#define CODEC_FLAG2_8X8DCT 0x00000080 ///< H.264 high profile 8x8 transform +#define CODEC_FLAG2_FASTPSKIP 0x00000100 ///< H.264 fast pskip +#define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters +#define CODEC_FLAG2_BRDO 0x00000400 ///< b-frame rate-distortion optimization /* Unsupported options : * Syntax Arithmetic coding (SAC) @@ -733,6 +740,8 @@ /** * motion estimation algorithm used for video coding. + * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex), + * 8 (umh), 9 (iter) [7, 8 are x264 specific, 9 is snow specific] * - encoding: MUST be set by user. * - decoding: unused */ @@ -1879,6 +1888,97 @@ * - decoding: unused */ int brd_scale; + + /** + * constant rate factor - quality-based VBR - values ~correspond to qps + * - encoding: set by user. + * - decoding: unused + */ + int crf; + + /** + * constant quantization parameter rate control method + * - encoding: set by user. + * - decoding: unused + */ + int cqp; + + /** + * minimum gop size + * - encoding: set by user. + * - decoding: unused + */ + int keyint_min; + + /** + * number of reference frames + * - encoding: set by user. + * - decoding: unused + */ + int refs; + + /** + * chroma qp offset from luma + * - encoding: set by user. + * - decoding: unused + */ + int chromaoffset; + + /** + * influences how often b-frames are used + * - encoding: set by user. + * - decoding: unused + */ + int bframebias; + + /** + * trellis RD quantization + * - encoding: set by user. + * - decoding: unused + */ + int trellis; + + /** + * reduce fluctuations in qp (before curve compression) + * - encoding: set by user. + * - decoding: unused + */ + float complexityblur; + + /** + * in-loop deblocking filter alphac0 parameter + * alpha is in the range -6...6 + * - encoding: set by user. + * - decoding: unused + */ + int deblockalpha; + + /** + * in-loop deblocking filter beta parameter + * beta is in the range -6...6 + * - encoding: set by user. + * - decoding: unused + */ + int deblockbeta; + + /** + * macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4 + * - encoding: set by user. + * - decoding: unused + */ + int partitions; +#define X264_PART_I4X4 0x001 /* Analyse i4x4 */ +#define X264_PART_I8X8 0x002 /* Analyse i8x8 (requires 8x8 transform) */ +#define X264_PART_P8X8 0x010 /* Analyse p16x8, p8x16 and p8x8 */ +#define X264_PART_P4X4 0x020 /* Analyse p8x4, p4x8, p4x4 */ +#define X264_PART_B8X8 0x100 /* Analyse b16x8, b8x16 and b8x8 */ + + /** + * direct mv prediction mode - 0 (none), 1 (spatial), 2 (temporal) + * - encoding: set by user. + * - decoding: unused + */ + int directpred; } AVCodecContext; /** Index: utils.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v retrieving revision 1.168 retrieving revision 1.169 diff -u -d -r1.168 -r1.169 --- utils.c 25 Dec 2005 18:34:02 -0000 1.168 +++ utils.c 29 Dec 2005 07:24:23 -0000 1.169 @@ -679,7 +679,7 @@ {"nr", "noise reduction", OFFSET(noise_reduction), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"rc_init_occupancy", NULL, OFFSET(rc_initial_buffer_occupancy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, -{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX}, +{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, V|A|E|D, "flags2"}, {"error_rate", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"antialias", NULL, OFFSET(antialias_algo), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "aa"}, {"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_AUTO, INT_MIN, INT_MAX, V|D, "aa"}, @@ -709,6 +709,30 @@ {"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}, +{"crf", NULL, OFFSET(crf), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"cqp", NULL, OFFSET(cqp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"keyint_min", NULL, OFFSET(keyint_min), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"refs", NULL, OFFSET(refs), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"chromaoffset", NULL, OFFSET(chromaoffset), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"bframebias", NULL, OFFSET(bframebias), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"trellis", NULL, OFFSET(trellis), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"directpred", NULL, OFFSET(directpred), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"bpyramid", NULL, 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_BPYRAMID, INT_MIN, INT_MAX, V|E, "flags2"}, +{"wpred", NULL, 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_WPRED, INT_MIN, INT_MAX, V|E, "flags2"}, +{"mixed_refs", NULL, 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_MIXED_REFS, INT_MIN, INT_MAX, V|E, "flags2"}, +{"8x8dct", NULL, 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_8X8DCT, INT_MIN, INT_MAX, V|E, "flags2"}, +{"fastpskip", NULL, 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_FASTPSKIP, INT_MIN, INT_MAX, V|E, "flags2"}, +{"aud", NULL, 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_AUD, INT_MIN, INT_MAX, V|E, "flags2"}, +{"brdo", NULL, 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_BRDO, INT_MIN, INT_MAX, V|E, "flags2"}, +{"complexityblur", NULL, OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, DEFAULT, FLT_MIN, FLT_MAX, V|E}, +{"deblockalpha", NULL, OFFSET(deblockalpha), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"deblockbeta", NULL, OFFSET(deblockbeta), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +{"partitions", NULL, OFFSET(partitions), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, V|E, "partitions"}, +{"parti4x4", NULL, 0, FF_OPT_TYPE_CONST, X264_PART_I4X4, INT_MIN, INT_MAX, V|E, "partitions"}, +{"parti8x8", NULL, 0, FF_OPT_TYPE_CONST, X264_PART_I8X8, INT_MIN, INT_MAX, V|E, "partitions"}, +{"partp4x4", NULL, 0, FF_OPT_TYPE_CONST, X264_PART_P4X4, INT_MIN, INT_MAX, V|E, "partitions"}, +{"partp8x8", NULL, 0, FF_OPT_TYPE_CONST, X264_PART_P8X8, INT_MIN, INT_MAX, V|E, "partitions"}, +{"partb8x8", NULL, 0, FF_OPT_TYPE_CONST, X264_PART_B8X8, INT_MIN, INT_MAX, V|E, "partitions"}, {NULL}, }; @@ -728,7 +752,13 @@ s->mb_lmin= FF_QP2LAMBDA * 2; s->mb_lmax= FF_QP2LAMBDA * 31; s->rc_eq= "tex^qComp"; + s->cqp = -1; + s->refs = 1; + s->directpred = 2; s->qcompress= 0.5; + s->complexityblur = 20.0; + s->keyint_min = 25; + s->flags2 = CODEC_FLAG2_FASTPSKIP; s->max_qdiff= 3; s->b_quant_factor=1.25; s->b_quant_offset=1.25; Index: x264.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/x264.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- x264.c 22 Dec 2005 01:10:09 -0000 1.13 +++ x264.c 29 Dec 2005 07:24:23 -0000 1.14 @@ -20,6 +20,9 @@ #include "avcodec.h" #include <x264.h> #include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> typedef struct X264Context { x264_param_t params; @@ -136,10 +139,32 @@ x4->params.rc.i_bitrate = avctx->bit_rate / 1000; x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000; x4->params.rc.i_vbv_max_bitrate = avctx->rc_max_rate / 1000; - if(avctx->rc_buffer_size) - x4->params.rc.b_cbr = 1; + x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1); + if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1; + else{ + if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf; + else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp; + } + + // if neither crf nor cqp modes are selected we have to enable the RC + // we do it this way because we cannot check if the bitrate has been set + if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1; + x4->params.i_bframe = avctx->max_b_frames; x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; + x4->params.b_bframe_adaptive = avctx->b_frame_strategy; + x4->params.i_bframe_bias = avctx->bframebias; + x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID); + + x4->params.i_keyint_min = avctx->keyint_min; + if(x4->params.i_keyint_min > x4->params.i_keyint_max) + x4->params.i_keyint_min = x4->params.i_keyint_max; + + x4->params.i_scenecut_threshold = avctx->scenechange_threshold; + + x4->params.b_deblocking_filter = (avctx->flags & CODEC_FLAG_LOOP_FILTER); + x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha; + x4->params.i_deblocking_filter_beta = avctx->deblockbeta; x4->params.rc.i_qp_min = avctx->qmin; x4->params.rc.i_qp_max = avctx->qmax; @@ -147,10 +172,9 @@ x4->params.rc.f_qcompress = avctx->qcompress; /* 0.0 => cbr, 1.0 => constant qp */ x4->params.rc.f_qblur = avctx->qblur; /* temporally blur quants */ + x4->params.rc.f_complexity_blur = avctx->complexityblur; - if(avctx->flags & CODEC_FLAG_QSCALE && avctx->global_quality > 0) - x4->params.rc.i_qp_constant = - 12 + 6 * log2((double) avctx->global_quality / FF_QP2LAMBDA); + x4->params.i_frame_reference = avctx->refs; x4->params.i_width = avctx->width; x4->params.i_height = avctx->height; @@ -159,6 +183,68 @@ x4->params.i_fps_num = avctx->time_base.den; x4->params.i_fps_den = avctx->time_base.num; + x4->params.analyse.inter = 0; + if(avctx->partitions){ + if(avctx->partitions & X264_PART_I4X4) + x4->params.analyse.inter |= X264_ANALYSE_I4x4; + if(avctx->partitions & X264_PART_I8X8) + x4->params.analyse.inter |= X264_ANALYSE_I8x8; + if(avctx->partitions & X264_PART_P8X8) + x4->params.analyse.inter |= X264_ANALYSE_PSUB16x16; + if(avctx->partitions & X264_PART_P4X4) + x4->params.analyse.inter |= X264_ANALYSE_PSUB8x8; + if(avctx->partitions & X264_PART_B8X8) + x4->params.analyse.inter |= X264_ANALYSE_BSUB16x16; + } + + x4->params.analyse.i_direct_mv_pred = avctx->directpred; + + x4->params.analyse.b_weighted_bipred = (avctx->flags2 & CODEC_FLAG2_WPRED); + + if(avctx->me_method == ME_EPZS) + x4->params.analyse.i_me_method = X264_ME_DIA; + else if(avctx->me_method == ME_HEX) + x4->params.analyse.i_me_method = X264_ME_HEX; + else if(avctx->me_method == ME_UMH) + x4->params.analyse.i_me_method = X264_ME_UMH; + else if(avctx->me_method == ME_FULL) + x4->params.analyse.i_me_method = X264_ME_ESA; + else x4->params.analyse.i_me_method = X264_ME_HEX; + + x4->params.analyse.i_me_range = avctx->me_range; + x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; + + x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO); + x4->params.analyse.b_mixed_references = + (avctx->flags2 & CODEC_FLAG2_MIXED_REFS); + x4->params.analyse.b_chroma_me = (avctx->me_cmp & FF_CMP_CHROMA); + x4->params.analyse.b_transform_8x8 = (avctx->flags2 & CODEC_FLAG2_8X8DCT); + x4->params.analyse.b_fast_pskip = (avctx->flags2 & CODEC_FLAG2_FASTPSKIP); + + x4->params.analyse.i_trellis = avctx->trellis; + + if(avctx->level > 0) x4->params.i_level_idc = avctx->level; + + x4->params.rc.f_rate_tolerance = + (float)avctx->bit_rate_tolerance/avctx->bit_rate; + + if((avctx->rc_buffer_size != 0) && + (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)){ + x4->params.rc.f_vbv_buffer_init = + (float)avctx->rc_initial_buffer_occupancy/avctx->rc_buffer_size; + } + else x4->params.rc.f_vbv_buffer_init = 0.9; + + x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor); + x4->params.rc.f_pb_factor = avctx->b_quant_factor; + x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; + x4->params.rc.psz_rc_eq = avctx->rc_eq; + + x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR); + x4->params.i_log_level = X264_LOG_DEBUG; + + x4->params.b_aud = (avctx->flags2 & CODEC_FLAG2_AUD); + x4->params.i_threads = avctx->thread_count; x4->enc = x264_encoder_open(&x4->params);

1 0

CVS: ffmpeg ffmpeg.c,1.360,1.361
by lorenm＠mplayerhq.hu 29 Dec '05

29 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv31510 Modified Files: ffmpeg.c Log Message: update x264 wrapper. patch by Robert Swain. Index: ffmpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v retrieving revision 1.360 retrieving revision 1.361 diff -u -d -r1.360 -r1.361 --- ffmpeg.c 28 Dec 2005 15:43:52 -0000 1.360 +++ ffmpeg.c 29 Dec 2005 07:24:23 -0000 1.361 @@ -2531,8 +2531,8 @@ { video_qmin = atoi(arg); if (video_qmin < 1 || - video_qmin > 31) { - fprintf(stderr, "qmin must be >= 1 and <= 31\n"); + video_qmin > 51) { + fprintf(stderr, "qmin must be >= 1 and <= 51\n"); exit(1); } } @@ -2541,8 +2541,8 @@ { video_qmax = atoi(arg); if (video_qmax < 1 || - video_qmax > 31) { - fprintf(stderr, "qmax must be >= 1 and <= 31\n"); + video_qmax > 51) { + fprintf(stderr, "qmax must be >= 1 and <= 51\n"); exit(1); } }

1 0

CVS: ffmpeg/libavcodec mpegvideo.c,1.496,1.497
by michael＠mplayerhq.hu 29 Dec '05

29 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv20080/libavcodec Modified Files: mpegvideo.c Log Message: improved lambda/qp guessing for motion estimation RD in first pass this only affects encoding with bframes and rate control Index: mpegvideo.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v retrieving revision 1.496 retrieving revision 1.497 diff -u -d -r1.496 -r1.497 --- mpegvideo.c 22 Dec 2005 01:10:08 -0000 1.496 +++ mpegvideo.c 22 Dec 2005 14:17:54 -0000 1.497 @@ -5300,7 +5300,15 @@ if(s->flags & CODEC_FLAG_PASS2) estimate_qp(s, 1); + else if(!(s->flags & CODEC_FLAG_QSCALE)){ + RateControlContext *rcc= &s->rc_context; + if(s->pict_type==B_TYPE) + s->lambda= rcc->last_qscale_for[s->pict_type]; + else + s->lambda= rcc->last_qscale_for[rcc->last_non_b_pict_type]; + update_qscale(s); + } s->mb_intra=0; //for the rate distortion & bit compare functions for(i=1; i<s->avctx->thread_count; i++){

3 3

CVS: ffmpeg/libavcodec snow.c,1.70,1.71
by michael＠mplayerhq.hu 29 Dec '05

29 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv5945 Modified Files: snow.c Log Message: 4mv + iter ME 10l fix (still not bugfree but better) Index: snow.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- snow.c 28 Dec 2005 23:45:16 -0000 1.70 +++ snow.c 29 Dec 2005 02:17:51 -0000 1.71 @@ -2294,14 +2294,14 @@ if(level!=s->block_max_depth){ if(same_block(b,b+1) && same_block(b,b+w) && same_block(b,b+w+1)){ + put_rac(&s->c, &s->block_state[4 + s_context], 1); + }else{ put_rac(&s->c, &s->block_state[4 + s_context], 0); encode_q_branch2(s, level+1, 2*x+0, 2*y+0); encode_q_branch2(s, level+1, 2*x+1, 2*y+0); encode_q_branch2(s, level+1, 2*x+0, 2*y+1); encode_q_branch2(s, level+1, 2*x+1, 2*y+1); return; - }else{ - put_rac(&s->c, &s->block_state[4 + s_context], 1); } } if(b->type & BLOCK_INTRA){

1 0

CVS: ffmpeg/libavcodec snow.c,1.69,1.70
by michael＠mplayerhq.hu 28 Dec '05

28 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv13875 Modified Files: snow.c Log Message: 10l Index: snow.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- snow.c 28 Dec 2005 15:43:53 -0000 1.69 +++ snow.c 28 Dec 2005 23:45:16 -0000 1.70 @@ -3103,7 +3103,7 @@ int rd, index, value; assert(mb_x>=0 && mb_y>=0); - assert(mb_y<b_stride); + assert(mb_x<b_stride); if(intra){ block->color[0] = p[0];

1 0

CVS: ffmpeg/libavcodec motion_est.c,1.116,1.117
by michael＠mplayerhq.hu 28 Dec '05

28 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv17458/libavcodec Modified Files: motion_est.c Log Message: dont discard least significant bits Index: motion_est.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/motion_est.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- motion_est.c 24 Dec 2005 23:47:29 -0000 1.116 +++ motion_est.c 25 Dec 2005 16:34:11 -0000 1.117 @@ -1164,26 +1164,26 @@ /* intra / predictive decision */ pix = c->src[0][0]; sum = s->dsp.pix_sum(pix, s->linesize); - varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8; + varc = s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500; pic->mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; - pic->mb_var [s->mb_stride * mb_y + mb_x] = varc; - c->mb_var_sum_temp += varc; + pic->mb_var [s->mb_stride * mb_y + mb_x] = (varc+128)>>8; + c->mb_var_sum_temp += (varc+128)>>8; if(c->avctx->me_threshold){ - vard= (check_input_motion(s, mb_x, mb_y, 1)+128)>>8; + vard= check_input_motion(s, mb_x, mb_y, 1); - if(vard<c->avctx->me_threshold){ - pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = vard; - c->mc_mb_var_sum_temp += vard; - if (vard <= 64 || vard < varc) { //FIXME - c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8); + if((vard+128)>>8 < c->avctx->me_threshold){ + pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8; + c->mc_mb_var_sum_temp += (vard+128)>>8; + if (vard <= 64<<8 || vard < varc) { //FIXME + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); }else{ c->scene_change_score+= s->qscale; } return; } - if(vard<c->avctx->mb_threshold) + if((vard+128)>>8 < c->avctx->mb_threshold) mb_type= s->mb_type[mb_x + mb_y*s->mb_stride]; } @@ -1256,19 +1256,19 @@ /* At this point (mx,my) are full-pell and the relative displacement */ ppix = c->ref[0][0] + (my * s->linesize) + mx; - vard = (s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16)+128)>>8; + vard = s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16); - pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = vard; + pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8; // pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; - c->mc_mb_var_sum_temp += vard; + c->mc_mb_var_sum_temp += (vard+128)>>8; #if 0 printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n", varc, s->avg_mb_var, sum, vard, mx - xx, my - yy); #endif if(mb_type){ - if (vard <= 64 || vard < varc) - c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8); + if (vard <= 64<<8 || vard < varc) + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); else c->scene_change_score+= s->qscale; @@ -1288,14 +1288,14 @@ interlaced_search(s, 0, s->p_field_mv_table, s->p_field_select_table, mx, my, 1); } }else if(c->avctx->mb_decision > FF_MB_DECISION_SIMPLE){ - if (vard <= 64 || vard < varc) - c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8); + if (vard <= 64<<8 || vard < varc) + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); else c->scene_change_score+= s->qscale; - if (vard*2 + 200 > varc) + if (vard*2 + 200*256 > varc) mb_type|= CANDIDATE_MB_TYPE_INTRA; - if (varc*2 + 200 > vard){ + if (varc*2 + 200*256 > vard){ mb_type|= CANDIDATE_MB_TYPE_INTER; c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16); if(s->flags&CODEC_FLAG_MV0) @@ -1306,7 +1306,7 @@ my <<=shift; } if((s->flags&CODEC_FLAG_4MV) - && !c->skip && varc>50 && vard>10){ + && !c->skip && varc>50<<8 && vard>10<<8){ if(h263_mv4_search(s, mx, my, shift) < INT_MAX) mb_type|=CANDIDATE_MB_TYPE_INTER4V; @@ -1327,7 +1327,7 @@ dmin= ff_get_mb_score(s, mx, my, 0, 0, 0, 16, 1); if((s->flags&CODEC_FLAG_4MV) - && !c->skip && varc>50 && vard>10){ + && !c->skip && varc>50<<8 && vard>10<<8){ int dmin4= h263_mv4_search(s, mx, my, shift); if(dmin4 < dmin){ mb_type= CANDIDATE_MB_TYPE_INTER4V; @@ -1348,7 +1348,7 @@ /* get intra luma score */ if((c->avctx->mb_cmp&0xFF)==FF_CMP_SSE){ - intra_score= (varc<<8) - 500; //FIXME dont scale it down so we dont have to fix it + intra_score= varc - 500; }else{ int mean= (sum+128)>>8; mean*= 0x01010101; @@ -1394,8 +1394,8 @@ }else s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= 0; - if (vard <= 64 || vard < varc) { //FIXME - c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8); + if (vard <= 64<<8 || vard < varc) { //FIXME + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); }else{ c->scene_change_score+= s->qscale; } @@ -1815,26 +1815,26 @@ c->skip=0; if(c->avctx->me_threshold){ - int vard= (check_input_motion(s, mb_x, mb_y, 0)+128)>>8; + int vard= check_input_motion(s, mb_x, mb_y, 0); - if(vard<c->avctx->me_threshold){ + if((vard+128)>>8 < c->avctx->me_threshold){ // pix = c->src[0][0]; // sum = s->dsp.pix_sum(pix, s->linesize); -// varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8; +// varc = s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500; -// pic->mb_var [s->mb_stride * mb_y + mb_x] = varc; - s->current_picture.mc_mb_var[s->mb_stride * mb_y + mb_x] = vard; +// pic->mb_var [s->mb_stride * mb_y + mb_x] = (varc+128)>>8; + s->current_picture.mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8; /* pic->mb_mean [s->mb_stride * mb_y + mb_x] = (sum+128)>>8; - c->mb_var_sum_temp += varc;*/ - c->mc_mb_var_sum_temp += vard; -/* if (vard <= 64 || vard < varc) { - c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8); + c->mb_var_sum_temp += (varc+128)>>8;*/ + c->mc_mb_var_sum_temp += (vard+128)>>8; +/* if (vard <= 64<<8 || vard < varc) { + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); }else{ c->scene_change_score+= s->qscale; }*/ return; } - if(vard<c->avctx->mb_threshold){ + if((vard+128)>>8 < c->avctx->mb_threshold){ type= s->mb_type[mb_y*s->mb_stride + mb_x]; if(type == CANDIDATE_MB_TYPE_DIRECT){ direct_search(s, mb_x, mb_y);

2 1

CVS: ffmpeg ffmpeg.c,1.359,1.360
by michael＠mplayerhq.hu 28 Dec '05

28 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv16368 Modified Files: ffmpeg.c Log Message: iterative overlapped block based motion estimation for snow Index: ffmpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v retrieving revision 1.359 retrieving revision 1.360 diff -u -d -r1.359 -r1.360 --- ffmpeg.c 25 Dec 2005 17:43:52 -0000 1.359 +++ ffmpeg.c 28 Dec 2005 15:43:52 -0000 1.360 @@ -2770,6 +2770,9 @@ "phods", "epzs", "x1", + "hex", + "umh", + "iter", NULL, };

1 0

CVS: ffmpeg/libavcodec h263.c,1.295,1.296
by michael＠mplayerhq.hu 28 Dec '05

28 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv18981/libavcodec Modified Files: h263.c Log Message: slightly better mv_penalty table Index: h263.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h263.c,v retrieving revision 1.295 retrieving revision 1.296 diff -u -d -r1.295 -r1.296 --- h263.c 22 Dec 2005 01:10:07 -0000 1.295 +++ h263.c 24 Dec 2005 03:12:06 -0000 1.296 @@ -1763,7 +1763,7 @@ if(code<33){ len= mvtab[code][1] + 1 + bit_size; }else{ - len= mvtab[32][1] + 2 + bit_size; + len= mvtab[32][1] + av_log2(code>>5) + 2 + bit_size; } }

2 1

CVS: ffmpeg Changelog,1.57,1.58
by rtognimp＠mplayerhq.hu 27 Dec '05

27 Dec '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv9528 Modified Files: Changelog Log Message: wma2 fix Index: Changelog =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/Changelog,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- Changelog 17 Dec 2005 18:14:25 -0000 1.57 +++ Changelog 27 Dec 2005 20:05:06 -0000 1.58 @@ -26,6 +26,7 @@ - ffserver fixed, it should now be usable again - QDM2 audio decoder - cook decoder +- wma2 fixed, now all files should be decodeable version 0.4.9-pre1:

1 0