--- trunk/xvidcore/src/encoder.c 2002/07/21 03:49:47 324 +++ branches/dev-api-4/xvidcore/src/encoder.c 2003/04/02 20:43:56 966 @@ -26,20 +26,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ****************************************************************************/ - -/***************************************************************************** - * - * History - * - * 10.07.2002 added BFRAMES_DEC_DEBUG support - * MinChen - * 20.06.2002 bframe patch - * 08.05.2002 fix some problem in DEBUG mode; - * MinChen - * 14.04.2002 added FrameCodeB() - * - * $Id: encoder.c,v 1.60 2002-07-21 03:41:44 suxen_drol Exp $ + * $Id: encoder.c,v 1.95.2.18 2003-04-02 20:43:56 edgomez Exp $ * ****************************************************************************/ @@ -53,70 +40,34 @@ #include "global.h" #include "utils/timer.h" #include "image/image.h" -#ifdef BFRAMES #include "image/font.h" -#endif +#include "motion/sad.h" #include "motion/motion.h" #include "bitstream/cbp.h" #include "utils/mbfunctions.h" #include "bitstream/bitstream.h" #include "bitstream/mbcoding.h" -#include "utils/ratecontrol.h" #include "utils/emms.h" #include "bitstream/mbcoding.h" #include "quant/adapt_quant.h" #include "quant/quant_matrix.h" #include "utils/mem_align.h" -#ifdef _SMP -#include "motion/smp_motion_est.h" -#endif -/***************************************************************************** - * Local macros - ****************************************************************************/ - -#define ENC_CHECK(X) if(!(X)) return XVID_ERR_FORMAT -#define SWAP(A,B) { void * tmp = A; A = B; B = tmp; } - /***************************************************************************** * Local function prototypes ****************************************************************************/ static int FrameCodeI(Encoder * pEnc, - Bitstream * bs, - uint32_t * pBits); + Bitstream * bs); static int FrameCodeP(Encoder * pEnc, Bitstream * bs, - uint32_t * pBits, bool force_inter, bool vol_header); -#ifdef BFRAMES static void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, - Bitstream * bs, - uint32_t * pBits); -#endif - -/***************************************************************************** - * Local data - ****************************************************************************/ - -static int DQtab[4] = { - -1, -2, 1, 2 -}; - -static int iDQtab[5] = { - 1, 0, NO_CHANGE, 2, 3 -}; - - -static void __inline -image_null(IMAGE * image) -{ - image->y = image->u = image->v = NULL; -} + Bitstream * bs); /***************************************************************************** @@ -130,126 +81,143 @@ * and cleaning code. * * Returned values : - * - XVID_ERR_OK - no errors + * - 0 - no errors * - XVID_ERR_MEMORY - the libc could not allocate memory, the function * cleans the structure before exiting. * pParam->handle is also set to NULL. * ****************************************************************************/ -int -encoder_create(XVID_ENC_PARAM * pParam) +/* + * Simplify the "fincr/fbase" fraction +*/ +static void +simplify_time(int *inc, int *base) { - Encoder *pEnc; - int i; - - pParam->handle = NULL; - - ENC_CHECK(pParam); - - ENC_CHECK(pParam->width > 0 && pParam->width <= 1920); - ENC_CHECK(pParam->height > 0 && pParam->height <= 1280); - ENC_CHECK(!(pParam->width % 2)); - ENC_CHECK(!(pParam->height % 2)); - - /* Fps */ - - if (pParam->fincr <= 0 || pParam->fbase <= 0) { - pParam->fincr = 1; - pParam->fbase = 25; - } - - /* - * Simplify the "fincr/fbase" fraction - * (neccessary, since windows supplies us with huge numbers) - */ - - i = pParam->fincr; + /* common factor */ + int i = *inc; while (i > 1) { - if (pParam->fincr % i == 0 && pParam->fbase % i == 0) { - pParam->fincr /= i; - pParam->fbase /= i; - i = pParam->fincr; + if (*inc % i == 0 && *base % i == 0) { + *inc /= i; + *base /= i; + i = *inc; continue; } i--; } - if (pParam->fbase > 65535) { - float div = (float) pParam->fbase / 65535; - - pParam->fbase = (int) (pParam->fbase / div); - pParam->fincr = (int) (pParam->fincr / div); + /* if neccessary, round to 65535 accuracy */ + if (*base > 65535) { + float div = (float) *base / 65535; + *base = (int) (*base / div); + *inc = (int) (*inc / div); } +} - /* Bitrate allocator defaults */ - - if (pParam->rc_bitrate <= 0) - pParam->rc_bitrate = 900000; - - if (pParam->rc_reaction_delay_factor <= 0) - pParam->rc_reaction_delay_factor = 16; - - if (pParam->rc_averaging_period <= 0) - pParam->rc_averaging_period = 100; - - if (pParam->rc_buffer <= 0) - pParam->rc_buffer = 100; - - /* Max and min quantizers */ - - if ((pParam->min_quantizer <= 0) || (pParam->min_quantizer > 31)) - pParam->min_quantizer = 1; - if ((pParam->max_quantizer <= 0) || (pParam->max_quantizer > 31)) - pParam->max_quantizer = 31; +int +enc_create(xvid_enc_create_t * create) +{ + Encoder *pEnc; + int n; - if (pParam->max_quantizer < pParam->min_quantizer) - pParam->max_quantizer = pParam->min_quantizer; + if (XVID_MAJOR(create->version) != 1) /* v1.x.x */ + return XVID_ERR_VERSION; - /* 1 keyframe each 10 seconds */ + if (create->width%2 || create->height%2) + return XVID_ERR_FAIL; - if (pParam->max_key_interval == 0) - pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase; + /* allocate encoder struct */ pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE); if (pEnc == NULL) return XVID_ERR_MEMORY; - - /* Zero the Encoder Structure */ - memset(pEnc, 0, sizeof(Encoder)); - /* Fill members of Encoder structure */ - - pEnc->mbParam.width = pParam->width; - pEnc->mbParam.height = pParam->height; + /* global flags */ + pEnc->mbParam.global_flags = create->global; + /* width, height */ + pEnc->mbParam.width = create->width; + pEnc->mbParam.height = create->height; pEnc->mbParam.mb_width = (pEnc->mbParam.width + 15) / 16; pEnc->mbParam.mb_height = (pEnc->mbParam.height + 15) / 16; - pEnc->mbParam.edged_width = 16 * pEnc->mbParam.mb_width + 2 * EDGE_SIZE; pEnc->mbParam.edged_height = 16 * pEnc->mbParam.mb_height + 2 * EDGE_SIZE; - pEnc->mbParam.fbase = pParam->fbase; - pEnc->mbParam.fincr = pParam->fincr; - - pEnc->mbParam.m_quant_type = H263_QUANT; + /* framerate */ + pEnc->mbParam.fincr = MAX(create->fincr, 0); + pEnc->mbParam.fbase = create->fincr <= 0 ? 25 : create->fbase; + if (pEnc->mbParam.fincr>0) + simplify_time(&pEnc->mbParam.fincr, &pEnc->mbParam.fbase); + + /* plugin */ + pEnc->num_plugins = create->num_plugins; + pEnc->plugins = xvid_malloc(sizeof(xvid_enc_plugin_t) * pEnc->num_plugins, CACHE_LINE); + if (pEnc->plugins == NULL) + goto xvid_err_memory0; + + for (n=0; nnum_plugins;n++) { + xvid_plg_create_t pcreate; + xvid_plg_info_t pinfo; + + memset(&pinfo, 0, sizeof(xvid_plg_info_t)); + pinfo.version = XVID_VERSION; + if (create->plugins[n].func(0, XVID_PLG_INFO, &pinfo, 0) >= 0) { + pEnc->mbParam.plugin_flags |= pinfo.flags; + } + + memset(&pcreate, 0, sizeof(xvid_plg_create_t)); + pcreate.version = XVID_VERSION; + pcreate.width = pEnc->mbParam.width; + pcreate.height = pEnc->mbParam.height; + pcreate.fincr = pEnc->mbParam.fincr; + pcreate.fbase = pEnc->mbParam.fbase; + pcreate.param = create->plugins[n].param; + + pEnc->plugins[n].func = NULL; /* disable plugins that fail */ + if (create->plugins[n].func(0, XVID_PLG_CREATE, &pcreate, &pEnc->plugins[n].param) >= 0) { + pEnc->plugins[n].func = create->plugins[n].func; + } + } + + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_EXTRASTATS_ENABLE) || + (pEnc->mbParam.plugin_flags & XVID_REQPSNR)) { + pEnc->mbParam.plugin_flags |= XVID_REQORIGINAL; /* psnr calculation requires the original */ + } + + /* temp dquants */ + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + pEnc->temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * + pEnc->mbParam.mb_height * sizeof(int), CACHE_LINE); + } + /* XXX: error checking */ + + /* bframes */ + pEnc->mbParam.max_bframes = MAX(create->max_bframes, 0); + pEnc->mbParam.bquant_ratio = MAX(create->bquant_ratio, 0); + pEnc->mbParam.bquant_offset = create->bquant_offset; + + /* frame drop ratio */ + pEnc->mbParam.frame_drop_ratio = MAX(create->frame_drop_ratio, 0); -#ifdef _SMP - pEnc->mbParam.num_threads = MIN(pParam->num_threads, MAXNUMTHREADS); -#endif + /* max keyframe interval */ + pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ? + 10 * pEnc->mbParam.fbase / pEnc->mbParam.fincr : create->max_key_interval; - pEnc->sStat.fMvPrevSigma = -1; + /* Bitrate allocator defaults - /* Fill rate control parameters */ + if ((create->min_quantizer <= 0) || (create->min_quantizer > 31)) + create->min_quantizer = 1; - pEnc->bitrate = pParam->rc_bitrate; + if ((create->max_quantizer <= 0) || (create->max_quantizer > 31)) + create->max_quantizer = 31; - pEnc->iFrameNum = 0; - pEnc->iMaxKeyInterval = pParam->max_key_interval; + if (create->max_quantizer < create->min_quantizer) + create->max_quantizer = create->min_quantizer; */ + - /* try to allocate frame memory */ + /* allocate working frame-image memory */ pEnc->current = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE); pEnc->reference = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE); @@ -257,7 +225,7 @@ if (pEnc->current == NULL || pEnc->reference == NULL) goto xvid_err_memory1; - /* try to allocate mb memory */ + /* allocate macroblock memory */ pEnc->current->mbs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * @@ -269,16 +237,17 @@ if (pEnc->current->mbs == NULL || pEnc->reference->mbs == NULL) goto xvid_err_memory2; - /* try to allocate image memory */ + /* allocate interpolation image memory */ + + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + image_null(&pEnc->sOriginal); + image_null(&pEnc->sOriginal2); + } -#ifdef _DEBUG_PSNR - image_null(&pEnc->sOriginal); -#endif -#ifdef BFRAMES image_null(&pEnc->f_refh); image_null(&pEnc->f_refv); image_null(&pEnc->f_refhv); -#endif + image_null(&pEnc->current->image); image_null(&pEnc->reference->image); image_null(&pEnc->vInterH); @@ -287,13 +256,18 @@ image_null(&pEnc->vInterHV); image_null(&pEnc->vInterHVf); -#ifdef _DEBUG_PSNR - if (image_create - (&pEnc->sOriginal, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height) < 0) - goto xvid_err_memory3; -#endif -#ifdef BFRAMES + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + if (image_create + (&pEnc->sOriginal, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height) < 0) + goto xvid_err_memory3; + + if (image_create + (&pEnc->sOriginal2, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height) < 0) + goto xvid_err_memory3; + } + if (image_create (&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) @@ -306,7 +280,7 @@ (&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) goto xvid_err_memory3; -#endif + if (image_create (&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) @@ -336,19 +310,23 @@ pEnc->mbParam.edged_height) < 0) goto xvid_err_memory3; +/* Create full bitplane for GMC, this might be wasteful */ + if (image_create + (&pEnc->vGMC, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height) < 0) + goto xvid_err_memory3; + + /* init bframe image buffers */ + pEnc->bframenum_head = 0; + pEnc->bframenum_tail = 0; + pEnc->flush_bframes = 0; + pEnc->closed_bframenum = -1; /* B Frames specific init */ -#ifdef BFRAMES - - pEnc->global = pParam->global; - pEnc->mbParam.max_bframes = pParam->max_bframes; - pEnc->bquant_ratio = pParam->bquant_ratio; - pEnc->frame_drop_ratio = pParam->frame_drop_ratio; pEnc->bframes = NULL; if (pEnc->mbParam.max_bframes > 0) { - int n; pEnc->bframes = xvid_malloc(pEnc->mbParam.max_bframes * sizeof(FRAMEINFO *), @@ -384,72 +362,61 @@ } } - pEnc->bframenum_head = 0; - pEnc->bframenum_tail = 0; - pEnc->flush_bframes = 0; - pEnc->bframenum_dx50bvop = -1; - - pEnc->queue = NULL; - - - if (pEnc->mbParam.max_bframes > 0) { - int n; + /* init incoming frame queue */ + pEnc->queue_head = 0; + pEnc->queue_tail = 0; + pEnc->queue_size = 0; - pEnc->queue = - xvid_malloc(pEnc->mbParam.max_bframes * sizeof(IMAGE), - CACHE_LINE); + pEnc->queue = + xvid_malloc((pEnc->mbParam.max_bframes+1) * sizeof(QUEUEINFO), + CACHE_LINE); - if (pEnc->queue == NULL) - goto xvid_err_memory4; + if (pEnc->queue == NULL) + goto xvid_err_memory4; - for (n = 0; n < pEnc->mbParam.max_bframes; n++) - image_null(&pEnc->queue[n]); + for (n = 0; n < pEnc->mbParam.max_bframes+1; n++) + image_null(&pEnc->queue[n].image); - for (n = 0; n < pEnc->mbParam.max_bframes; n++) { - if (image_create - (&pEnc->queue[n], pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height) < 0) - goto xvid_err_memory5; + + for (n = 0; n < pEnc->mbParam.max_bframes+1; n++) + { + if (image_create + (&pEnc->queue[n].image, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height) < 0) + goto xvid_err_memory5; - } } - pEnc->queue_head = 0; - pEnc->queue_tail = 0; - pEnc->queue_size = 0; + /* timestamp stuff */ - pEnc->mbParam.m_seconds = 0; - pEnc->mbParam.m_ticks = 0; + pEnc->mbParam.m_stamp = 0; pEnc->m_framenum = 0; - pEnc->last_pframe = 1; -#endif + pEnc->current->stamp = 0; + pEnc->reference->stamp = 0; - pParam->handle = (void *) pEnc; + /* other stuff */ - if (pParam->rc_bitrate) { - RateControlInit(&pEnc->rate_control, pParam->rc_bitrate, - pParam->rc_reaction_delay_factor, - pParam->rc_averaging_period, pParam->rc_buffer, - pParam->fbase * 1000 / pParam->fincr, - pParam->max_quantizer, pParam->min_quantizer); - } + pEnc->iFrameNum = 0; + pEnc->fMvPrevSigma = -1; + + create->handle = (void *) pEnc; init_timer(); - return XVID_ERR_OK; + return 0; /* ok */ /* * We handle all XVID_ERR_MEMORY here, this makes the code lighter */ -#ifdef BFRAMES - xvid_err_memory5: + xvid_err_memory5: if (pEnc->mbParam.max_bframes > 0) { + int i; - for (i = 0; i < pEnc->mbParam.max_bframes; i++) { - image_destroy(&pEnc->queue[i], pEnc->mbParam.edged_width, + for (i = 0; i < pEnc->mbParam.max_bframes+1; i++) { + image_destroy(&pEnc->queue[i].image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); } xvid_free(pEnc->queue); @@ -458,6 +425,7 @@ xvid_err_memory4: if (pEnc->mbParam.max_bframes > 0) { + int i; for (i = 0; i < pEnc->mbParam.max_bframes; i++) { @@ -476,22 +444,21 @@ xvid_free(pEnc->bframes); } -#endif - xvid_err_memory3: -#ifdef _DEBUG_PSNR - image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height); -#endif -#ifdef BFRAMES + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + image_destroy(&pEnc->sOriginal2, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + } + image_destroy(&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); -#endif image_destroy(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); @@ -508,6 +475,11 @@ image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); +/* destroy GMC image */ + image_destroy(&pEnc->vGMC, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + + xvid_err_memory2: xvid_free(pEnc->current->mbs); xvid_free(pEnc->reference->mbs); @@ -515,9 +487,22 @@ xvid_err_memory1: xvid_free(pEnc->current); xvid_free(pEnc->reference); + + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + xvid_free(pEnc->temp_dquants); + } + + xvid_err_memory0: + for (n=0; nnum_plugins;n++) { + if (pEnc->plugins[n].func) { + pEnc->plugins[n].func(pEnc->plugins[n].param, XVID_PLG_DESTROY, 0, 0); + } + } + xvid_free(pEnc->plugins); + xvid_free(pEnc); - pParam->handle = NULL; + create->handle = NULL; return XVID_ERR_MEMORY; } @@ -526,29 +511,24 @@ * Encoder destruction * * This function destroy the entire encoder structure created by a previous - * successful encoder_create call. + * successful enc_create call. * * Returned values (for now only one returned value) : - * - XVID_ERR_OK - no errors + * - 0 - no errors * ****************************************************************************/ int -encoder_destroy(Encoder * pEnc) +enc_destroy(Encoder * pEnc) { -#ifdef BFRAMES int i; -#endif - ENC_CHECK(pEnc); - /* B Frames specific */ -#ifdef BFRAMES if (pEnc->mbParam.max_bframes > 0) { - for (i = 0; i < pEnc->mbParam.max_bframes; i++) { + for (i = 0; i < pEnc->mbParam.max_bframes+1; i++) { - image_destroy(&pEnc->queue[i], pEnc->mbParam.edged_width, + image_destroy(&pEnc->queue[i].image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); } xvid_free(pEnc->queue); @@ -573,7 +553,6 @@ xvid_free(pEnc->bframes); } -#endif /* All images, reference, current etc ... */ @@ -591,18 +570,20 @@ pEnc->mbParam.edged_height); image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); -#ifdef BFRAMES + image_destroy(&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); -#endif -#ifdef _DEBUG_PSNR - image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height); -#endif + + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + image_destroy(&pEnc->sOriginal2, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + } /* Encoder structure */ @@ -611,647 +592,668 @@ xvid_free(pEnc->reference->mbs); xvid_free(pEnc->reference); + + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + xvid_free(pEnc->temp_dquants); + } + + + if (pEnc->num_plugins>0) + { + xvid_plg_destroy_t pdestroy; + memset(&pdestroy, 0, sizeof(xvid_plg_destroy_t)); + + pdestroy.version = XVID_VERSION; + pdestroy.num_frames = pEnc->m_framenum; + + for (i=0; inum_plugins;i++) { + if (pEnc->plugins[i].func) { + pEnc->plugins[i].func(pEnc->plugins[i].param, XVID_PLG_DESTROY, &pdestroy, 0); + } + } + xvid_free(pEnc->plugins); + } xvid_free(pEnc); - return XVID_ERR_OK; + return 0; /* ok */ } -#ifdef BFRAMES -void inc_frame_num(Encoder * pEnc) +/* + call the plugins + */ + +static void call_plugins(Encoder * pEnc, FRAMEINFO * frame, IMAGE * original, + int opt, int * type, int * quant, xvid_enc_stats_t * stats) { - pEnc->iFrameNum++; - pEnc->mbParam.m_ticks += pEnc->mbParam.fincr; + unsigned int i, j; + xvid_plg_data_t data; + + /* set data struct */ - pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase; - pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase; + memset(&data, 0, sizeof(xvid_plg_data_t)); + data.version = XVID_VERSION; + + data.width = pEnc->mbParam.width; + data.height = pEnc->mbParam.height; + data.mb_width = pEnc->mbParam.mb_width; + data.mb_height = pEnc->mbParam.mb_height; + data.fincr = frame->fincr; + data.fbase = pEnc->mbParam.fbase; + + data.reference.csp = XVID_CSP_USER; + data.reference.plane[0] = pEnc->reference->image.y; + data.reference.plane[1] = pEnc->reference->image.u; + data.reference.plane[2] = pEnc->reference->image.v; + data.reference.stride[0] = pEnc->mbParam.edged_width; + data.reference.stride[1] = pEnc->mbParam.edged_width/2; + data.reference.stride[2] = pEnc->mbParam.edged_width/2; + + data.current.csp = XVID_CSP_USER; + data.current.plane[0] = frame->image.y; + data.current.plane[1] = frame->image.u; + data.current.plane[2] = frame->image.v; + data.current.stride[0] = pEnc->mbParam.edged_width; + data.current.stride[1] = pEnc->mbParam.edged_width/2; + data.current.stride[2] = pEnc->mbParam.edged_width/2; + + data.frame_num = frame->frame_num; + + if (opt == XVID_PLG_BEFORE) { + data.type = XVID_TYPE_AUTO; + data.quant = 2; + + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + data.dquant = pEnc->temp_dquants; + data.dquant_stride = pEnc->mbParam.mb_width; + memset(data.dquant, 0, data.mb_width*data.mb_height); + } + + /* todo: [vol,vop,motion]_flags*/ + + } else { // XVID_PLG_AFTER + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + data.original.csp = XVID_CSP_USER; + data.original.plane[0] = original->y; + data.original.plane[1] = original->u; + data.original.plane[2] = original->v; + data.original.stride[0] = pEnc->mbParam.edged_width; + data.original.stride[1] = pEnc->mbParam.edged_width/2; + data.original.stride[2] = pEnc->mbParam.edged_width/2; + } + + if ((frame->vol_flags & XVID_VOL_EXTRASTATS) || + (pEnc->mbParam.plugin_flags & XVID_REQPSNR)) { + + data.sse_y = + plane_sse( original->y, frame->image.y, + pEnc->mbParam.edged_width, pEnc->mbParam.width, + pEnc->mbParam.height); + + data.sse_u = + plane_sse( original->u, frame->image.u, + pEnc->mbParam.edged_width/2, pEnc->mbParam.width/2, + pEnc->mbParam.height/2); + + data.sse_v = + plane_sse( original->v, frame->image.v, + pEnc->mbParam.edged_width/2, pEnc->mbParam.width/2, + pEnc->mbParam.height/2); + } + + data.type = coding2type(frame->coding_type); + data.quant = frame->quant; + + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + data.dquant = pEnc->temp_dquants; + data.dquant_stride = pEnc->mbParam.mb_width; + + for (j=0; jmbParam.mb_height; j++) + for (i=0; imbParam.mb_width; i++) { + data.dquant[j*data.dquant_stride + i] = frame->mbs[j*pEnc->mbParam.mb_width + i].dquant;; + } + } + + data.vol_flags = frame->vol_flags; + data.vop_flags = frame->vop_flags; + data.motion_flags = frame->motion_flags; + + data.length = frame->length; + data.kblks = frame->sStat.kblks; + data.mblks = frame->sStat.mblks; + data.ublks = frame->sStat.ublks; + + if (stats) { + stats->type = coding2type(frame->coding_type); + stats->quant = frame->quant; + stats->vol_flags = frame->vol_flags; + stats->vop_flags = frame->vop_flags; + stats->length = frame->length; + stats->hlength = frame->length - (frame->sStat.iTextBits / 8); + stats->kblks = frame->sStat.kblks; + stats->mblks = frame->sStat.mblks; + stats->ublks = frame->sStat.ublks; + stats->sse_y = data.sse_y; + stats->sse_u = data.sse_u; + stats->sse_v = data.sse_v; + } + } + + /* call plugins */ + for (i=0; inum_plugins;i++) { + emms(); + if (pEnc->plugins[i].func) { + if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, 0) < 0) { + continue; + } + } + } + emms(); + + /* copy modified values back into frame*/ + if (opt == XVID_PLG_BEFORE) { + *type = data.type; + *quant = data.quant; + + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + for (j=0; jmbParam.mb_height; j++) + for (i=0; imbParam.mb_width; i++) { + frame->mbs[j*pEnc->mbParam.mb_width + i].dquant = data.dquant[j*data.mb_width + i]; + } + }else{ + for (j=0; jmbParam.mb_height; j++) + for (i=0; imbParam.mb_width; i++) { + frame->mbs[j*pEnc->mbParam.mb_width + i].dquant = 0; + } + } + /* todo: [vol,vop,motion]_flags*/ + } } -#endif -#ifdef BFRAMES -void queue_image(Encoder * pEnc, XVID_ENC_FRAME * pFrame) + + +static __inline void inc_frame_num(Encoder * pEnc) { - if (pEnc->queue_size >= pEnc->mbParam.max_bframes) - { - DPRINTF(DPRINTF_DEBUG,"FATAL: QUEUE FULL"); - return; - } + pEnc->current->frame_num = pEnc->m_framenum; + pEnc->current->stamp = pEnc->mbParam.m_stamp; /* first frame is zero */ + + pEnc->mbParam.m_stamp += pEnc->current->fincr; + pEnc->m_framenum++; /* debug ticker */ +} - DPRINTF(DPRINTF_DEBUG,"*** QUEUE bf: head=%i tail=%i queue: head=%i tail=%i size=%i", - pEnc->bframenum_head, pEnc->bframenum_tail, - pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); +static __inline void dec_frame_num(Encoder * pEnc) +{ + pEnc->mbParam.m_stamp -= pEnc->mbParam.fincr; + pEnc->m_framenum--; /* debug ticker */ +} - start_timer(); - if (image_input - (&pEnc->queue[pEnc->queue_tail], pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace)) - return; - stop_conv_timer(); - pEnc->queue_size++; - pEnc->queue_tail = (pEnc->queue_tail + 1) % pEnc->mbParam.max_bframes; +static __inline void +set_timecodes(FRAMEINFO* pCur,FRAMEINFO *pRef, int32_t time_base) +{ + + pCur->ticks = (int32_t)pCur->stamp % time_base; + pCur->seconds = ((int32_t)pCur->stamp / time_base) - ((int32_t)pRef->stamp / time_base) ; + + /* HEAVY DEBUG OUTPUT remove when timecodes prove to be stable */ + +/* fprintf(stderr,"WriteVop: %d - %d \n", + ((int32_t)pCur->stamp / time_base), ((int32_t)pRef->stamp / time_base)); + fprintf(stderr,"set_timecodes: VOP %1d stamp=%lld ref_stamp=%lld base=%d\n", + pCur->coding_type, pCur->stamp, pRef->stamp, time_base); + fprintf(stderr,"set_timecodes: VOP %1d seconds=%d ticks=%d (ref-sec=%d ref-tick=%d)\n", + pCur->coding_type, pCur->seconds, pCur->ticks, pRef->seconds, pRef->ticks); + +*/ } -#endif -#ifdef BFRAMES + /***************************************************************************** * IPB frame encoder entry point * * Returned values : - * - XVID_ERR_OK - no errors - * - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong - * format + * - >0 - output bytes + * - 0 - no output + * - XVID_ERR_VERSION - wrong version passed to core + * - XVID_ERR_END - End of stream reached before end of coding + * - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong + * format ****************************************************************************/ + int -encoder_encode_bframes(Encoder * pEnc, - XVID_ENC_FRAME * pFrame, - XVID_ENC_STATS * pResult) +enc_encode(Encoder * pEnc, + xvid_enc_frame_t * xFrame, + xvid_enc_stats_t * stats) { - uint16_t x, y; + xvid_enc_frame_t * frame; + int type; Bitstream bs; - uint32_t bits; - int input_valid = 1; - -#ifdef _DEBUG_PSNR - float psnr; - char temp[128]; -#endif + if (XVID_MAJOR(xFrame->version) != 1 || (stats && XVID_MAJOR(stats->version) != 1)) /* v1.x.x */ + return XVID_ERR_VERSION; - ENC_CHECK(pEnc); - ENC_CHECK(pFrame); - ENC_CHECK(pFrame->image); + xFrame->out_flags = 0; start_global_timer(); + BitstreamInit(&bs, xFrame->bitstream, 0); - BitstreamInit(&bs, pFrame->bitstream, 0); -ipvop_loop: - - /* - * bframe "flush" code - */ - - if ((pFrame->image == NULL || pEnc->flush_bframes) - && (pEnc->bframenum_head < pEnc->bframenum_tail)) { - - if (pEnc->flush_bframes == 0) { - /* - * we have reached the end of stream without getting - * a future reference frame... so encode last final - * frame as a pframe - */ - - DPRINTF(DPRINTF_DEBUG,"*** BFRAME (final frame) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", - pEnc->bframenum_head, pEnc->bframenum_tail, - pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - - pEnc->bframenum_tail--; - SWAP(pEnc->current, pEnc->reference); + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * enqueue image to the encoding-queue + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); + if (xFrame->input.csp != XVID_CSP_NULL) + { + QUEUEINFO * q = &pEnc->queue[pEnc->queue_tail]; - FrameCodeP(pEnc, &bs, &bits, 1, 0); + start_timer(); + if (image_input + (&q->image, pEnc->mbParam.width, pEnc->mbParam.height, + pEnc->mbParam.edged_width, (uint8_t**)xFrame->input.plane, xFrame->input.stride, + xFrame->input.csp, xFrame->vol_flags & XVID_VOL_INTERLACING)) + { + emms(); + return XVID_ERR_FORMAT; + } + stop_conv_timer(); - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - pFrame->intra = 0; + if ((xFrame->vop_flags & XVID_VOP_CHROMAOPT)) { + image_chroma_optimize(&q->image, + pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width); + } + + q->frame = *xFrame; - return XVID_ERR_OK; + if (xFrame->quant_intra_matrix) + { + memcpy(q->quant_intra_matrix, xFrame->quant_intra_matrix, sizeof(xFrame->quant_intra_matrix)); + q->frame.quant_intra_matrix = q->quant_intra_matrix; } - - DPRINTF(DPRINTF_DEBUG,"*** BFRAME (flush) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", - pEnc->bframenum_head, pEnc->bframenum_tail, - pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); + if (xFrame->quant_inter_matrix) + { + memcpy(q->quant_inter_matrix, xFrame->quant_inter_matrix, sizeof(xFrame->quant_inter_matrix)); + q->frame.quant_inter_matrix = q->quant_inter_matrix; + } - FrameCodeB(pEnc, pEnc->bframes[pEnc->bframenum_head], &bs, &bits); - pEnc->bframenum_head++; + pEnc->queue_tail = (pEnc->queue_tail + 1) % (pEnc->mbParam.max_bframes+1); + pEnc->queue_size++; + } - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - pFrame->intra = 0; - if (input_valid) - queue_image(pEnc, pFrame); + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * bframe flush code + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - return XVID_ERR_OK; - } +repeat: - if (pEnc->bframenum_head > 0) { - pEnc->bframenum_head = pEnc->bframenum_tail = 0; + if (pEnc->flush_bframes) + { + if (pEnc->bframenum_head < pEnc->bframenum_tail) { + + DPRINTF(DPRINTF_DEBUG,"*** BFRAME (flush) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + pEnc->bframenum_head, pEnc->bframenum_tail, + pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); + + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + image_copy(&pEnc->sOriginal2, &pEnc->bframes[pEnc->bframenum_head]->image, + pEnc->mbParam.edged_width, pEnc->mbParam.height); + } - if ((pEnc->global & XVID_GLOBAL_PACKED)) { + FrameCodeB(pEnc, pEnc->bframes[pEnc->bframenum_head], &bs); + call_plugins(pEnc, pEnc->bframes[pEnc->bframenum_head], &pEnc->sOriginal2, XVID_PLG_AFTER, 0, 0, stats); + pEnc->bframenum_head++; + + goto done; + } + + /* write an empty marker to the bitstream. + + for divx5 decoder compatibility, this marker must consist + of a not-coded p-vop, with a time_base of zero, and time_increment + indentical to the future-referece frame. + */ + + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED && pEnc->bframenum_tail > 0)) { + int tmp; + int bits; DPRINTF(DPRINTF_DEBUG,"*** EMPTY bf: head=%i tail=%i queue: head=%i tail=%i size=%i", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); + bits = BitstreamPos(&bs); + + tmp = pEnc->current->seconds; + pEnc->current->seconds = 0; /* force time_base = 0 */ + BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); BitstreamPad(&bs); - BitstreamPutBits(&bs, 0x7f, 8); + pEnc->current->seconds = tmp; - pFrame->length = BitstreamLength(&bs); - pFrame->intra = 0; + /* add the not-coded length to the reference frame size */ + pEnc->current->length += (BitstreamPos(&bs) - bits) / 8; + call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats); - if (input_valid) - queue_image(pEnc, pFrame); + /* flush complete: reset counters */ + pEnc->flush_bframes = 0; + pEnc->bframenum_head = pEnc->bframenum_tail = 0; + goto done; - return XVID_ERR_OK; } - } + /* flush complete: reset counters */ + pEnc->flush_bframes = 0; + pEnc->bframenum_head = pEnc->bframenum_tail = 0; + } -bvop_loop: + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * dequeue frame from the encoding queue + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - if (pEnc->bframenum_dx50bvop != -1) + if (pEnc->queue_size == 0) /* empty */ { + if (xFrame->input.csp == XVID_CSP_NULL) /* no futher input */ + { - SWAP(pEnc->current, pEnc->reference); - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_dx50bvop]); + if (!(pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->mbParam.max_bframes > 0) { + call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats); + } - if ((pEnc->global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "DX50 IVOP"); - } + /* if the very last frame is to be b-vop, we must change it to a p-vop */ + if (pEnc->bframenum_tail > 0) + { - if (input_valid) - { - queue_image(pEnc, pFrame); - input_valid = 0; - } + SWAP(FRAMEINFO*, pEnc->current, pEnc->reference); + pEnc->bframenum_tail--; + SWAP(FRAMEINFO*, pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); - } else if (input_valid) { + /* convert B-VOP to P-VOP */ + pEnc->current->quant = ((pEnc->current->quant*100) - pEnc->mbParam.bquant_offset) / pEnc->mbParam.bquant_ratio; - SWAP(pEnc->current, pEnc->reference); + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + image_copy(&pEnc->sOriginal, &pEnc->current->image, + pEnc->mbParam.edged_width, pEnc->mbParam.height); + } - start_timer(); - if (image_input - (&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace)) - return XVID_ERR_FORMAT; - stop_conv_timer(); + FrameCodeP(pEnc, &bs, 1, 0); - // queue input frame, and dequue next image - if (pEnc->queue_size > 0) - { - image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_tail]); - if (pEnc->queue_head != pEnc->queue_tail) - { - image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_head]); + goto done_flush; } - pEnc->queue_head = (pEnc->queue_head + 1) % pEnc->mbParam.max_bframes; - pEnc->queue_tail = (pEnc->queue_tail + 1) % pEnc->mbParam.max_bframes; + + emms(); + return XVID_ERR_END; /* end of stream reached */ } + goto done; /* nothing to encode yet; encoder lag */ + } - } else if (pEnc->queue_size > 0) { - - SWAP(pEnc->current, pEnc->reference); + // the current FRAME becomes the reference + SWAP(FRAMEINFO*, pEnc->current, pEnc->reference); - image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_head]); - pEnc->queue_head = (pEnc->queue_head + 1) % pEnc->mbParam.max_bframes; - pEnc->queue_size--; + // remove frame from encoding-queue (head), and move it into the current + image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_head].image); + frame = &pEnc->queue[pEnc->queue_head].frame; + pEnc->queue_head = (pEnc->queue_head + 1) % (pEnc->mbParam.max_bframes+1); + pEnc->queue_size--; - } else if (BitstreamPos(&bs) == 0) { - DPRINTF(DPRINTF_DEBUG,"*** SKIP bf: head=%i tail=%i queue: head=%i tail=%i size=%i", - pEnc->bframenum_head, pEnc->bframenum_tail, - pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * init pEnc->current fields + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - pFrame->intra = 0; + pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr; + inc_frame_num(pEnc); + pEnc->current->vol_flags = pEnc->mbParam.vol_flags; + pEnc->current->vop_flags = frame->vop_flags; + pEnc->current->motion_flags = frame->motion; + pEnc->current->fcode = pEnc->mbParam.m_fcode; + pEnc->current->bcode = pEnc->mbParam.m_fcode; - BitstreamPutBits(&bs, 0x7f, 8); - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - - return XVID_ERR_OK; - } else { + if ((xFrame->vop_flags & XVID_VOP_CHROMAOPT)) { + image_chroma_optimize(&pEnc->current->image, + pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width); + } + + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * frame type & quant selection + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ + + call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, &pEnc->current->quant, stats); + + if (frame->type > 0) + type = frame->type; + + if (frame->quant > 0) + pEnc->current->quant = frame->quant; - pFrame->length = BitstreamLength(&bs); - return XVID_ERR_OK; + if (type > 0){ /* XVID_TYPE_?VOP */ + type = type2coding(type); /* convert XVID_TYPE_?VOP to bitstream coding type */ + } else{ /* XVID_TYPE_AUTO */ + if (pEnc->iFrameNum == 0 || (pEnc->mbParam.iMaxKeyInterval > 0 && pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval)){ + pEnc->iFrameNum = 0; + type = I_VOP; + }else{ + type = MEanalysis(&pEnc->reference->image, pEnc->current, + &pEnc->mbParam, pEnc->mbParam.iMaxKeyInterval, + pEnc->iFrameNum, pEnc->bframenum_tail, xFrame->bframe_threshold); + + if (type == B_VOP && !(pEnc->current->vop_flags & XVID_VOP_DYNAMIC_BFRAMES)) { + type = P_VOP; /* disable dynamic bframes */ + } + } } - pEnc->flush_bframes = 0; + /* bframes buffer overflow check */ + if (type != I_VOP) { + if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { + type = P_VOP; + }else{ + type = B_VOP; + } + } + + pEnc->iFrameNum++; + + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { + image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 5, + "%i st:%i if:%i", pEnc->current->frame_num, pEnc->current->stamp, pEnc->iFrameNum); + } /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - * Well there was a separation here so i put it in ANSI C - * comment style :-) + * encode this frame as a b-vop + * (we dont encode here, rather we store the frame in the bframes queue, to be encoded later) * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ + if (type == B_VOP) { + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { + image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "BVOP"); + } - emms(); + if (frame->quant < 1) { + pEnc->current->quant = ((((pEnc->reference->quant + pEnc->current->quant) * + pEnc->mbParam.bquant_ratio) / 2) + pEnc->mbParam.bquant_offset)/100; - // only inc frame num, adapt quant, etc. if we havent seen it before - if (pEnc->bframenum_dx50bvop < 0 ) - { - if (pFrame->quant == 0) - pEnc->current->quant = RateControlGetQ(&pEnc->rate_control, 0); - else - pEnc->current->quant = pFrame->quant; + } else { + pEnc->current->quant = frame->quant; + } if (pEnc->current->quant < 1) pEnc->current->quant = 1; + else if (pEnc->current->quant > 31) + pEnc->current->quant = 31; + + DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i queue: head=%i tail=%i size=%i quant=%i", + pEnc->bframenum_head, pEnc->bframenum_tail, + pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size,pEnc->current->quant); - if (pEnc->current->quant > 31) - pEnc->current->quant = 31; - - pEnc->current->global_flags = pFrame->general; - pEnc->current->motion_flags = pFrame->motion; + /* store frame into bframe buffer & swap ref back to current */ + SWAP(FRAMEINFO*, pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); + SWAP(FRAMEINFO*, pEnc->current, pEnc->reference); - /* ToDo : dynamic fcode (in both directions) */ - pEnc->current->fcode = pEnc->mbParam.m_fcode; - pEnc->current->bcode = pEnc->mbParam.m_fcode; + pEnc->bframenum_tail++; - pEnc->current->seconds = pEnc->mbParam.m_seconds; - pEnc->current->ticks = pEnc->mbParam.m_ticks; + goto repeat; + } - inc_frame_num(pEnc); + /* for unpacked bframes, output the stats for the last encoded frame */ + if (!(pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) + { + if (pEnc->current->stamp > 0) { + call_plugins(pEnc, pEnc->reference, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats); + } + else + stats->type = XVID_TYPE_NOTHING; + } -#ifdef _DEBUG_PSNR - image_copy(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.height); -#endif + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * closed-gop + * if the frame prior to an iframe is scheduled as a bframe, we must change it to a pframe + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - emms(); + if (type == I_VOP && (pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP) && pEnc->bframenum_tail > 0) { - if ((pEnc->global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 5, - "%i if:%i st:%i:%i", pEnc->m_framenum++, pEnc->iFrameNum, pEnc->current->seconds, pEnc->current->ticks); - } + // place this frame back on the encoding-queue (head) + // we will deal with it next time + dec_frame_num(pEnc); + pEnc->iFrameNum--; - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - * Luminance masking - * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ + pEnc->queue_head = (pEnc->queue_head + (pEnc->mbParam.max_bframes+1) - 1) % (pEnc->mbParam.max_bframes+1); + pEnc->queue_size++; + image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_head].image); - if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { - int *temp_dquants = - (int *) xvid_malloc(pEnc->mbParam.mb_width * - pEnc->mbParam.mb_height * sizeof(int), - CACHE_LINE); - - pEnc->current->quant = - adaptive_quantization(pEnc->current->image.y, - pEnc->mbParam.edged_width, temp_dquants, - pEnc->current->quant, pEnc->current->quant, - 2 * pEnc->current->quant, - pEnc->mbParam.mb_width, - pEnc->mbParam.mb_height); + // grab the last frame from the bframe-queue - for (y = 0; y < pEnc->mbParam.mb_height; y++) { + pEnc->bframenum_tail--; + SWAP(FRAMEINFO*, pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); -#define OFFSET(x,y) ((x) + (y)*pEnc->mbParam.mb_width) + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { + image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "DX50 BVOP->PVOP"); + } - for (x = 0; x < pEnc->mbParam.mb_width; x++) { - MACROBLOCK *pMB = &pEnc->current->mbs[OFFSET(x, y)]; + /* convert B-VOP quant to P-VOP */ + pEnc->current->quant = ((pEnc->current->quant*100) - pEnc->mbParam.bquant_offset) / pEnc->mbParam.bquant_ratio; + type = P_VOP; + } - pMB->dquant = iDQtab[temp_dquants[OFFSET(x, y)] + 2]; - } -#undef OFFSET - } + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * encode this frame as an i-vop + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - xvid_free(temp_dquants); - } - - } - - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - * ivop/pvop/bvop selection - * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - - - if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop >= 0 || - (pFrame->intra < 0 && pEnc->iMaxKeyInterval > 0 && - pEnc->iFrameNum >= pEnc->iMaxKeyInterval) - || image_mad(&pEnc->reference->image, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.width, - pEnc->mbParam.height) > 30) { - /* - * This will be coded as an Intra Frame - */ + if (type == I_VOP) { DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - if ((pEnc->global & XVID_GLOBAL_DEBUG)) { + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "IVOP"); } - // when we reach an iframe in DX50BVOP mode, encode the last bframe as a pframe - if ((pEnc->global & XVID_GLOBAL_DX50BVOP) && pEnc->bframenum_tail > 0) { + /* ---- update vol flags at IVOP ----------- */ + pEnc->current->vol_flags = pEnc->mbParam.vol_flags = frame->vol_flags; - pEnc->bframenum_tail--; - pEnc->bframenum_dx50bvop = pEnc->bframenum_tail; + if ((pEnc->mbParam.vol_flags & XVID_VOL_MPEGQUANT)) { + if (frame->quant_intra_matrix != NULL) + set_intra_matrix(frame->quant_intra_matrix); + if (frame->quant_inter_matrix != NULL) + set_inter_matrix(frame->quant_inter_matrix); + } - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_dx50bvop]); - if ((pEnc->global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "DX50 BVOP->PVOP"); - } - FrameCodeP(pEnc, &bs, &bits, 1, 0); + /* prevent vol/vop misuse */ - pFrame->intra = 0; - - } else { + if (!(pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE)) + pEnc->current->vop_flags &= ~XVID_VOP_REDUCED; - FrameCodeI(pEnc, &bs, &bits); - pFrame->intra = 1; + if (!(pEnc->current->vol_flags & XVID_VOL_INTERLACING)) + pEnc->current->vop_flags &= ~(XVID_VOP_TOPFIELDFIRST|XVID_VOP_ALTERNATESCAN); - pEnc->bframenum_dx50bvop = -1; - } + /* ^^^------------------------ */ - pEnc->flush_bframes = 1; + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + image_copy(&pEnc->sOriginal, &pEnc->current->image, + pEnc->mbParam.edged_width, pEnc->mbParam.height); + } - if ((pEnc->global & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) { - BitstreamPad(&bs); - input_valid = 0; - goto ipvop_loop; - } + FrameCodeI(pEnc, &bs); + xFrame->out_flags |= XVID_KEYFRAME; + + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * encode this frame as an p-vop + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - /* - * NB : sequences like "IIBB" decode fine with msfdam but, - * go screwy with divx 5.00 - */ - } else if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { - /* - * This will be coded as a Predicted Frame - */ + } else { // (type == P_VOP || type == S_VOP) DPRINTF(DPRINTF_DEBUG,"*** PFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - if ((pEnc->global & XVID_GLOBAL_DEBUG)) { + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "PVOP"); } - FrameCodeP(pEnc, &bs, &bits, 1, 0); - pFrame->intra = 0; - pEnc->flush_bframes = 1; + if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { + image_copy(&pEnc->sOriginal, &pEnc->current->image, + pEnc->mbParam.edged_width, pEnc->mbParam.height); + } - if ((pEnc->global & XVID_GLOBAL_PACKED)) { - BitstreamPad(&bs); - input_valid = 0; - goto ipvop_loop; - } - - } else { - /* - * This will be coded as a Bidirectional Frame - */ + FrameCodeP(pEnc, &bs, 1, 0); + } - DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", - pEnc->bframenum_head, pEnc->bframenum_tail, - pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - - if ((pEnc->global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "BVOP"); - } - - if (pFrame->bquant < 1) { - pEnc->current->quant = - ((pEnc->reference->quant + - pEnc->current->quant) * pEnc->bquant_ratio) / 200; - } else { - pEnc->current->quant = pFrame->bquant; - } - - /* store frame into bframe buffer & swap ref back to current */ - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); - SWAP(pEnc->current, pEnc->reference); + + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * on next enc_encode call we must flush bframes + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - pEnc->bframenum_tail++; +done_flush: - pFrame->intra = 0; - pFrame->length = 0; + pEnc->flush_bframes = 1; - input_valid = 0; - goto bvop_loop; + /* packed & queued_bframes: dont bother outputting stats, we do so after the flush */ + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) { + goto repeat; } - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - - if (pResult) { - pResult->quant = pEnc->current->quant; - pResult->hlength = pFrame->length - (pEnc->sStat.iTextBits / 8); - pResult->kblks = pEnc->sStat.kblks; - pResult->mblks = pEnc->sStat.mblks; - pResult->ublks = pEnc->sStat.ublks; + /* packed or no-bframes: output stats */ + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) || pEnc->mbParam.max_bframes == 0) { + call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats); } - emms(); - -#ifdef _DEBUG_PSNR - psnr = - image_psnr(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.width, - pEnc->mbParam.height); - - snprintf(temp, 127, "PSNR: %f\n", psnr); - DEBUG(temp); -#endif - - if (pFrame->quant == 0) { - RateControlUpdate(&pEnc->rate_control, pEnc->current->quant, - pFrame->length, pFrame->intra); - } + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + * done; return number of bytes consumed + * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ +done: stop_global_timer(); write_timer(); - return XVID_ERR_OK; + emms(); + return BitstreamLength(&bs); } -#endif - - -/***************************************************************************** - * "original" IP frame encoder entry point - * - * Returned values : - * - XVID_ERR_OK - no errors - * - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong - * format - ****************************************************************************/ - -int -encoder_encode(Encoder * pEnc, - XVID_ENC_FRAME * pFrame, - XVID_ENC_STATS * pResult) +static void SetMacroblockQuants(MBParam * const pParam, FRAMEINFO * frame) { - uint16_t x, y; - Bitstream bs; - uint32_t bits; - uint16_t write_vol_header = 0; - -#ifdef _DEBUG_PSNR - float psnr; - uint8_t temp[128]; -#endif - - start_global_timer(); - - ENC_CHECK(pEnc); - ENC_CHECK(pFrame); - ENC_CHECK(pFrame->bitstream); - ENC_CHECK(pFrame->image); - - SWAP(pEnc->current, pEnc->reference); - - pEnc->current->global_flags = pFrame->general; - pEnc->current->motion_flags = pFrame->motion; -#ifdef BFRAMES - pEnc->current->seconds = pEnc->mbParam.m_seconds; - pEnc->current->ticks = pEnc->mbParam.m_ticks; -#endif - pEnc->mbParam.hint = &pFrame->hint; - - start_timer(); - if (image_input - (&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace) < 0) - return XVID_ERR_FORMAT; - stop_conv_timer(); - -#ifdef _DEBUG_PSNR - image_copy(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.height); -#endif - - emms(); - - BitstreamInit(&bs, pFrame->bitstream, 0); - - if (pFrame->quant == 0) { - pEnc->current->quant = RateControlGetQ(&pEnc->rate_control, 0); - } else { - pEnc->current->quant = pFrame->quant; - } - - if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { - int *temp_dquants = - (int *) xvid_malloc(pEnc->mbParam.mb_width * - pEnc->mbParam.mb_height * sizeof(int), - CACHE_LINE); - - pEnc->current->quant = - adaptive_quantization(pEnc->current->image.y, - pEnc->mbParam.edged_width, temp_dquants, - pEnc->current->quant, pEnc->current->quant, - 2 * pEnc->current->quant, - pEnc->mbParam.mb_width, - pEnc->mbParam.mb_height); - - for (y = 0; y < pEnc->mbParam.mb_height; y++) { - -#define OFFSET(x,y) ((x) + (y)*pEnc->mbParam.mb_width) - - for (x = 0; x < pEnc->mbParam.mb_width; x++) { - - - MACROBLOCK *pMB = &pEnc->current->mbs[OFFSET(x, y)]; - - pMB->dquant = iDQtab[temp_dquants[OFFSET(x, y)] + 2]; - } - -#undef OFFSET - } - - xvid_free(temp_dquants); - } - - if (pEnc->current->global_flags & XVID_H263QUANT) { - if (pEnc->mbParam.m_quant_type != H263_QUANT) - write_vol_header = 1; - pEnc->mbParam.m_quant_type = H263_QUANT; - } else if (pEnc->current->global_flags & XVID_MPEGQUANT) { - int matrix1_changed, matrix2_changed; - - matrix1_changed = matrix2_changed = 0; + unsigned int i,j; + int quant = frame->quant; - if (pEnc->mbParam.m_quant_type != MPEG4_QUANT) - write_vol_header = 1; - - pEnc->mbParam.m_quant_type = MPEG4_QUANT; - - if ((pEnc->current->global_flags & XVID_CUSTOM_QMATRIX) > 0) { - if (pFrame->quant_intra_matrix != NULL) - matrix1_changed = set_intra_matrix(pFrame->quant_intra_matrix); - if (pFrame->quant_inter_matrix != NULL) - matrix2_changed = set_inter_matrix(pFrame->quant_inter_matrix); - } else { - matrix1_changed = set_intra_matrix(get_default_intra_matrix()); - matrix2_changed = set_inter_matrix(get_default_inter_matrix()); - } - if (write_vol_header == 0) - write_vol_header = matrix1_changed | matrix2_changed; - } - - if (pFrame->intra < 0) { - if ((pEnc->iFrameNum == 0) - || ((pEnc->iMaxKeyInterval > 0) - && (pEnc->iFrameNum >= pEnc->iMaxKeyInterval))) { - pFrame->intra = FrameCodeI(pEnc, &bs, &bits); - } else { - pFrame->intra = FrameCodeP(pEnc, &bs, &bits, 0, write_vol_header); - } - } else { - if (pFrame->intra == 1) { - pFrame->intra = FrameCodeI(pEnc, &bs, &bits); - } else { - pFrame->intra = FrameCodeP(pEnc, &bs, &bits, 1, write_vol_header); - } - - } - - BitstreamPutBits(&bs, 0xFFFF, 16); - BitstreamPutBits(&bs, 0xFFFF, 16); - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - - if (pResult) { - pResult->quant = pEnc->current->quant; - pResult->hlength = pFrame->length - (pEnc->sStat.iTextBits / 8); - pResult->kblks = pEnc->sStat.kblks; - pResult->mblks = pEnc->sStat.mblks; - pResult->ublks = pEnc->sStat.ublks; - } - - emms(); - - if (pFrame->quant == 0) { - RateControlUpdate(&pEnc->rate_control, pEnc->current->quant, - pFrame->length, pFrame->intra); - } -#ifdef _DEBUG_PSNR - psnr = - image_psnr(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.width, - pEnc->mbParam.height); - - snprintf(temp, 127, "PSNR: %f\n", psnr); - DEBUG(temp); -#endif - -#ifdef BFRAMES - inc_frame_num(pEnc); -#else - pEnc->iFrameNum++; -#endif - - - stop_global_timer(); - write_timer(); - - return XVID_ERR_OK; + for (j=0; jmb_height; j++) + for (i=0; imb_width; i++) { + MACROBLOCK * pMB = &frame->mbs[j*pParam->mb_width + i]; + quant += pMB->dquant; + if (quant > 31) + quant = 31; + if (quant < 1) + quant = 1; + pMB->quant = quant; + } } @@ -1268,251 +1270,59 @@ pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = 0; pMB->sad16 = 0; - if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { - if (pMB->dquant != NO_CHANGE) { - pMB->mode = MODE_INTRA_Q; - pEnc->current->quant += DQtab[pMB->dquant]; - - if (pEnc->current->quant > 31) - pEnc->current->quant = 31; - if (pEnc->current->quant < 1) - pEnc->current->quant = 1; - } - } - - pMB->quant = pEnc->current->quant; + if (pMB->dquant != 0) { + pMB->mode = MODE_INTRA_Q; + } } -#define FCODEBITS 3 -#define MODEBITS 5 - -void -HintedMESet(Encoder * pEnc, - int *intra) -{ - HINTINFO *hint; - Bitstream bs; - int length, high; - uint32_t x, y; - - hint = pEnc->mbParam.hint; - - if (hint->rawhints) { - *intra = hint->mvhint.intra; - } else { - BitstreamInit(&bs, hint->hintstream, hint->hintlength); - *intra = BitstreamGetBit(&bs); - } - - if (*intra) { - return; - } - - pEnc->current->fcode = - (hint->rawhints) ? hint->mvhint.fcode : BitstreamGetBits(&bs, - FCODEBITS); - - length = pEnc->current->fcode + 5; - high = 1 << (length - 1); - - for (y = 0; y < pEnc->mbParam.mb_height; ++y) { - for (x = 0; x < pEnc->mbParam.mb_width; ++x) { - MACROBLOCK *pMB = - &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; - MVBLOCKHINT *bhint = - &hint->mvhint.block[x + y * pEnc->mbParam.mb_width]; - VECTOR pred; - VECTOR tmp; - int vec; - - pMB->mode = - (hint->rawhints) ? bhint->mode : BitstreamGetBits(&bs, - MODEBITS); - - pMB->mode = (pMB->mode == MODE_INTER_Q) ? MODE_INTER : pMB->mode; - pMB->mode = (pMB->mode == MODE_INTRA_Q) ? MODE_INTRA : pMB->mode; - - if (pMB->mode == MODE_INTER) { - tmp.x = - (hint->rawhints) ? bhint->mvs[0].x : BitstreamGetBits(&bs, - length); - tmp.y = - (hint->rawhints) ? bhint->mvs[0].y : BitstreamGetBits(&bs, - length); - tmp.x -= (tmp.x >= high) ? high * 2 : 0; - tmp.y -= (tmp.y >= high) ? high * 2 : 0; - - pred = get_pmv2(pEnc->current->mbs,pEnc->mbParam.mb_width,0,x,y,0); - - for (vec = 0; vec < 4; ++vec) { - pMB->mvs[vec].x = tmp.x; - pMB->mvs[vec].y = tmp.y; - pMB->pmvs[vec].x = pMB->mvs[0].x - pred.x; - pMB->pmvs[vec].y = pMB->mvs[0].y - pred.y; - } - } else if (pMB->mode == MODE_INTER4V) { - for (vec = 0; vec < 4; ++vec) { - tmp.x = - (hint->rawhints) ? bhint->mvs[vec]. - x : BitstreamGetBits(&bs, length); - tmp.y = - (hint->rawhints) ? bhint->mvs[vec]. - y : BitstreamGetBits(&bs, length); - tmp.x -= (tmp.x >= high) ? high * 2 : 0; - tmp.y -= (tmp.y >= high) ? high * 2 : 0; - - pred = get_pmv2(pEnc->current->mbs,pEnc->mbParam.mb_width,0,x,y,vec); - - pMB->mvs[vec].x = tmp.x; - pMB->mvs[vec].y = tmp.y; - pMB->pmvs[vec].x = pMB->mvs[vec].x - pred.x; - pMB->pmvs[vec].y = pMB->mvs[vec].y - pred.y; - } - } else // intra / stuffing / not_coded - { - for (vec = 0; vec < 4; ++vec) { - pMB->mvs[vec].x = pMB->mvs[vec].y = 0; - } - } - - if (pMB->mode == MODE_INTER4V && - (pEnc->current->global_flags & XVID_LUMIMASKING) - && pMB->dquant != NO_CHANGE) { - pMB->mode = MODE_INTRA; - - for (vec = 0; vec < 4; ++vec) { - pMB->mvs[vec].x = pMB->mvs[vec].y = 0; - } - } - } - } -} - - -void -HintedMEGet(Encoder * pEnc, - int intra) -{ - HINTINFO *hint; - Bitstream bs; - uint32_t x, y; - int length, high; - - hint = pEnc->mbParam.hint; - - if (hint->rawhints) { - hint->mvhint.intra = intra; - } else { - BitstreamInit(&bs, hint->hintstream, 0); - BitstreamPutBit(&bs, intra); - } - - if (intra) { - if (!hint->rawhints) { - BitstreamPad(&bs); - hint->hintlength = BitstreamLength(&bs); - } - return; - } - - length = pEnc->current->fcode + 5; - high = 1 << (length - 1); - - if (hint->rawhints) { - hint->mvhint.fcode = pEnc->current->fcode; - } else { - BitstreamPutBits(&bs, pEnc->current->fcode, FCODEBITS); - } - - for (y = 0; y < pEnc->mbParam.mb_height; ++y) { - for (x = 0; x < pEnc->mbParam.mb_width; ++x) { - MACROBLOCK *pMB = - &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; - MVBLOCKHINT *bhint = - &hint->mvhint.block[x + y * pEnc->mbParam.mb_width]; - VECTOR tmp; - - if (hint->rawhints) { - bhint->mode = pMB->mode; - } else { - BitstreamPutBits(&bs, pMB->mode, MODEBITS); - } - - if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) { - tmp.x = pMB->mvs[0].x; - tmp.y = pMB->mvs[0].y; - tmp.x += (tmp.x < 0) ? high * 2 : 0; - tmp.y += (tmp.y < 0) ? high * 2 : 0; - - if (hint->rawhints) { - bhint->mvs[0].x = tmp.x; - bhint->mvs[0].y = tmp.y; - } else { - BitstreamPutBits(&bs, tmp.x, length); - BitstreamPutBits(&bs, tmp.y, length); - } - } else if (pMB->mode == MODE_INTER4V) { - int vec; - - for (vec = 0; vec < 4; ++vec) { - tmp.x = pMB->mvs[vec].x; - tmp.y = pMB->mvs[vec].y; - tmp.x += (tmp.x < 0) ? high * 2 : 0; - tmp.y += (tmp.y < 0) ? high * 2 : 0; - - if (hint->rawhints) { - bhint->mvs[vec].x = tmp.x; - bhint->mvs[vec].y = tmp.y; - } else { - BitstreamPutBits(&bs, tmp.x, length); - BitstreamPutBits(&bs, tmp.y, length); - } - } - } - } - } - - if (!hint->rawhints) { - BitstreamPad(&bs); - hint->hintlength = BitstreamLength(&bs); - } -} - static int FrameCodeI(Encoder * pEnc, - Bitstream * bs, - uint32_t * pBits) + Bitstream * bs) { - + int bits = BitstreamPos(bs); + int mb_width = pEnc->mbParam.mb_width; + int mb_height = pEnc->mbParam.mb_height; + DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE); DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE); uint16_t x, y; - pEnc->iFrameNum = 0; + if ((pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE)) + { + mb_width = (pEnc->mbParam.width + 31) / 32; + mb_height = (pEnc->mbParam.height + 31) / 32; + + /* 16x16->8x8 downsample requires 1 additional edge pixel*/ + /* XXX: setedges is overkill */ + start_timer(); + image_setedges(&pEnc->current->image, + pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, + pEnc->mbParam.width, pEnc->mbParam.height); + stop_edges_timer(); + } + pEnc->mbParam.m_rounding_type = 1; pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type; pEnc->current->coding_type = I_VOP; + + SetMacroblockQuants(&pEnc->mbParam, pEnc->current); - BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); -#ifdef BFRAMES -#define DIVX501B481P "DivX501b481p" - if ((pEnc->global & XVID_GLOBAL_PACKED)) { - BitstreamWriteUserData(bs, DIVX501B481P, strlen(DIVX501B481P)); - } -#endif - BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); + BitstreamWriteVolHeader(bs, &pEnc->mbParam); - *pBits = BitstreamPos(bs); + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); - pEnc->sStat.iTextBits = 0; - pEnc->sStat.kblks = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height; - pEnc->sStat.mblks = pEnc->sStat.ublks = 0; + BitstreamPadAlways(bs); + BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); - for (y = 0; y < pEnc->mbParam.mb_height; y++) - for (x = 0; x < pEnc->mbParam.mb_width; x++) { + pEnc->current->sStat.iTextBits = 0; + pEnc->current->sStat.kblks = mb_width * mb_height; + pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0; + + for (y = 0; y < mb_height; y++) + for (x = 0; x < mb_width; x++) { MACROBLOCK *pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; @@ -1526,391 +1336,572 @@ stop_prediction_timer(); start_timer(); - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); + if (pEnc->current->vop_flags & XVID_VOP_GREYSCALE) + { pMB->cbp &= 0x3C; /* keep only bits 5-2 */ + qcoeff[4*64+0]=0; /* zero, because for INTRA MBs DC value is saved */ + qcoeff[5*64+0]=0; + } + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); stop_coding_timer(); } + if ((pEnc->current->vop_flags & XVID_VOP_REDUCED)) + { + image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, + pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width, + 16, 0); + } emms(); - *pBits = BitstreamPos(bs) - *pBits; - pEnc->sStat.fMvPrevSigma = -1; - pEnc->sStat.iMvSum = 0; - pEnc->sStat.iMvCount = 0; +/* XXX: Remove the two #if 0 blocks when we are sure we must always pad the stream */ +#if 0 + /* for divx5 compatibility, we must always pad between the packed p and b frames */ + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) +#endif + BitstreamPadAlways(bs); +#if 0 + else + BitstreamPad(bs); +#endif + pEnc->current->length = (BitstreamPos(bs) - bits) / 8; + + pEnc->fMvPrevSigma = -1; pEnc->mbParam.m_fcode = 2; + /* XXX: hinted me if (pEnc->current->global_flags & XVID_HINTEDME_GET) { HintedMEGet(pEnc, 1); - } + }*/ - return 1; // intra + return 1; /* intra */ } #define INTRA_THRESHOLD 0.5 +#define BFRAME_SKIP_THRESHHOLD 30 + +/* FrameCodeP also handles S(GMC)-VOPs */ static int FrameCodeP(Encoder * pEnc, Bitstream * bs, - uint32_t * pBits, bool force_inter, bool vol_header) { float fSigma; + int bits = BitstreamPos(bs); DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE); DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE); + int mb_width = pEnc->mbParam.mb_width; + int mb_height = pEnc->mbParam.mb_height; + int iLimit; - uint32_t x, y; + int x, y, k; int iSearchRange; - int bIntra; - + int bIntra, skip_possible; + /* IMAGE *pCurrent = &pEnc->current->image; */ IMAGE *pRef = &pEnc->reference->image; + if ((pEnc->current->vop_flags & XVID_VOP_REDUCED)) + { + mb_width = (pEnc->mbParam.width + 31) / 32; + mb_height = (pEnc->mbParam.height + 31) / 32; + } + + start_timer(); image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->current->global_flags & XVID_INTERLACING); + pEnc->mbParam.width, pEnc->mbParam.height); stop_edges_timer(); pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type; pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type; + //pEnc->current->quarterpel = pEnc->mbParam.m_quarterpel; pEnc->current->fcode = pEnc->mbParam.m_fcode; if (!force_inter) - iLimit = - (int) (pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * - INTRA_THRESHOLD); + iLimit = (int)(mb_width * mb_height * INTRA_THRESHOLD); else - iLimit = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height + 1; + iLimit = mb_width * mb_height + 1; - if ((pEnc->current->global_flags & XVID_HALFPEL)) { + if ((pEnc->current->vop_flags & XVID_VOP_HALFPEL)) { start_timer(); image_interpolate(pRef, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, + (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), pEnc->current->rounding_type); stop_inter_timer(); } + pEnc->current->coding_type = P_VOP; + + + SetMacroblockQuants(&pEnc->mbParam, pEnc->current); + start_timer(); - if (pEnc->current->global_flags & XVID_HINTEDME_SET) { + /*if (pEnc->current->global_flags & XVID_HINTEDME_SET) HintedMESet(pEnc, &bIntra); - } else { - -#ifdef _SMP - if (pEnc->mbParam.num_threads > 1) - bIntra = - SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference, - &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, - iLimit); - else -#endif + else*/ bIntra = MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, iLimit); - - } + stop_motion_timer(); - if (bIntra == 1) { - return FrameCodeI(pEnc, bs, pBits); - } + if (bIntra == 1) return FrameCodeI(pEnc, bs); - pEnc->current->coding_type = P_VOP; + if ( ( pEnc->current->vol_flags & XVID_VOL_GMC ) + && ( (pEnc->current->warp.duv[1].x != 0) || (pEnc->current->warp.duv[1].y != 0) ) ) + { + pEnc->current->coding_type = S_VOP; + + generate_GMCparameters( 2, 16, &pEnc->current->warp, + pEnc->mbParam.width, pEnc->mbParam.height, + &pEnc->current->gmc_data); + + generate_GMCimage(&pEnc->current->gmc_data, &pEnc->reference->image, + pEnc->mbParam.mb_width, pEnc->mbParam.mb_height, + pEnc->mbParam.edged_width, pEnc->mbParam.edged_width/2, + pEnc->mbParam.m_fcode, (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0, + pEnc->current->rounding_type, pEnc->current->mbs, &pEnc->vGMC); + + } + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); if (vol_header) - BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); + { BitstreamWriteVolHeader(bs, &pEnc->mbParam); + BitstreamPadAlways(bs); + } BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); - *pBits = BitstreamPos(bs); + pEnc->current->sStat.iTextBits = pEnc->current->sStat.iMvSum = pEnc->current->sStat.iMvCount = + pEnc->current->sStat.kblks = pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0; - pEnc->sStat.iTextBits = 0; - pEnc->sStat.iMvSum = 0; - pEnc->sStat.iMvCount = 0; - pEnc->sStat.kblks = pEnc->sStat.mblks = pEnc->sStat.ublks = 0; - for (y = 0; y < pEnc->mbParam.mb_height; y++) { - for (x = 0; x < pEnc->mbParam.mb_width; x++) { + for (y = 0; y < mb_height; y++) { + for (x = 0; x < mb_width; x++) { MACROBLOCK *pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; +/* Mode decision: Check, if the block should be INTRA / INTER or GMC-coded */ +/* For a start, leave INTRA decision as is, only choose only between INTER/GMC - gruel, 9.1.2002 */ + bIntra = (pMB->mode == MODE_INTRA) || (pMB->mode == MODE_INTRA_Q); - if (!bIntra) { + if (bIntra) { + CodeIntraMB(pEnc, pMB); + MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, + dct_codes, qcoeff); + start_timer(); - MBMotionCompensation(pMB, x, y, &pEnc->reference->image, - &pEnc->vInterH, &pEnc->vInterV, - &pEnc->vInterHV, &pEnc->current->image, - dct_codes, pEnc->mbParam.width, - pEnc->mbParam.height, - pEnc->mbParam.edged_width, - pEnc->current->rounding_type); - stop_comp_timer(); - - if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { - if (pMB->dquant != NO_CHANGE) { - pMB->mode = MODE_INTER_Q; - pEnc->current->quant += DQtab[pMB->dquant]; - if (pEnc->current->quant > 31) - pEnc->current->quant = 31; - else if (pEnc->current->quant < 1) - pEnc->current->quant = 1; - } + MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff); + stop_prediction_timer(); + + pEnc->current->sStat.kblks++; + + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); + stop_coding_timer(); + continue; + } + + if (pEnc->current->coding_type == S_VOP) { + + int32_t iSAD = sad16(pEnc->current->image.y + 16*y*pEnc->mbParam.edged_width + 16*x, + pEnc->vGMC.y + 16*y*pEnc->mbParam.edged_width + 16*x, + pEnc->mbParam.edged_width, 65536); + + if (pEnc->current->motion_flags & XVID_ME_CHROMA16) { + iSAD += sad8(pEnc->current->image.u + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, + pEnc->vGMC.u + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, pEnc->mbParam.edged_width/2); + + iSAD += sad8(pEnc->current->image.v + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, + pEnc->vGMC.v + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, pEnc->mbParam.edged_width/2); + } + + if (iSAD <= pMB->sad16) { /* mode decision GMC */ + + if ((pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL)) + pMB->qmvs[0] = pMB->qmvs[1] = pMB->qmvs[2] = pMB->qmvs[3] = pMB->amv; + else + pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv; + + pMB->mode = MODE_INTER; + pMB->mcsel = 1; + pMB->sad16 = iSAD; + } else { + pMB->mcsel = 0; } - pMB->quant = pEnc->current->quant; + } else { + pMB->mcsel = 0; /* just a precaution */ + } + + start_timer(); + MBMotionCompensation(pMB, x, y, &pEnc->reference->image, + &pEnc->vInterH, &pEnc->vInterV, + &pEnc->vInterHV, &pEnc->vGMC, + &pEnc->current->image, + dct_codes, pEnc->mbParam.width, + pEnc->mbParam.height, + pEnc->mbParam.edged_width, + (pEnc->current->vol_flags & XVID_VOL_QUARTERPEL), + (pEnc->current->vop_flags & XVID_VOP_REDUCED), + pEnc->current->rounding_type); + + stop_comp_timer(); - pMB->field_pred = 0; + if (pMB->dquant != 0) { + pMB->mode = MODE_INTER_Q; + } - pMB->cbp = + pMB->field_pred = 0; + + if (pMB->mode != MODE_NOT_CODED) + { pMB->cbp = MBTransQuantInter(&pEnc->mbParam, pEnc->current, pMB, x, y, dct_codes, qcoeff); - } else { - CodeIntraMB(pEnc, pMB); - MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, - dct_codes, qcoeff); } + if (pMB->cbp || pMB->mvs[0].x || pMB->mvs[0].y || + pMB->mvs[1].x || pMB->mvs[1].y || pMB->mvs[2].x || + pMB->mvs[2].y || pMB->mvs[3].x || pMB->mvs[3].y) { + pEnc->current->sStat.mblks++; + } else { + pEnc->current->sStat.ublks++; + } + start_timer(); - MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff); - stop_prediction_timer(); - if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) { - pEnc->sStat.kblks++; - } else if (pMB->cbp || pMB->mvs[0].x || pMB->mvs[0].y || - pMB->mvs[1].x || pMB->mvs[1].y || pMB->mvs[2].x || - pMB->mvs[2].y || pMB->mvs[3].x || pMB->mvs[3].y) { - pEnc->sStat.mblks++; + /* Finished processing the MB, now check if to CODE or SKIP */ + + skip_possible = (pMB->cbp == 0) && (pMB->mode == MODE_INTER) && + (pMB->dquant == 0); + + if (pEnc->current->coding_type == S_VOP) + skip_possible &= (pMB->mcsel == 1); + else if (pEnc->current->coding_type == P_VOP) { + if ((pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL)) + skip_possible &= ( (pMB->qmvs[0].x == 0) && (pMB->qmvs[0].y == 0) ); + else + skip_possible &= ( (pMB->mvs[0].x == 0) && (pMB->mvs[0].y == 0) ); + } + + if ( (pMB->mode == MODE_NOT_CODED) || (skip_possible)) { + +/* This is a candidate for SKIPping, but for P-VOPs check intermediate B-frames first */ + + if (pEnc->current->coding_type == P_VOP) /* special rule for P-VOP's SKIP */ + { + int bSkip = 1; + + for (k=pEnc->bframenum_head; k< pEnc->bframenum_tail; k++) + { + int iSAD; + iSAD = sad16(pEnc->reference->image.y + 16*y*pEnc->mbParam.edged_width + 16*x, + pEnc->bframes[k]->image.y + 16*y*pEnc->mbParam.edged_width + 16*x, + pEnc->mbParam.edged_width,BFRAME_SKIP_THRESHHOLD); + if (iSAD >= BFRAME_SKIP_THRESHHOLD * pMB->quant) + { bSkip = 0; + break; + } + } + + if (!bSkip) { /* no SKIP, but trivial block */ + if((pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL)) { + VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); + pMB->pmvs[0].x = - predMV.x; + pMB->pmvs[0].y = - predMV.y; + } + else { + VECTOR predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); + pMB->pmvs[0].x = - predMV.x; + pMB->pmvs[0].y = - predMV.y; + } + pMB->mode = MODE_INTER; + pMB->cbp = 0; + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); + stop_coding_timer(); + + continue; /* next MB */ + } + } + /* do SKIP */ + + pMB->mode = MODE_NOT_CODED; + MBSkip(bs); + stop_coding_timer(); + continue; /* next MB */ + } + /* ordinary case: normal coded INTER/INTER4V block */ + + if ((pEnc->current->vop_flags & XVID_VOP_GREYSCALE)) + { pMB->cbp &= 0x3C; /* keep only bits 5-2 */ + qcoeff[4*64+0]=0; /* zero, because DC for INTRA MBs DC value is saved */ + qcoeff[5*64+0]=0; + } + + if((pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL)) { + VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); + pMB->pmvs[0].x = pMB->qmvs[0].x - predMV.x; + pMB->pmvs[0].y = pMB->qmvs[0].y - predMV.y; + DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y); } else { - pEnc->sStat.ublks++; + VECTOR predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); + pMB->pmvs[0].x = pMB->mvs[0].x - predMV.x; + pMB->pmvs[0].y = pMB->mvs[0].y - predMV.y; + DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y); } - start_timer(); - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); + + if (pMB->mode == MODE_INTER4V) + { int k; + for (k=1;k<4;k++) + { + if((pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL)) { + VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, k); + pMB->pmvs[k].x = pMB->qmvs[k].x - predMV.x; + pMB->pmvs[k].y = pMB->qmvs[k].y - predMV.y; + DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[k].x, pMB->pmvs[k].y, predMV.x, predMV.y, pMB->mvs[k].x, pMB->mvs[k].y); + } else { + VECTOR predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, k); + pMB->pmvs[k].x = pMB->mvs[k].x - predMV.x; + pMB->pmvs[k].y = pMB->mvs[k].y - predMV.y; + DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[k].x, pMB->pmvs[k].y, predMV.x, predMV.y, pMB->mvs[k].x, pMB->mvs[k].y); + } + + } + } + + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); stop_coding_timer(); + } } + if ((pEnc->current->vop_flags & XVID_VOP_REDUCED)) + { + image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, + pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width, + 16, 0); + } + emms(); + /* XXX: hinted me if (pEnc->current->global_flags & XVID_HINTEDME_GET) { HintedMEGet(pEnc, 0); - } + }*/ - if (pEnc->sStat.iMvCount == 0) - pEnc->sStat.iMvCount = 1; + if (pEnc->current->sStat.iMvCount == 0) + pEnc->current->sStat.iMvCount = 1; - fSigma = (float) sqrt((float) pEnc->sStat.iMvSum / pEnc->sStat.iMvCount); + fSigma = (float) sqrt((float) pEnc->current->sStat.iMvSum / pEnc->current->sStat.iMvCount); iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode); if ((fSigma > iSearchRange / 3) - && (pEnc->mbParam.m_fcode <= 3)) // maximum search range 128 + && (pEnc->mbParam.m_fcode <= (3 + (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL?1:0) ))) /* maximum search range 128 */ { pEnc->mbParam.m_fcode++; iSearchRange *= 2; } else if ((fSigma < iSearchRange / 6) - && (pEnc->sStat.fMvPrevSigma >= 0) - && (pEnc->sStat.fMvPrevSigma < iSearchRange / 6) - && (pEnc->mbParam.m_fcode >= 2)) // minimum search range 16 + && (pEnc->fMvPrevSigma >= 0) + && (pEnc->fMvPrevSigma < iSearchRange / 6) + && (pEnc->mbParam.m_fcode >= (2 + (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL?1:0) ))) /* minimum search range 16 */ { pEnc->mbParam.m_fcode--; iSearchRange /= 2; } - pEnc->sStat.fMvPrevSigma = fSigma; + pEnc->fMvPrevSigma = fSigma; -#ifdef BFRAMES /* frame drop code */ - // DPRINTF(DPRINTF_DEBUG, "kmu %i %i %i", pEnc->sStat.kblks, pEnc->sStat.mblks, pEnc->sStat.ublks); - if (pEnc->sStat.kblks + pEnc->sStat.mblks <= - (pEnc->frame_drop_ratio * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height) / 100) + DPRINTF(DPRINTF_DEBUG, "kmu %i %i %i", pEnc->current->sStat.kblks, pEnc->current->sStat.mblks, pEnc->current->sStat.ublks); + if (pEnc->current->sStat.kblks + pEnc->current->sStat.mblks < + (pEnc->mbParam.frame_drop_ratio * mb_width * mb_height) / 100) { - pEnc->sStat.kblks = pEnc->sStat.mblks = 0; - pEnc->sStat.ublks = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height; + pEnc->current->sStat.kblks = pEnc->current->sStat.mblks = 0; + pEnc->current->sStat.ublks = mb_width * mb_height; BitstreamReset(bs); + + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 0); - // copy reference frame details into the current frame + /* copy reference frame details into the current frame */ pEnc->current->quant = pEnc->reference->quant; pEnc->current->motion_flags = pEnc->reference->motion_flags; pEnc->current->rounding_type = pEnc->reference->rounding_type; + //pEnc->current->quarterpel = pEnc->reference->quarterpel; pEnc->current->fcode = pEnc->reference->fcode; pEnc->current->bcode = pEnc->reference->bcode; image_copy(&pEnc->current->image, &pEnc->reference->image, pEnc->mbParam.edged_width, pEnc->mbParam.height); - memcpy(pEnc->current->mbs, pEnc->reference->mbs, sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height); - + memcpy(pEnc->current->mbs, pEnc->reference->mbs, sizeof(MACROBLOCK) * mb_width * mb_height); } -#endif - *pBits = BitstreamPos(bs) - *pBits; + /* XXX: debug + { + char s[100]; + sprintf(s, "\\%05i_cur.pgm", pEnc->m_framenum); + image_dump_yuvpgm(&pEnc->current->image, + pEnc->mbParam.edged_width, + pEnc->mbParam.width, pEnc->mbParam.height, s); + + sprintf(s, "\\%05i_ref.pgm", pEnc->m_framenum); + image_dump_yuvpgm(&pEnc->reference->image, + pEnc->mbParam.edged_width, + pEnc->mbParam.width, pEnc->mbParam.height, s); + } + */ + +/* XXX: Remove the two #if 0 blocks when we are sure we must always pad the stream */ +#if 0 + /* for divx5 compatibility, we must always pad between the packed p and b frames */ + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) +#endif + BitstreamPadAlways(bs); +#if 0 + else + BitstreamPad(bs); +#endif -#ifdef BFRAMES - pEnc->time_pp = ((int32_t)pEnc->mbParam.fbase - (int32_t)pEnc->last_pframe + (int32_t)pEnc->mbParam.m_ticks) % (int32_t)pEnc->mbParam.fbase; + pEnc->current->length = (BitstreamPos(bs) - bits) / 8; - pEnc->last_pframe = pEnc->mbParam.m_ticks; -#endif - return 0; // inter + return 0; /* inter */ } -#ifdef BFRAMES static void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, - Bitstream * bs, - uint32_t * pBits) + Bitstream * bs) { - int16_t dct_codes[6 * 64]; - int16_t qcoeff[6 * 64]; + int bits = BitstreamPos(bs); + DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE); + DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE); uint32_t x, y; - VECTOR forward; - VECTOR backward; IMAGE *f_ref = &pEnc->reference->image; IMAGE *b_ref = &pEnc->current->image; -#ifdef BFRAMES_DEC_DEBUG + #ifdef BFRAMES_DEC_DEBUG FILE *fp; static char first=0; #define BFRAME_DEBUG if (!first && fp){ \ fprintf(fp,"Y=%3d X=%3d MB=%2d CBP=%02X\n",y,x,mb->mode,mb->cbp); \ } + /* XXX: pEnc->current->global_flags &= ~XVID_VOP_REDUCED; reduced resoltion not yet supported */ + if (!first){ fp=fopen("C:\\XVIDDBGE.TXT","w"); } #endif - // forward + //frame->quarterpel = pEnc->mbParam.m_quarterpel; + + /* forward */ image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height, - frame->global_flags & XVID_INTERLACING); + pEnc->mbParam.height); start_timer(); image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - 0); + (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0); stop_inter_timer(); - // backward + /* backward */ image_setedges(b_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height, - frame->global_flags & XVID_INTERLACING); + pEnc->mbParam.height); start_timer(); image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - 0); + (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0); stop_inter_timer(); start_timer(); + MotionEstimationBVOP(&pEnc->mbParam, frame, - ((int32_t)pEnc->mbParam.fbase + (int32_t)pEnc->mbParam.m_ticks + 1 - (int32_t)pEnc->last_pframe) % pEnc->mbParam.fbase, - pEnc->time_pp, - pEnc->reference->mbs, f_ref, + ((int32_t)(pEnc->current->stamp - frame->stamp)), /* time_bp */ + ((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), /* time_pp */ + pEnc->reference->mbs, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, - pEnc->current->mbs, b_ref, &pEnc->vInterH, + pEnc->current, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV); stop_motion_timer(); - /*if (test_quant_type(&pEnc->mbParam, pEnc->current)) - { - BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type); - } */ + /* + if (test_quant_type(&pEnc->mbParam, pEnc->current)) { + BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type); + } + */ frame->coding_type = B_VOP; - BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1); - *pBits = BitstreamPos(bs); - - pEnc->sStat.iTextBits = 0; - pEnc->sStat.iMvSum = 0; - pEnc->sStat.iMvCount = 0; - pEnc->sStat.kblks = pEnc->sStat.mblks = pEnc->sStat.ublks = 0; + set_timecodes(frame, pEnc->reference,pEnc->mbParam.fbase); + BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1); + frame->sStat.iTextBits = 0; + frame->sStat.iMvSum = 0; + frame->sStat.iMvCount = 0; + frame->sStat.kblks = frame->sStat.mblks = frame->sStat.ublks = 0; + frame->sStat.mblks = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height; + frame->sStat.kblks = frame->sStat.ublks = 0; for (y = 0; y < pEnc->mbParam.mb_height; y++) { - // reset prediction - - forward.x = 0; - forward.y = 0; - backward.x = 0; - backward.y = 0; - for (x = 0; x < pEnc->mbParam.mb_width; x++) { - MACROBLOCK *f_mb = - &pEnc->reference->mbs[x + y * pEnc->mbParam.mb_width]; - MACROBLOCK *b_mb = - &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; - MACROBLOCK *mb = &frame->mbs[x + y * pEnc->mbParam.mb_width]; + MACROBLOCK * const mb = &frame->mbs[x + y * pEnc->mbParam.mb_width]; + int direction = frame->vop_flags & XVID_VOP_ALTERNATESCAN ? 2 : 0; - // decoder ignores mb when refence block is INTER(0,0), CBP=0 + /* decoder ignores mb when refence block is INTER(0,0), CBP=0 */ if (mb->mode == MODE_NOT_CODED) { - mb->mvs[0].x = 0; - mb->mvs[0].y = 0; - - mb->cbp = 0; -#ifdef BFRAMES_DEC_DEBUG - BFRAME_DEBUG -#endif + /* mb->mvs[0].x = mb->mvs[0].y = mb->cbp = 0; */ continue; } - MBMotionCompensationBVOP(&pEnc->mbParam, mb, x, y, &frame->image, + if (mb->mode != MODE_DIRECT_NONE_MV || pEnc->mbParam.plugin_flags & XVID_REQORIGINAL) { + MBMotionCompensationBVOP(&pEnc->mbParam, mb, x, y, &frame->image, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, dct_codes); - mb->quant = frame->quant; - mb->cbp = - MBTransQuantInter(&pEnc->mbParam, frame, mb, x, y, dct_codes, - qcoeff); - //mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant); - - - if ((mb->mode == MODE_INTERPOLATE || mb->mode == MODE_DIRECT) - && mb->cbp == 0 && mb->mvs[0].x == 0 && mb->mvs[0].y == 0) { - mb->mode = MODE_DIRECT_NONE_MV; // skipped - } - - if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_FORWARD) { - mb->pmvs[0].x = mb->mvs[0].x - forward.x; - mb->pmvs[0].y = mb->mvs[0].y - forward.y; - forward.x = mb->mvs[0].x; - forward.y = mb->mvs[0].y; - } + if (mb->mode == MODE_DIRECT_NO4V) mb->mode = MODE_DIRECT; + mb->quant = frame->quant; + + if (mb->mode != MODE_DIRECT_NONE_MV) + mb->cbp = MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, x, y, dct_codes, qcoeff); - if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_BACKWARD) { - mb->b_pmvs[0].x = mb->b_mvs[0].x - backward.x; - mb->b_pmvs[0].y = mb->b_mvs[0].y - backward.y; - backward.x = mb->b_mvs[0].x; - backward.y = mb->b_mvs[0].y; + if ( (mb->mode == MODE_DIRECT) && (mb->cbp == 0) + && (mb->pmvs[3].x == 0) && (mb->pmvs[3].y == 0) ) { + mb->mode = MODE_DIRECT_NONE_MV; /* skipped */ + } } -// DPRINTF("%05i : [%i %i] M=%i CBP=%i MVS=%i,%i forward=%i,%i", pEnc->m_framenum, x, y, mb->mode, mb->cbp, mb->mvs[0].x, mb->mvs[0].y, forward.x, forward.y); #ifdef BFRAMES_DEC_DEBUG BFRAME_DEBUG #endif start_timer(); MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs, - &pEnc->sStat); + &frame->sStat, direction); stop_coding_timer(); } } emms(); - // TODO: dynamic fcode/bcode ??? + /* TODO: dynamic fcode/bcode ??? */ - *pBits = BitstreamPos(bs) - *pBits; + BitstreamPadAlways(bs); + frame->length = (BitstreamPos(bs) - bits) / 8; #ifdef BFRAMES_DEC_DEBUG if (!first){ @@ -1920,4 +1911,3 @@ } #endif } -#endif