# HG changeset patch # User diego # Date 1163817619 0 # Node ID 41773d1887567498af50e56dba80fc7e8c3eaf8d # Parent 4da452b25fd5f1807b6e9815c755f1531ba7b604 Remove obsolete Xvid 3 support. diff -r 4da452b25fd5 -r 41773d188756 configure --- a/configure Sat Nov 18 00:45:16 2006 +0000 +++ b/configure Sat Nov 18 02:40:19 2006 +0000 @@ -275,7 +275,6 @@ --disable-xanim disable XAnim codecs support [enabled] --disable-real disable RealPlayer codecs support [enabled] --disable-xvid disable XviD [autodetect] - --disable-xvid3 disable XviD 3 [autodetect] --disable-x264 disable x264 [autodetect] --disable-nut disable libnut [autodetect] --disable-libavutil disable libavutil [autodetect] @@ -1659,7 +1658,6 @@ _vidix_internal=auto _vidix_external=auto _joystick=no -_xvid3=auto _xvid=auto _x264=auto _nut=auto @@ -1922,8 +1920,6 @@ --disable-vidix-external) _vidix_external=no ;; --enable-joystick) _joystick=yes ;; --disable-joystick) _joystick=no ;; - --enable-xvid3) _xvid3=yes ;; - --disable-xvid3) _xvid3=no ;; --enable-xvid) _xvid=yes ;; --disable-xvid) _xvid=no ;; --enable-x264) _x264=yes ;; @@ -6409,28 +6405,6 @@ echores "$_bl" -echocheck "XviD 3" - if test "$_xvid3" = auto ; then - cat > $TMPC << EOF -#include -int main(void) { xvid_init(0, 0, 0, 0); return 0; } -EOF - _ld_xvid="$_ld_xvid -lxvidcore" - _xvid3=no - cc_check $_ld_xvid -lxvidcore $_ld_lm && _xvid3=yes -fi - -if test "$_xvid3" = yes ; then - _def_xvid3='#define HAVE_XVID3 1' - _codecmodules="xvid3 $_codecmodules" -else - _def_xvid3='#undef HAVE_XVID3' - _nocodecmodules="xvid3 $_nocodecmodules" - _ld_xvid="" -fi -echores "$_xvid3" - - echocheck "XviD" if test "$_xvid" = auto ; then _xvid=no @@ -7484,7 +7458,6 @@ CONFIG_LIBPOSTPROC_SO = $_libpostproc_so ZORAN = $_zr LIBDV = $_libdv -XVID3 = $_xvid3 XVID4 = $_xvid X264 = $_x264 LIBNUT = $_nut @@ -7653,7 +7626,6 @@ #define USE_STREAM_CACHE 1 /* Define if you are using XviD library */ -$_def_xvid3 $_def_xvid /* Define if you are using the X.264 library */ diff -r 4da452b25fd5 -r 41773d188756 libmpcodecs/Makefile --- a/libmpcodecs/Makefile Sat Nov 18 00:45:16 2006 +0000 +++ b/libmpcodecs/Makefile Sat Nov 18 02:40:19 2006 +0000 @@ -107,9 +107,6 @@ ifeq ($(XVID4),yes) VIDEO_SRCS+=vd_xvid4.c endif -ifeq ($(XVID3),yes) -VIDEO_SRCS+=vd_xvid.c -endif ifeq ($(ZORAN),yes) VIDEO_SRCS+=vd_zrmjpeg.c endif @@ -235,9 +232,6 @@ ifeq ($(XVID4),yes) ENCODER_SRCS+=ve_xvid4.c endif -ifeq ($(XVID3),yes) -ENCODER_SRCS+=ve_xvid.c -endif ifeq ($(X264),yes) ENCODER_SRCS+=ve_x264.c endif diff -r 4da452b25fd5 -r 41773d188756 libmpcodecs/vd.c --- a/libmpcodecs/vd.c Sat Nov 18 00:45:16 2006 +0000 +++ b/libmpcodecs/vd.c Sat Nov 18 02:40:19 2006 +0000 @@ -90,7 +90,7 @@ #ifdef USE_REALCODECS &mpcodecs_vd_realvid, #endif -#if defined(HAVE_XVID3) || defined(HAVE_XVID4) +#ifdef HAVE_XVID4 &mpcodecs_vd_xvid, #endif #ifdef HAVE_LIBDV095 diff -r 4da452b25fd5 -r 41773d188756 libmpcodecs/vd_xvid.c --- a/libmpcodecs/vd_xvid.c Sat Nov 18 00:45:16 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,247 +0,0 @@ -#include -#include - -#include "config.h" -#include "mp_msg.h" - -#include "vd_internal.h" -#include "m_option.h" - -#include - -#ifdef XVID_API_UNSTABLE -#warning ******************************************************************* -#warning ** ** -#warning ** Y O U '' R E U S I N G U N S T A B L E S O F T W A R E ** -#warning ** ** -#warning ** There are bugs, this code could crash, could blow up your PC ** -#warning ** or the whole building and do many other nasty things ! ** -#warning ** ** -#warning ** If you want stable code use stable XViD releases (0.9.x). ** -#warning ** ** -#warning ******************************************************************* -#endif - -typedef struct -{ - void *y; - void *u; - void *v; - int stride_y; - int stride_uv; -} -DIVX4_DEC_PICTURE; - - - -static vd_info_t info = -{ - "xvid decoder", - "xvid", - "Albeu", - "Albeu", - "" -}; - -LIBVD_EXTERN(xvid) - -typedef struct { - int cs; - unsigned char img_type; - void* hdl; - mp_image_t* mpi; -} priv_t; - -static int do_dr2 = 0; - -m_option_t xvid_dec_opts[] = { - { "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - -// to set/get/query special features/parameters -static int control(sh_video_t *sh,int cmd,void* arg,...){ - return CONTROL_UNKNOWN; -} - -// init driver -static int init(sh_video_t *sh){ - XVID_INIT_PARAM ini; - XVID_DEC_PARAM dec_p; - priv_t* p; - int cs; - -#ifdef XVID_API_UNSTABLE - mp_msg (MSGT_DECVIDEO, MSGL_WARN, - "\n" - "*******************************************************************\n" - "** **\n" - "** Y O U ' R E U S I N G U N S T A B L E S O F T W A R E **\n" - "** **\n" - "** There are bugs, this code could crash, could blow up your PC **\n" - "** or the whole building and do many other nasty things ! **\n" - "** **\n" - "** If you want stable code use stable XViD releases (0.9.x). **\n" - "** **\n" - "*******************************************************************\n" - "\n"); -#endif - - memset(&ini,0,sizeof(XVID_INIT_PARAM)); - memset(&dec_p,0,sizeof(XVID_DEC_PARAM)); - - if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12)) - return 0; - - switch(sh->codec->outfmt[sh->outfmtidx]){ - case IMGFMT_YV12: -#ifdef XVID_CSP_EXTERN - cs= do_dr2 ? XVID_CSP_EXTERN : XVID_CSP_USER; -#else - cs= XVID_CSP_USER; -#endif - break; - case IMGFMT_YUY2: - cs=XVID_CSP_YUY2; - break; - case IMGFMT_UYVY: - cs=XVID_CSP_UYVY; - break; - case IMGFMT_I420: - case IMGFMT_IYUV: - cs=XVID_CSP_I420; - break; - case IMGFMT_BGR15: - cs=XVID_CSP_RGB555; - break; - case IMGFMT_BGR16: - cs=XVID_CSP_RGB565; - break; - case IMGFMT_BGR24: - cs=XVID_CSP_RGB24; - break; - case IMGFMT_BGR32: - cs=XVID_CSP_RGB32; - break; - case IMGFMT_YVYU: - cs=XVID_CSP_YVYU; - break; - default: - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Unsupported out_fmt: 0x%X\n",sh->codec->outfmt[sh->outfmtidx]); - return 0; - } - - if(xvid_init(NULL, 0, &ini, NULL)) - return 0; - - if(ini.api_version != API_VERSION) { - if(ini.api_version < API_VERSION) { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Too old version of xvid (min. %d)\n",API_VERSION); - return 0; - } - mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Bad xvid version %d was compiled with %d\n", - ini.api_version,API_VERSION); - } - - dec_p.width = sh->disp_w; - dec_p.height = sh->disp_h; - - if(xvid_decore(NULL, XVID_DEC_CREATE, &dec_p, NULL)) { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"xvid init failed\n"); - return 0; - } - - p = malloc(sizeof(priv_t)); - p->cs = cs; - p->hdl = dec_p.handle; - sh->context = p; - - switch(cs) { -#ifdef XVID_CSP_EXTERN - case XVID_CSP_EXTERN: - p->img_type = MP_IMGTYPE_STATIC; - break; -#endif - case XVID_CSP_USER: - p->img_type = MP_IMGTYPE_EXPORT; - break; - default: - p->img_type = MP_IMGTYPE_TEMP; - break; - } - - return 1; -} - -// uninit driver -static void uninit(sh_video_t *sh){ - priv_t* p = sh->context; - if(!p) - return; - xvid_decore(p->hdl,XVID_DEC_DESTROY, NULL, NULL); - free(p); -} - -// decode a frame -static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ - XVID_DEC_FRAME dec; - DIVX4_DEC_PICTURE d4_pic; -#ifdef XVID_CSP_EXTERN - XVID_DEC_PICTURE pic; -#endif - priv_t* p = sh->context; - - mp_image_t* mpi = mpcodecs_get_image(sh, p->img_type, - MP_IMGFLAG_ACCEPT_STRIDE, - sh->disp_w,sh->disp_h); - - if(!data || !mpi || len <= 0) - return NULL; - - memset(&dec,0,sizeof(XVID_DEC_FRAME)); - - dec.bitstream = data; - dec.length = len; -#ifdef XVID_API_UNSTABLE - dec.general |= XVID_DEC_LOWDELAY; -#endif - switch(p->cs) { - case XVID_CSP_USER: - dec.image = &d4_pic; - break; -#ifdef XVID_CSP_EXTERN - case XVID_CSP_EXTERN: - pic.y = mpi->planes[0]; - pic.u = mpi->planes[1]; - pic.v = mpi->planes[2]; - pic.stride_y = mpi->stride[0]; - pic.stride_u = mpi->stride[1]; - pic.stride_v = mpi->stride[2]; - dec.image = &pic; - break; -#endif - default: - dec.image = mpi->planes[0]; - if(IMGFMT_IS_BGR(mpi->imgfmt) || IMGFMT_IS_RGB(mpi->imgfmt)) - dec.stride = mpi->width; - else - dec.stride = mpi->stride[0]; - } - dec.colorspace = p->cs; - - if(xvid_decore(p->hdl,XVID_DEC_DECODE,&dec,NULL)) { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"decoding error\n"); - return NULL; - } - - if(p->cs == XVID_CSP_USER) { - mpi->planes[0] = d4_pic.y; - mpi->planes[1] = d4_pic.u; - mpi->planes[2] = d4_pic.v; - mpi->stride[0] = d4_pic.stride_y; - mpi->stride[1] = mpi->stride[2] = d4_pic.stride_uv; - } - - return mpi; -} diff -r 4da452b25fd5 -r 41773d188756 libmpcodecs/ve.c --- a/libmpcodecs/ve.c Sat Nov 18 00:45:16 2006 +0000 +++ b/libmpcodecs/ve.c Sat Nov 18 02:40:19 2006 +0000 @@ -32,7 +32,7 @@ &ve_info_libdv, #endif &ve_info_raw, -#if defined(HAVE_XVID3) || defined(HAVE_XVID4) +#ifdef HAVE_XVID4 &ve_info_xvid, #endif &ve_info_nuv, diff -r 4da452b25fd5 -r 41773d188756 libmpcodecs/ve_xvid.c --- a/libmpcodecs/ve_xvid.c Sat Nov 18 00:45:16 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,587 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#if !defined(INFINITY) && defined(HUGE_VAL) -#define INFINITY HUGE_VAL -#endif - -#include "config.h" -#include "mp_msg.h" - -#include "codec-cfg.h" -#include "stream.h" -#include "demuxer.h" -#include "stheader.h" - -#include "muxer.h" - -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" - -#include -#include "xvid_vbr.h" - -#include "m_option.h" - - -#ifdef XVID_API_UNSTABLE -#warning ******************************************************************* -#warning ** ** -#warning ** Y O U '' R E U S I N G U N S T A B L E S O F T W A R E ** -#warning ** ** -#warning ** Streams produced by this version aren''t probably compatible ** -#warning ** with anything else, even the xvid decoder itself. There are ** -#warning ** bugs, this code could crash, could blow up your PC or the ** -#warning ** whole building ! ** -#warning ** If you want stable code and compatible streams, use stable ** -#warning ** XViD releases (currently 0.9.x). ** -#warning ** ** -#warning ******************************************************************* -#endif - -/**********************************************************************/ -/* motion estimation quality presets */ -static int const motion_presets[7] = { -#ifdef XVID_API_UNSTABLE - 0, - 0, - 0, - 0, - PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8, - PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8 | PMV_ADVANCEDDIAMOND16, - PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_HALFPELREFINE8 | PMV_HALFPELDIAMOND8 | PMV_USESQUARES16 -#else - 0, - PMV_QUICKSTOP16, - PMV_EARLYSTOP16, - PMV_EARLYSTOP16 | PMV_EARLYSTOP8, - PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 | PMV_HALFPELDIAMOND8, - PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 | PMV_HALFPELDIAMOND8 | PMV_ADVANCEDDIAMOND16, - PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_EARLYSTOP8 | PMV_HALFPELREFINE8 | - PMV_HALFPELDIAMOND8 | PMV_USESQUARES16 - -#endif -}; - -extern char* passtmpfile; - -static int xvidenc_pass = 0; -static int xvidenc_quality = 6; -static int xvidenc_4mv = 0; -static int xvidenc_bitrate = -1; -static int xvidenc_rc_reaction_delay_factor = -1; -static int xvidenc_rc_averaging_period = -1; -static int xvidenc_rc_buffer = -1; -static char* xvidenc_quant_range = "2-31/2-31"; -static int xvidenc_min_key_interval = -1; -static int xvidenc_max_key_interval = -1; -static int xvidenc_mpeg_quant = 0; -static int xvidenc_mod_quant = 0; -static int xvidenc_keyframe_boost = -1; -static int xvidenc_kfthreshold = -1; -static int xvidenc_kfreduction = -1; -static int xvidenc_fixed_quant = 0; -static int xvidenc_debug = 0; -static int xvidenc_interlacing = 0; -static int xvidenc_greyscale = 0; -#ifdef XVID_API_UNSTABLE -static int xvidenc_packed = 0; -static int xvidenc_divx5bvop = 1; -static int xvidenc_lumi_mask = 0; -static int xvidenc_qpel = 0; -static int xvidenc_max_bframes = 0; -static int xvidenc_bquant_ratio = 150; -static int xvidenc_bquant_offset = 100; -static int xvidenc_bf_threshold = 0; -static int xvidenc_gmc = 0; -static int xvidenc_chroma_me = 0; -static int xvidenc_chroma_opt = 0; -static int xvidenc_reduced = 0; -static int xvidenc_hqac = 0; -static int xvidenc_vhq = 0; -static int xvidenc_psnr = 0; -static uint64_t xvid_error[3]; -#endif - -m_option_t xvidencopts_conf[] = { - { "pass", &xvidenc_pass, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, - { "me_quality", &xvidenc_quality, CONF_TYPE_INT, CONF_RANGE, 0, - sizeof(motion_presets) / sizeof(motion_presets[0]) - 1, NULL}, - { "4mv", &xvidenc_4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "bitrate", &xvidenc_bitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL}, - { "rc_reaction_delay_factor", &xvidenc_rc_reaction_delay_factor, CONF_TYPE_INT, 0, 0, 0, NULL}, - { "rc_averaging_period", &xvidenc_rc_averaging_period, CONF_TYPE_INT, 0, 0, 0, NULL}, - { "rc_buffer", &xvidenc_rc_buffer, CONF_TYPE_INT, 0, 0, 0, NULL}, - { "quant_range", &xvidenc_quant_range, CONF_TYPE_STRING, 0, 0, 0, NULL}, - { "min_key_interval", &xvidenc_min_key_interval, CONF_TYPE_INT, 0, 0, 0, NULL}, /* for XVID_MODE_2PASS_2 */ - { "max_key_interval", &xvidenc_max_key_interval, CONF_TYPE_INT, 0, 0, 0, NULL}, - { "mpeg_quant", &xvidenc_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "mod_quant", &xvidenc_mod_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "keyframe_boost", &xvidenc_keyframe_boost, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL}, /* for XVID_MODE_2PASS_2 */ - { "kfthreshold", &xvidenc_kfthreshold, CONF_TYPE_INT, 0, 0, 0, NULL}, /* for XVID_MODE_2PASS_2 */ - { "kfreduction", &xvidenc_kfreduction, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, /* for XVID_MODE_2PASS_2 */ - { "fixed_quant", &xvidenc_fixed_quant, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, /* for XVID_MODE_FIXED_QUANT */ - { "debug", &xvidenc_debug, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "interlacing", &xvidenc_interlacing, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "greyscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#ifdef XVID_API_UNSTABLE - { "packed", &xvidenc_packed, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "divx5bvop", &xvidenc_divx5bvop, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - //{ "lumi_mask", &xvidenc_lumi_mask, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "psnr", &xvidenc_psnr, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "qpel", &xvidenc_qpel, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "max_bframes", &xvidenc_max_bframes, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, - { "bquant_ratio", &xvidenc_bquant_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL}, - { "bquant_offset", &xvidenc_bquant_offset, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, - { "bf_threshold", &xvidenc_bf_threshold, CONF_TYPE_INT, CONF_RANGE, -255, 255, NULL}, - { "reduced", &xvidenc_reduced, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "gmc", &xvidenc_gmc, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "chroma_me", &xvidenc_chroma_me, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "hq_ac", &xvidenc_hqac, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - { "vhq", &xvidenc_vhq, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, - { "chroma_opt", &xvidenc_chroma_opt, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#endif - { NULL, NULL, 0, 0, 0, 0, NULL} -}; - -struct vf_priv_s { - muxer_stream_t* mux; - XVID_ENC_FRAME enc_frame; - void* enc_handle; - vbr_control_t vbr_state; - int pixels; - int nb_frames; -}; - -static int -config(struct vf_instance_s* vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt) -{ - XVID_ENC_PARAM enc_param; - struct vf_priv_s *fp = vf->priv; - unsigned int min_iq, max_iq, min_pq, max_pq; - - fp->mux->bih->biWidth = width; - fp->mux->bih->biHeight = height; - fp->mux->bih->biSizeImage = fp->mux->bih->biWidth * fp->mux->bih->biHeight * 3; - fp->mux->aspect = (float)d_width/d_height; - mp_msg(MSGT_MENCODER,MSGL_INFO,"videocodec: XViD (%dx%d fourcc=%x [%.4s])\n", - width, height, fp->mux->bih->biCompression, (char *)&fp->mux->bih->biCompression); - - // {min,max}_{i,p}quantizer parsing & validation - if (sscanf (xvidenc_quant_range, "%u-%u/%u-%u", &min_iq, &max_iq, &min_pq, &max_pq) < 4) { - mp_msg (MSGT_MENCODER, MSGL_ERR, - "xvid: ERROR: cannot parse \"quant_range=%s\"\n", xvidenc_quant_range); - return 0; - } - if (min_iq < 1 || min_iq > 31 || max_iq < 1 || max_iq > 31 || min_iq > max_iq || - min_pq < 1 || min_pq > 31 || max_pq < 1 || max_pq > 31 || min_pq > max_pq) { - mp_msg (MSGT_MENCODER, MSGL_ERR, - "xvid: ERROR: {min,max} {I,P} quantizer must be in [1,31] and min must be <= max.\n"); - mp_msg (MSGT_MENCODER, MSGL_ERR, - "xvid: ERROR: cannot use \"quant_range=%s\"\n", xvidenc_quant_range); - return -1; - } - -#ifdef XVID_API_UNSTABLE - mp_msg (MSGT_MENCODER, MSGL_WARN, - "\n" - "*******************************************************************\n" - "** **\n" - "** Y O U ' R E U S I N G U N S T A B L E S O F T W A R E **\n" - "** **\n" - "** Streams produced by this version aren't probably compatible **\n" - "** with anything else, even the xvid decoder itself. There are **\n" - "** bugs, this code could crash, could blow up your PC or the **\n" - "** whole building ! **\n" - "** If you want stable code and compatible streams, use stable **\n" - "** XViD releases (currently 0.9.x). **\n" - "** **\n" - "*******************************************************************\n" - "\n"); -#endif - - // initialize XViD core parameters - // =============================== - memset(&enc_param, 0, sizeof(enc_param)); - enc_param.width = width; - enc_param.height = height; - enc_param.fincr = fp->mux->h.dwScale; - enc_param.fbase = fp->mux->h.dwRate; - if (xvidenc_bitrate > 16000) - enc_param.rc_bitrate = xvidenc_bitrate; - else if (xvidenc_bitrate > 0) - enc_param.rc_bitrate = xvidenc_bitrate * 1000; - else - enc_param.rc_bitrate = -1; -#ifdef XVID_API_UNSTABLE - if (xvidenc_max_bframes >= 1 && xvidenc_pass >= 1) { - mp_msg(MSGT_MENCODER,MSGL_WARN, "xvid: cannot use bframes with 2-pass, disabling bframes\n"); - xvidenc_max_bframes = 0; - } - enc_param.max_bframes = xvidenc_max_bframes; - enc_param.bquant_ratio = xvidenc_bquant_ratio; - enc_param.bquant_offset = xvidenc_bquant_offset; - if (xvidenc_divx5bvop) - enc_param.global |= XVID_GLOBAL_DX50BVOP; - if (xvidenc_packed) - enc_param.global |= XVID_GLOBAL_PACKED; - if (xvidenc_reduced) - enc_param.global |= XVID_GLOBAL_REDUCED; - if (xvidenc_psnr) { - enc_param.global |= XVID_GLOBAL_EXTRASTATS; - fp->pixels = width * height; - fp->nb_frames = 0; - xvid_error[0] = xvid_error[1] = xvid_error[2] = 0; - } - if (xvidenc_greyscale) - enc_param.global |= XVID_GREYSCALE; -#endif - enc_param.rc_reaction_delay_factor = xvidenc_rc_reaction_delay_factor; - enc_param.rc_averaging_period = xvidenc_rc_averaging_period; - enc_param.rc_buffer = xvidenc_rc_buffer; - enc_param.min_quantizer = min_iq; - enc_param.max_quantizer = max_iq; - if( xvidenc_max_key_interval <= 0 ) - xvidenc_max_key_interval = 10 * enc_param.fbase / enc_param.fincr; - enc_param.max_key_interval = xvidenc_max_key_interval; - switch (xvid_encore(NULL, XVID_ENC_CREATE, &enc_param, NULL)) { - case XVID_ERR_FAIL: - mp_msg(MSGT_MENCODER,MSGL_ERR, "xvid: encoder creation failed\n"); - return 0; - case XVID_ERR_MEMORY: - mp_msg(MSGT_MENCODER,MSGL_ERR, "xvid: encoder creation failed, out of memory\n"); - return 0; - case XVID_ERR_FORMAT: - mp_msg(MSGT_MENCODER,MSGL_ERR, "xvid: encoder creation failed, bad format\n"); - return 0; - } - fp->enc_handle = enc_param.handle; - - // initialize XViD per-frame static parameters - // =========================================== - fp->enc_frame.motion = motion_presets[xvidenc_quality]; - fp->enc_frame.general = XVID_HALFPEL | (xvidenc_mpeg_quant ? XVID_MPEGQUANT : XVID_H263QUANT); - if (xvidenc_4mv) - fp->enc_frame.general |= XVID_INTER4V; - if (xvidenc_interlacing) - fp->enc_frame.general |= XVID_INTERLACING; -#ifdef XVID_API_UNSTABLE - fp->enc_frame.bframe_threshold = xvidenc_bf_threshold; - if (xvidenc_lumi_mask) - fp->enc_frame.general |= XVID_LUMIMASKING; - if (xvidenc_qpel) { - fp->enc_frame.general |= XVID_QUARTERPEL; - fp->enc_frame.motion |= PMV_QUARTERPELREFINE16 | PMV_QUARTERPELREFINE8; - } - switch (xvidenc_vhq) { - case 4: // wide search - fp->enc_frame.motion |= EXTSEARCH_BITS | PMV_EXTSEARCH8; - case 3: // medium search - fp->enc_frame.motion |= HALFPELREFINE8_BITS | QUARTERPELREFINE8_BITS | CHECKPREDICTION_BITS; - case 2: // limited search - fp->enc_frame.motion |= HALFPELREFINE16_BITS | QUARTERPELREFINE16_BITS; - case 1: // mode decision - fp->enc_frame.general |= XVID_MODEDECISION_BITS; - break; - case 0: // off - break; - } - if (xvidenc_gmc) - fp->enc_frame.general |= XVID_GMC; - if (xvidenc_psnr) - fp->enc_frame.general |= XVID_EXTRASTATS; - if (xvidenc_chroma_me) - fp->enc_frame.motion |= PMV_CHROMA16 | PMV_CHROMA8; - if(xvidenc_reduced) - fp->enc_frame.general |= XVID_REDUCED; - if(xvidenc_hqac) - fp->enc_frame.general |= XVID_HQACPRED; - if (xvidenc_chroma_opt) - fp->enc_frame.general |= XVID_CHROMAOPT; -#else - if (xvidenc_greyscale) - fp->enc_frame.general |= XVID_GREYSCALE; -#endif - - switch (outfmt) { - case IMGFMT_YV12: - fp->enc_frame.colorspace = XVID_CSP_YV12; - break; - case IMGFMT_IYUV: case IMGFMT_I420: - fp->enc_frame.colorspace = XVID_CSP_I420; - break; - case IMGFMT_YUY2: - fp->enc_frame.colorspace = XVID_CSP_YUY2; - break; - case IMGFMT_UYVY: - fp->enc_frame.colorspace = XVID_CSP_UYVY; - break; - case IMGFMT_RGB24: case IMGFMT_BGR24: - fp->enc_frame.colorspace = XVID_CSP_RGB24; - break; - default: - mp_msg(MSGT_MENCODER,MSGL_ERR,"xvid: unsupported picture format (%s)!\n", - vo_format_name(outfmt)); - return 0; - } - fp->enc_frame.quant_intra_matrix = 0; - fp->enc_frame.quant_inter_matrix = 0; - - // initialize VBR engine - // ===================== - vbrSetDefaults(&fp->vbr_state); - if (xvidenc_min_key_interval < 0) - xvidenc_min_key_interval = fp->vbr_state.min_key_interval; - - // pass - if (xvidenc_pass == 0) { - if (xvidenc_fixed_quant >= 1) { - fp->vbr_state.mode = VBR_MODE_FIXED_QUANT; - fp->vbr_state.fixed_quant = xvidenc_fixed_quant; - } else - fp->vbr_state.mode = VBR_MODE_1PASS; - } - else if (xvidenc_pass == 1) - fp->vbr_state.mode = VBR_MODE_2PASS_1; - else if (xvidenc_pass == 2) - fp->vbr_state.mode = VBR_MODE_2PASS_2; - else - return -1; - - // misc - fp->vbr_state.fps = (double)enc_param.fbase / enc_param.fincr; - fp->vbr_state.filename = passtmpfile; - fp->vbr_state.desired_bitrate = enc_param.rc_bitrate; - fp->vbr_state.min_iquant = min_iq; - fp->vbr_state.max_iquant = max_iq; - fp->vbr_state.min_pquant = min_pq; - fp->vbr_state.max_pquant = max_pq; - if (xvidenc_keyframe_boost >= 0) - fp->vbr_state.keyframe_boost = xvidenc_keyframe_boost; - if (xvidenc_kfthreshold >= 0) - fp->vbr_state.kftreshold = xvidenc_kfthreshold; - if (xvidenc_kfreduction >= 0) - fp->vbr_state.kfreduction = xvidenc_kfreduction; - if (xvidenc_min_key_interval >= 0) - fp->vbr_state.min_key_interval = xvidenc_min_key_interval; - fp->vbr_state.max_key_interval = enc_param.max_key_interval; - fp->vbr_state.debug = xvidenc_debug; - - vbrInit(&fp->vbr_state); - -#ifdef XVID_API_UNSTABLE - fp->mux->decoder_delay = enc_param.max_bframes ? 1 : 0; -#endif - - return 1; -} - -#ifdef XVID_API_UNSTABLE -static double -sse_to_PSNR(double sse, double pixels) -{ - return sse == 0 ? INFINITY : 4.34294481903251827652 * (11.08252709031685229249 - log(sse/pixels)); - // 4.34294481903251827652 = 10/log(10) - // 11.08252709031685229249 = log(255*255) -} -#endif - -static void -uninit(struct vf_instance_s* vf) -{ - struct vf_priv_s *fp = vf->priv; - -#ifdef XVID_API_UNSTABLE - if (xvidenc_psnr) { - double p = (double)fp->pixels * (double)fp->nb_frames; - printf ("PSNR: Y:%2.2f, Cb:%2.2f, Cr:%2.2f, All:%2.2f\n", - sse_to_PSNR(xvid_error[0], p), - sse_to_PSNR(xvid_error[1], p/4), - sse_to_PSNR(xvid_error[2], p/4), - sse_to_PSNR(xvid_error[0] + xvid_error[1] + xvid_error[2], p*1.5)); - } -#endif - vbrFinish(&fp->vbr_state); -} - -static int -control(struct vf_instance_s* vf, int request, void* data) -{ - return CONTROL_UNKNOWN; -} - -static int -query_format(struct vf_instance_s* vf, unsigned int fmt) -{ - switch(fmt){ - case IMGFMT_YV12: case IMGFMT_IYUV: case IMGFMT_I420: - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; - case IMGFMT_YUY2: case IMGFMT_UYVY: - return VFCAP_CSP_SUPPORTED; - case IMGFMT_RGB24: case IMGFMT_BGR24: - return VFCAP_CSP_SUPPORTED | VFCAP_FLIPPED; - } - return 0; -} - -static int -put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) -{ - XVID_ENC_STATS enc_stats; - struct vf_priv_s *fp = vf->priv; - - fp->enc_frame.bitstream = fp->mux->buffer; - fp->enc_frame.length = -1 /* fp->mux->buffer_size */; - fp->enc_frame.image = mpi->planes[0]; -#ifdef XVID_API_UNSTABLE - fp->enc_frame.stride = mpi->stride[0]; -#endif - - // get quantizers & I/P decision from the VBR engine -#ifdef XVID_API_UNSTABLE - if (xvidenc_max_bframes >= 1) { - if (xvidenc_fixed_quant!=0) { - // hack, the internal VBR engine isn't fixed-quant aware - fp->enc_frame.quant = xvidenc_fixed_quant; - fp->enc_frame.intra = -1; - fp->enc_frame.bquant = (xvidenc_fixed_quant * xvidenc_bquant_ratio + xvidenc_bquant_offset) / 100; - } else - // use the internal VBR engine since the external one isn't bframe aware - fp->enc_frame.quant =0; - fp->enc_frame.intra =-1; - fp->enc_frame.bquant = 0; - } else { - fp->enc_frame.quant = vbrGetQuant(&fp->vbr_state); - fp->enc_frame.intra = vbrGetIntra(&fp->vbr_state); - } -#else - fp->enc_frame.quant = vbrGetQuant(&fp->vbr_state); - fp->enc_frame.intra = vbrGetIntra(&fp->vbr_state); -#endif - - // modulated quantizer type - if (xvidenc_mod_quant && xvidenc_pass == 2) { - fp->enc_frame.general |= (fp->enc_frame.quant < 4) ? XVID_MPEGQUANT : XVID_H263QUANT; - fp->enc_frame.general &= (fp->enc_frame.quant < 4) ? ~XVID_H263QUANT : ~XVID_MPEGQUANT; - } - - // encode frame - switch (xvid_encore(fp->enc_handle, XVID_ENC_ENCODE, &fp->enc_frame, &enc_stats)) { - case XVID_ERR_OK: - break; - case XVID_ERR_MEMORY: - mp_msg(MSGT_MENCODER, MSGL_ERR, "xvid: out of memory\n"); - break; - case XVID_ERR_FORMAT: - mp_msg(MSGT_MENCODER, MSGL_ERR, "xvid: bad format\n"); - break; - default: - mp_msg(MSGT_MENCODER, MSGL_ERR, "xvid: failure\n"); - break; - } - -#ifdef XVID_API_UNSTABLE - if (xvidenc_psnr) { - static FILE *fvstats = NULL; - char filename[20]; - - if (!fvstats) { - time_t today2; - struct tm *today; - today2 = time (NULL); - today = localtime (&today2); - sprintf (filename, "psnr_%02d%02d%02d.log", today->tm_hour, today->tm_min, today->tm_sec); - fvstats = fopen (filename,"w"); - if (!fvstats) { - perror ("fopen"); - xvidenc_psnr = 0; // disable block - } - } - - xvid_error[0] += enc_stats.sse_y; - xvid_error[1] += enc_stats.sse_u; - xvid_error[2] += enc_stats.sse_v; - - fprintf (fvstats, "%6d, %2d, %6d, %2.2f, %2.2f, %2.2f, %2.2f %c\n", - fp->nb_frames, - enc_stats.quant, - fp->enc_frame.length, - sse_to_PSNR (enc_stats.sse_y, fp->pixels), - sse_to_PSNR (enc_stats.sse_u, fp->pixels / 4), - sse_to_PSNR (enc_stats.sse_v, fp->pixels / 4), - sse_to_PSNR (enc_stats.sse_y + enc_stats.sse_u + enc_stats.sse_v, (double)fp->pixels * 1.5), - fp->enc_frame.intra == 0 ? 'P' : fp->enc_frame.intra == 1 ? 'I' : 'B' - ); - - fp->nb_frames++; - } -#endif - - // write output - if (fp->enc_frame.length > 0) - muxer_write_chunk(fp->mux, fp->enc_frame.length, fp->enc_frame.intra==1 ? 0x10 : 0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); - else - ++fp->mux->encoder_delay; - - // update the VBR engine - vbrUpdate(&fp->vbr_state, enc_stats.quant, fp->enc_frame.intra, - enc_stats.hlength, fp->enc_frame.length, enc_stats.kblks, enc_stats.mblks, enc_stats.ublks); - - return 1; -} - -//===========================================================================// - -static int -vf_open(vf_instance_t *vf, char* args) -{ - XVID_INIT_PARAM params = { 0, 0, 0}; - vf->config = config; - vf->default_caps = VFCAP_CONSTANT; - vf->control = control; - vf->uninit = uninit; - vf->query_format = query_format; - vf->put_image = put_image; - vf->priv = malloc(sizeof(struct vf_priv_s)); - memset(vf->priv, 0, sizeof(struct vf_priv_s)); - vf->priv->mux = (muxer_stream_t*)args; - - vf->priv->mux->bih = calloc(1, sizeof(BITMAPINFOHEADER)); - vf->priv->mux->bih->biSize = sizeof(BITMAPINFOHEADER); - vf->priv->mux->bih->biWidth = 0; - vf->priv->mux->bih->biHeight = 0; - vf->priv->mux->bih->biPlanes = 1; - vf->priv->mux->bih->biBitCount = 24; - vf->priv->mux->bih->biCompression = mmioFOURCC('X','V','I','D'); - - if (xvid_init(NULL, 0, ¶ms, NULL) != XVID_ERR_OK) { - mp_msg(MSGT_MENCODER,MSGL_ERR, "xvid: initialisation failure\n"); - abort(); - } - if (params.api_version != API_VERSION) { - mp_msg(MSGT_MENCODER,MSGL_ERR, "xvid: XviD library API version mismatch\n" - "\texpected %d.%d, got %d.%d, you should recompile MPlayer.\n", - API_VERSION >> 16, API_VERSION & 0xff, - params.api_version >> 16, params.api_version & 0xff); - abort(); - } - - return 1; -} - -vf_info_t ve_info_xvid = { - "XviD encoder", - "xvid", - "Kim Minh Kaplan & Rémi Guyomarch", - "for internal use by mencoder", - vf_open -}; - -//===========================================================================//