--- encoder.c 2003/03/15 17:06:53 1.95.2.8 +++ encoder.c 2003/07/29 23:02:29 1.95.2.35 @@ -1,32 +1,27 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Encoder main module - + * - Encoder main module - * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. + * Copyright(C) 2002 Michael Militzer + * 2002-2003 Peter Ross + * 2002 Daniel Smith * - * This program is free software; you can redistribute it and/or modify + * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation ; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * but WITHOUT ANY WARRANTY ; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: encoder.c,v 1.95.2.8 2003/03/15 17:06:53 suxen_drol Exp $ + * $Id: encoder.c,v 1.95.2.35 2003/07/29 23:02:29 edgomez Exp $ * ****************************************************************************/ @@ -43,23 +38,18 @@ #include "image/font.h" #include "motion/sad.h" #include "motion/motion.h" +#include "motion/gmc.h" + #include "bitstream/cbp.h" #include "utils/mbfunctions.h" #include "bitstream/bitstream.h" #include "bitstream/mbcoding.h" #include "utils/emms.h" #include "bitstream/mbcoding.h" -#include "quant/adapt_quant.h" #include "quant/quant_matrix.h" #include "utils/mem_align.h" /***************************************************************************** - * Local macros - ****************************************************************************/ - -#define SWAP(_T_,A,B) { _T_ tmp = A; A = B; B = tmp; } - -/***************************************************************************** * Local function prototypes ****************************************************************************/ @@ -75,18 +65,6 @@ FRAMEINFO * frame, Bitstream * bs); -/***************************************************************************** - * Local data - ****************************************************************************/ - -static int DQtab[4] = { - -1, -2, 1, 2 -}; - -static int iDQtab[5] = { - 1, 0, NO_CHANGE, 2, 3 -}; - /***************************************************************************** * Encoder creation @@ -134,12 +112,12 @@ int -enc_create(xvid_enc_create_t * create, xvid_enc_rc_t * rc) +enc_create(xvid_enc_create_t * create) { Encoder *pEnc; int n; - if (XVID_MAJOR(create->version) != 1 || (rc && XVID_MAJOR(rc->version) != 1)) /* v1.x.x */ + if (XVID_MAJOR(create->version) != 1) /* v1.x.x */ return XVID_ERR_VERSION; if (create->width%2 || create->height%2) @@ -152,6 +130,8 @@ return XVID_ERR_MEMORY; memset(pEnc, 0, sizeof(Encoder)); + pEnc->mbParam.profile = create->profile; + /* global flags */ pEnc->mbParam.global_flags = create->global; @@ -169,11 +149,28 @@ 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; + /* zones */ + if(create->num_zones > 0) { + pEnc->num_zones = create->num_zones; + pEnc->zones = xvid_malloc(sizeof(xvid_enc_zone_t) * pEnc->num_zones, CACHE_LINE); + if (pEnc->zones == NULL) + goto xvid_err_memory0; + memcpy(pEnc->zones, create->zones, sizeof(xvid_enc_zone_t) * pEnc->num_zones); + } else { + pEnc->num_zones = 0; + pEnc->zones = NULL; + } + + /* plugins */ + if(create->num_plugins > 0) { + 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; + } else { + pEnc->num_plugins = 0; + pEnc->plugins = NULL; + } for (n=0; nnum_plugins;n++) { xvid_plg_create_t pcreate; @@ -187,6 +184,8 @@ memset(&pcreate, 0, sizeof(xvid_plg_create_t)); pcreate.version = XVID_VERSION; + pcreate.num_zones = pEnc->num_zones; + pcreate.zones = pEnc->zones; pcreate.width = pEnc->mbParam.width; pcreate.height = pEnc->mbParam.height; pcreate.fincr = pEnc->mbParam.fincr; @@ -199,39 +198,36 @@ } } - if ((pEnc->mbParam.global_flags & XVID_EXTRASTATS_ENABLE) || + 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 */ - pEnc->temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * - pEnc->mbParam.mb_height * sizeof(int), CACHE_LINE); - /* XXX: error checking */ + 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); + if (pEnc->temp_dquants==NULL) + goto xvid_err_memory1a; + } /* 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; + + /* min/max quant */ + for (n=0; n<3; n++) { + pEnc->mbParam.min_quant[n] = create->min_quant[n] > 0 ? create->min_quant[n] : 2; + pEnc->mbParam.max_quant[n] = create->max_quant[n] > 0 ? create->max_quant[n] : 31; + } /* frame drop ratio */ pEnc->mbParam.frame_drop_ratio = MAX(create->frame_drop_ratio, 0); /* max keyframe interval */ - pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <=0 ? 250 : create->max_key_interval; - /*XXX: replace 250 hard code with "10seconds * framerate" */ - - /* Bitrate allocator defaults - - if ((create->min_quantizer <= 0) || (create->min_quantizer > 31)) - create->min_quantizer = 1; - - if ((create->max_quantizer <= 0) || (create->max_quantizer > 31)) - create->max_quantizer = 31; - - if (create->max_quantizer < create->min_quantizer) - create->max_quantizer = create->min_quantizer; */ - + pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ? + (10 * pEnc->mbParam.fbase) / pEnc->mbParam.fincr : create->max_key_interval; /* allocate working frame-image memory */ @@ -504,7 +500,10 @@ xvid_free(pEnc->current); xvid_free(pEnc->reference); - xvid_free(pEnc->temp_dquants); + xvid_err_memory1a: + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + xvid_free(pEnc->temp_dquants); + } xvid_err_memory0: for (n=0; nnum_plugins;n++) { @@ -514,6 +513,8 @@ } xvid_free(pEnc->plugins); + xvid_free(pEnc->zones); + xvid_free(pEnc); create->handle = NULL; @@ -591,6 +592,8 @@ pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); + image_destroy(&pEnc->vGMC, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, @@ -607,14 +610,28 @@ xvid_free(pEnc->reference->mbs); xvid_free(pEnc->reference); - xvid_free(pEnc->temp_dquants); + if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { + xvid_free(pEnc->temp_dquants); + } - for (i=0; inum_plugins;i++) { - if (pEnc->plugins[i].func) { - pEnc->plugins[i].func(pEnc->plugins[i].param, XVID_PLG_DESTROY, 0, 0); + + 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->plugins); + + if (pEnc->num_plugins>0) + xvid_free(pEnc->zones); xvid_free(pEnc); @@ -629,17 +646,30 @@ static void call_plugins(Encoder * pEnc, FRAMEINFO * frame, IMAGE * original, int opt, int * type, int * quant, xvid_enc_stats_t * stats) { - int i; + unsigned int i, j; xvid_plg_data_t data; + /* set data struct */ + memset(&data, 0, sizeof(xvid_plg_data_t)); data.version = XVID_VERSION; + /* find zone */ + for(i=0; inum_zones && pEnc->zones[i].frame<=frame->frame_num; i++) ; + data.zone = i>0 ? &pEnc->zones[i-1] : NULL; + 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; + for (i=0; i<3; i++) { + data.min_quant[i] = pEnc->mbParam.min_quant[i]; + data.max_quant[i] = pEnc->mbParam.max_quant[i]; + } + data.reference.csp = XVID_CSP_USER; data.reference.plane[0] = pEnc->reference->image.y; data.reference.plane[1] = pEnc->reference->image.u; @@ -659,14 +689,20 @@ data.frame_num = frame->frame_num; if (opt == XVID_PLG_BEFORE) { - data.type = XVID_TYPE_AUTO; - data.quant = 2; - //memset(pEnc->temp_dquants, NO_CHANGE, pEnc->mbParam.width * pEnc->mbParam.height); - //data.qscale_stride = pEnc->mbParam.width; - //data.qscale_table = pEnc->temp_dquants; - /* todo: vol,vop,motion flags */ + data.type = *type; + data.quant = *quant; + + 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); + } + + data.vol_flags = frame->vol_flags; + data.vop_flags = frame->vop_flags; + data.motion_flags = frame->motion_flags; - } else { // XVID_PLG_AFTER + } else { /* XVID_PLG_AFTER */ if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { data.original.csp = XVID_CSP_USER; data.original.plane[0] = original->y; @@ -677,7 +713,7 @@ data.original.stride[2] = pEnc->mbParam.edged_width/2; } - if ((frame->vol_flags & XVID_EXTRASTATS) || + if ((frame->vol_flags & XVID_VOL_EXTRASTATS) || (pEnc->mbParam.plugin_flags & XVID_REQPSNR)) { data.sse_y = @@ -698,7 +734,17 @@ data.type = coding2type(frame->coding_type); data.quant = frame->quant; - /* todo: data.qscale */ + + 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; @@ -708,8 +754,7 @@ data.mblks = frame->sStat.mblks; data.ublks = frame->sStat.ublks; - if (stats) - { + if (stats) { stats->type = coding2type(frame->coding_type); stats->quant = frame->quant; stats->vol_flags = frame->vol_flags; @@ -725,8 +770,9 @@ } } - emms(); + /* 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; @@ -735,12 +781,27 @@ } emms(); + /* copy modified values back into frame*/ if (opt == XVID_PLG_BEFORE) { *type = data.type; - *quant = data.quant; - /* todo: copy modified qscale,vol,vop,motion flags into the frame*/ - } + *quant = data.quant > 0 ? data.quant : 2; /* default */ + 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; + } + } + + frame->vol_flags = data.vol_flags; + frame->vop_flags = data.vop_flags; + frame->motion_flags = data.motion_flags; + } } @@ -767,7 +828,7 @@ set_timecodes(FRAMEINFO* pCur,FRAMEINFO *pRef, int32_t time_base) { - pCur->ticks = (int32_t)pCur->stamp % 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 */ @@ -827,14 +888,14 @@ 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_INTERLACING)) + xFrame->input.csp, xFrame->vol_flags & XVID_VOL_INTERLACING)) { emms(); return XVID_ERR_FORMAT; } stop_conv_timer(); - if ((xFrame->vop_flags & XVID_CHROMAOPT)) { + if ((xFrame->vop_flags & XVID_VOP_CHROMAOPT)) { image_chroma_optimize(&q->image, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width); } @@ -843,13 +904,13 @@ if (xFrame->quant_intra_matrix) { - memcpy(q->quant_intra_matrix, xFrame->quant_intra_matrix, sizeof(xFrame->quant_intra_matrix)); + memcpy(q->quant_intra_matrix, xFrame->quant_intra_matrix, 64*sizeof(unsigned char)); q->frame.quant_intra_matrix = q->quant_intra_matrix; } if (xFrame->quant_inter_matrix) { - memcpy(q->quant_inter_matrix, xFrame->quant_inter_matrix, sizeof(xFrame->quant_inter_matrix)); + memcpy(q->quant_inter_matrix, xFrame->quant_inter_matrix, 64*sizeof(unsigned char)); q->frame.quant_inter_matrix = q->quant_inter_matrix; } @@ -868,7 +929,7 @@ { if (pEnc->bframenum_head < pEnc->bframenum_tail) { - DPRINTF(DPRINTF_DEBUG,"*** BFRAME (flush) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + DPRINTF(XVID_DEBUG_DEBUG,"*** BFRAME (flush) bf: head=%i tail=%i queue: head=%i tail=%i size=%i\n", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); @@ -891,11 +952,11 @@ indentical to the future-referece frame. */ - if ((pEnc->mbParam.global_flags & XVID_PACKED && pEnc->bframenum_tail > 0)) { + 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", + DPRINTF(XVID_DEBUG_DEBUG,"*** EMPTY bf: head=%i tail=%i queue: head=%i tail=%i size=%i\n", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); @@ -933,13 +994,16 @@ if (xFrame->input.csp == XVID_CSP_NULL) /* no futher input */ { - if (!(pEnc->mbParam.global_flags & XVID_PACKED) && pEnc->mbParam.max_bframes > 0) { + DPRINTF(XVID_DEBUG_DEBUG,"*** FINISH bf: head=%i tail=%i queue: head=%i tail=%i size=%i\n", + pEnc->bframenum_head, pEnc->bframenum_tail, + pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); + + 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 the very last frame is to be b-vop, we must change it to a p-vop */ - if (pEnc->bframenum_tail > 0) - { + if (pEnc->bframenum_tail > 0) { SWAP(FRAMEINFO*, pEnc->current, pEnc->reference); pEnc->bframenum_tail--; @@ -953,10 +1017,21 @@ pEnc->mbParam.edged_width, pEnc->mbParam.height); } - FrameCodeP(pEnc, &bs, 1, 0); + DPRINTF(XVID_DEBUG_DEBUG,"*** PFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i\n", + pEnc->bframenum_head, pEnc->bframenum_tail, + pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - goto done_flush; - } + FrameCodeP(pEnc, &bs, 1, 0); + + + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail==0) { + call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats); + }else{ + pEnc->flush_bframes = 1; + goto done; + } + } + DPRINTF(XVID_DEBUG_DEBUG, "*** END\n"); emms(); return XVID_ERR_END; /* end of stream reached */ @@ -964,10 +1039,10 @@ goto done; /* nothing to encode yet; encoder lag */ } - // the current FRAME becomes the reference + /* the current FRAME becomes the reference */ SWAP(FRAMEINFO*, pEnc->current, pEnc->reference); - // remove frame from encoding-queue (head), and move it into the current + /* 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); @@ -978,59 +1053,29 @@ * init pEnc->current fields * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - 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; - if ((xFrame->vop_flags & XVID_CHROMAOPT)) { + + if ((xFrame->vop_flags & XVID_VOP_CHROMAOPT)) { image_chroma_optimize(&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width); } - emms(); /* float-point region */ - if ((pEnc->current->vop_flags & XVID_LUMIMASKING)) { - unsigned int x, y; - - pEnc->current->quant = - adaptive_quantization(pEnc->current->image.y, - pEnc->mbParam.edged_width, pEnc->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[pEnc->temp_dquants[OFFSET(x, y)] + 2]; - } - -#undef OFFSET - } - - } - emms(); /* END floating-point region */ - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * 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; + type = frame->type; + pEnc->current->quant = frame->quant; + call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, &pEnc->current->quant, stats); + if (type > 0){ /* XVID_TYPE_?VOP */ type = type2coding(type); /* convert XVID_TYPE_?VOP to bitstream coding type */ } else{ /* XVID_TYPE_AUTO */ @@ -1040,27 +1085,18 @@ }else{ type = MEanalysis(&pEnc->reference->image, pEnc->current, &pEnc->mbParam, pEnc->mbParam.iMaxKeyInterval, - pEnc->iFrameNum, pEnc->bframenum_tail); - - if (type == B_VOP && !(pEnc->current->vop_flags & XVID_DYNAMIC_BFRAMES)) { - type = P_VOP; /* disable dynamic bframes */ - } + pEnc->iFrameNum, pEnc->bframenum_tail, xFrame->bframe_threshold); } } /* bframes buffer overflow check */ - if (type != I_VOP) { - if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { - type = P_VOP; - }else{ - type = B_VOP; - } + if (type == B_VOP && pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { + type = P_VOP; } - inc_frame_num(pEnc); pEnc->iFrameNum++; - if ((pEnc->current->vop_flags & XVID_DEBUG)) { + 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); } @@ -1070,16 +1106,16 @@ * (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_DEBUG)) { + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "BVOP"); } - if (frame->bquant < 1) { + if (frame->quant < 1) { pEnc->current->quant = ((((pEnc->reference->quant + pEnc->current->quant) * pEnc->mbParam.bquant_ratio) / 2) + pEnc->mbParam.bquant_offset)/100; } else { - pEnc->current->quant = frame->bquant; + pEnc->current->quant = frame->quant; } if (pEnc->current->quant < 1) @@ -1087,7 +1123,7 @@ 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", + DPRINTF(XVID_DEBUG_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i queue: head=%i tail=%i size=%i quant=%i\n", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size,pEnc->current->quant); @@ -1100,8 +1136,13 @@ goto repeat; } + + DPRINTF(XVID_DEBUG_DEBUG,"*** XXXXXX bf: head=%i tail=%i queue: head=%i tail=%i size=%i\n", + pEnc->bframenum_head, pEnc->bframenum_tail, + pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); + /* for unpacked bframes, output the stats for the last encoded frame */ - if (!(pEnc->mbParam.global_flags & XVID_PACKED) && pEnc->bframenum_tail > 0) + if (!(pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->mbParam.max_bframes > 0) { if (pEnc->current->stamp > 0) { call_plugins(pEnc, pEnc->reference, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats); @@ -1115,10 +1156,10 @@ * if the frame prior to an iframe is scheduled as a bframe, we must change it to a pframe * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - if (type == I_VOP && (pEnc->mbParam.global_flags & XVID_CLOSED_GOP) && pEnc->bframenum_tail > 0) { + if (type == I_VOP && (pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP) && pEnc->bframenum_tail > 0) { - // place this frame back on the encoding-queue (head) - // we will deal with it next time + /* place this frame back on the encoding-queue (head) */ + /* we will deal with it next time */ dec_frame_num(pEnc); pEnc->iFrameNum--; @@ -1126,12 +1167,12 @@ pEnc->queue_size++; image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_head].image); - // grab the last frame from the bframe-queue + /* grab the last frame from the bframe-queue */ pEnc->bframenum_tail--; SWAP(FRAMEINFO*, pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); - if ((pEnc->current->vop_flags & XVID_DEBUG)) { + 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"); } @@ -1147,19 +1188,20 @@ if (type == I_VOP) { - DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + DPRINTF(XVID_DEBUG_DEBUG,"*** IFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i\n", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - if ((pEnc->current->vop_flags & XVID_DEBUG)) { + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "IVOP"); } + pEnc->iFrameNum = 1; /* ---- update vol flags at IVOP ----------- */ pEnc->current->vol_flags = pEnc->mbParam.vol_flags = frame->vol_flags; - if ((pEnc->mbParam.vol_flags & XVID_MPEGQUANT)) { + 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) @@ -1168,11 +1210,11 @@ /* prevent vol/vop misuse */ - if (!(pEnc->current->vol_flags & XVID_REDUCED_ENABLE)) - pEnc->current->vop_flags &= ~XVID_REDUCED; + if (!(pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE)) + pEnc->current->vop_flags &= ~XVID_VOP_REDUCED; - if (!(pEnc->current->vol_flags & XVID_INTERLACING)) - pEnc->current->vop_flags &= ~(XVID_TOPFIELDFIRST|XVID_ALTERNATESCAN); + if (!(pEnc->current->vol_flags & XVID_VOL_INTERLACING)) + pEnc->current->vop_flags &= ~(XVID_VOP_TOPFIELDFIRST|XVID_VOP_ALTERNATESCAN); /* ^^^------------------------ */ @@ -1188,13 +1230,13 @@ * encode this frame as an p-vop * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - } else { // (type == P_VOP || type == S_VOP) + } else { /* (type == P_VOP || type == S_VOP) */ - DPRINTF(DPRINTF_DEBUG,"*** PFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + DPRINTF(XVID_DEBUG_DEBUG,"*** PFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i\n", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - if ((pEnc->current->vop_flags & XVID_DEBUG)) { + if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "PVOP"); } @@ -1215,13 +1257,13 @@ pEnc->flush_bframes = 1; - /* packed & queued_bframes: dont bother outputting stats, we do so after the flush */ - if ((pEnc->mbParam.global_flags & XVID_PACKED) && pEnc->bframenum_tail > 0) { + /* packed & queued_bframes: dont bother outputting stats here, we do so after the flush */ + if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) { goto repeat; } - /* packed or no-bframes: output stats */ - if ((pEnc->mbParam.global_flags & XVID_PACKED) || pEnc->mbParam.max_bframes == 0) { + /* packed or no-bframes or no-bframes-queued: 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); } @@ -1239,6 +1281,24 @@ } +static void SetMacroblockQuants(MBParam * const pParam, FRAMEINFO * frame) +{ + unsigned int i,j; + int quant = frame->quant; + + 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; + } +} + + static __inline void CodeIntraMB(Encoder * pEnc, MACROBLOCK * pMB) @@ -1252,19 +1312,9 @@ pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = 0; pMB->sad16 = 0; - if ((pEnc->current->vop_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; + } } @@ -1282,7 +1332,7 @@ uint16_t x, y; - if ((pEnc->current->vol_flags & XVID_REDUCED_ENABLE)) + if ((pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE)) { mb_width = (pEnc->mbParam.width + 31) / 32; mb_height = (pEnc->mbParam.height + 31) / 32; @@ -1299,12 +1349,15 @@ 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); set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); - BitstreamPadAlways(bs); + BitstreamPad(bs); + BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); pEnc->current->sStat.iTextBits = 0; @@ -1326,7 +1379,7 @@ stop_prediction_timer(); start_timer(); - if (pEnc->current->vop_flags & XVID_GREYSCALE) + 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; @@ -1335,7 +1388,7 @@ stop_coding_timer(); } - if ((pEnc->current->vop_flags & XVID_REDUCED)) + 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, @@ -1343,21 +1396,13 @@ } emms(); - /* for divx5 compatibility, we must always pad between the packed p and b frames */ - if ((pEnc->mbParam.global_flags & XVID_PACKED) && pEnc->bframenum_tail > 0) - BitstreamPadAlways(bs); - else - BitstreamPad(bs); + BitstreamPadAlways(bs); /* next_start_code() at the end of VideoObjectPlane() */ + 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 */ } @@ -1379,190 +1424,184 @@ 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; int x, y, k; int iSearchRange; - int bIntra, skip_possible; + int bIntra=0, skip_possible; + FRAMEINFO *const current = pEnc->current; + FRAMEINFO *const reference = pEnc->reference; + MBParam * const pParam = &pEnc->mbParam; + int mb_width = pParam->mb_width; + int mb_height = pParam->mb_height; + - /* IMAGE *pCurrent = &pEnc->current->image; */ - IMAGE *pRef = &pEnc->reference->image; + /* IMAGE *pCurrent = ¤t->image; */ + IMAGE *pRef = &reference->image; - if ((pEnc->current->vop_flags & XVID_REDUCED)) + if ((current->vop_flags & XVID_VOP_REDUCED)) { - mb_width = (pEnc->mbParam.width + 31) / 32; - mb_height = (pEnc->mbParam.height + 31) / 32; + mb_width = (pParam->width + 31) / 32; + mb_height = (pParam->height + 31) / 32; } start_timer(); - image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - pEnc->mbParam.width, pEnc->mbParam.height); + image_setedges(pRef, pParam->edged_width, pParam->edged_height, + pParam->width, pParam->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; + pParam->m_rounding_type = 1 - pParam->m_rounding_type; + current->rounding_type = pParam->m_rounding_type; + current->fcode = pParam->m_fcode; if (!force_inter) iLimit = (int)(mb_width * mb_height * INTRA_THRESHOLD); else iLimit = mb_width * mb_height + 1; - if ((pEnc->current->vop_flags & XVID_HALFPEL)) { + if ((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_QUARTERPEL), - pEnc->current->rounding_type); + &pEnc->vInterHV, pParam->edged_width, + pParam->edged_height, + (pParam->vol_flags & XVID_VOL_QUARTERPEL), + current->rounding_type); stop_inter_timer(); } - pEnc->current->coding_type = P_VOP; - - start_timer(); - /*if (pEnc->current->global_flags & XVID_HINTEDME_SET) - HintedMESet(pEnc, &bIntra); - else*/ - bIntra = - MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference, - &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, - iLimit); + current->coding_type = P_VOP; - stop_motion_timer(); - if (bIntra == 1) return FrameCodeI(pEnc, bs); + SetMacroblockQuants(&pEnc->mbParam, current); - if ( ( pEnc->current->vol_flags & XVID_GMC ) - && ( (pEnc->current->warp.duv[1].x != 0) || (pEnc->current->warp.duv[1].y != 0) ) ) - { - pEnc->current->coding_type = S_VOP; + start_timer(); + if (current->vol_flags & XVID_VOL_GMC ) /* GMC only for S(GMC)-VOPs */ + { int gmcval; + current->warp = GlobalMotionEst( current->mbs, pParam, current, reference, + &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV); + + if (current->motion_flags & XVID_GME_REFINE) { + gmcval = GlobalMotionEstRefine(¤t->warp, + current->mbs, pParam, + current, reference, + ¤t->image, + &reference->image, + &pEnc->vInterH, + &pEnc->vInterV, + &pEnc->vInterHV); + gmcval += /*current->quant */ 2 * (int)(pParam->mb_width*pParam->mb_height); + } + + gmcval = globalSAD(¤t->warp, pParam, current->mbs, + current, + &reference->image, + ¤t->image, + pEnc->vGMC.y); + gmcval += /*current->quant*/ 2 * (int)(pParam->mb_width*pParam->mb_height); + +/* 1st '3': 3 warpoints, 2nd '3': 16th pel res (2<<3) */ + generate_GMCparameters( 3, 3, ¤t->warp, + pParam->width, pParam->height, + ¤t->new_gmc_data); + + if ( (gmcval<0) && ( (current->warp.duv[1].x != 0) || (current->warp.duv[1].y != 0) || + (current->warp.duv[2].x != 0) || (current->warp.duv[2].y != 0) ) ) + { + 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_QUARTERPEL), 0, - pEnc->current->rounding_type, pEnc->current->mbs, &pEnc->vGMC); + generate_GMCimage(¤t->new_gmc_data, &reference->image, + pParam->mb_width, pParam->mb_height, + pParam->edged_width, pParam->edged_width/2, + pParam->m_fcode, ((pParam->vol_flags & XVID_VOL_QUARTERPEL)?1:0), 0, + current->rounding_type, current->mbs, &pEnc->vGMC); + } else { + + generate_GMCimage(¤t->new_gmc_data, &reference->image, + pParam->mb_width, pParam->mb_height, + pParam->edged_width, pParam->edged_width/2, + pParam->m_fcode, ((pParam->vol_flags & XVID_VOL_QUARTERPEL)?1:0), 0, + current->rounding_type, current->mbs, NULL); /* no warping, just AMV */ + } } - set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); + bIntra = + MotionEstimation(&pEnc->mbParam, current, reference, + &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, + &pEnc->vGMC, iLimit); + + + stop_motion_timer(); + + if (bIntra == 1) return FrameCodeI(pEnc, bs); + + set_timecodes(current,reference,pParam->fbase); if (vol_header) { BitstreamWriteVolHeader(bs, &pEnc->mbParam); - BitstreamPadAlways(bs); + BitstreamPad(bs); } - BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); + BitstreamWriteVopHeader(bs, &pEnc->mbParam, current, 1); - 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; + current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount = + current->sStat.kblks = current->sStat.mblks = 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]; - -/* 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 */ + ¤t->mbs[x + y * pParam->mb_width]; bIntra = (pMB->mode == MODE_INTRA) || (pMB->mode == MODE_INTRA_Q); if (bIntra) { CodeIntraMB(pEnc, pMB); - MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, + MBTransQuantIntra(&pEnc->mbParam, current, pMB, x, y, dct_codes, qcoeff); start_timer(); - MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff); + MBPrediction(current, x, y, pParam->mb_width, qcoeff); stop_prediction_timer(); - pEnc->current->sStat.kblks++; + current->sStat.kblks++; - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); + MBCoding(current, pMB, qcoeff, bs, ¤t->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 & PMV_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_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; - } - } else { - pMB->mcsel = 0; /* just a precaution */ - } start_timer(); - MBMotionCompensation(pMB, x, y, &pEnc->reference->image, + MBMotionCompensation(pMB, x, y, &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_QUARTERPEL), - (pEnc->current->vop_flags & XVID_REDUCED), - pEnc->current->rounding_type); + ¤t->image, + dct_codes, pParam->width, + pParam->height, + pParam->edged_width, + (current->vol_flags & XVID_VOL_QUARTERPEL), + (current->vop_flags & XVID_VOP_REDUCED), + current->rounding_type); stop_comp_timer(); - if ((pEnc->current->vop_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; - } + if (pMB->dquant != 0) { + pMB->mode = MODE_INTER_Q; } - pMB->quant = pEnc->current->quant; pMB->field_pred = 0; if (pMB->mode != MODE_NOT_CODED) { pMB->cbp = - MBTransQuantInter(&pEnc->mbParam, pEnc->current, pMB, x, y, + MBTransQuantInter(&pEnc->mbParam, 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++; + current->sStat.mblks++; } else { - pEnc->current->sStat.ublks++; + current->sStat.ublks++; } start_timer(); @@ -1570,12 +1609,12 @@ /* Finished processing the MB, now check if to CODE or SKIP */ skip_possible = (pMB->cbp == 0) && (pMB->mode == MODE_INTER) && - (pMB->dquant == NO_CHANGE); + (pMB->dquant == 0); - if (pEnc->current->coding_type == S_VOP) + if (current->coding_type == S_VOP) skip_possible &= (pMB->mcsel == 1); - else if (pEnc->current->coding_type == P_VOP) { - if ((pEnc->mbParam.vol_flags & XVID_QUARTERPEL)) + else if (current->coding_type == P_VOP) { + if ((pParam->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) ); @@ -1585,16 +1624,16 @@ /* 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 */ + if (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); + iSAD = sad16(reference->image.y + 16*y*pParam->edged_width + 16*x, + pEnc->bframes[k]->image.y + 16*y*pParam->edged_width + 16*x, + pParam->edged_width,BFRAME_SKIP_THRESHHOLD); if (iSAD >= BFRAME_SKIP_THRESHHOLD * pMB->quant) { bSkip = 0; break; @@ -1602,19 +1641,19 @@ } if (!bSkip) { /* no SKIP, but trivial block */ - if((pEnc->mbParam.vol_flags & XVID_QUARTERPEL)) { - VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); + if((pParam->vol_flags & XVID_VOL_QUARTERPEL)) { + VECTOR predMV = get_qpmv2(current->mbs, pParam->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); + VECTOR predMV = get_pmv2(current->mbs, pParam->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); + MBCoding(current, pMB, qcoeff, bs, ¤t->sStat); stop_coding_timer(); continue; /* next MB */ @@ -1629,22 +1668,22 @@ } /* ordinary case: normal coded INTER/INTER4V block */ - if ((pEnc->current->vop_flags & XVID_GREYSCALE)) + if ((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_QUARTERPEL)) { - VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); + if((pParam->vol_flags & XVID_VOL_QUARTERPEL)) { + VECTOR predMV = get_qpmv2(current->mbs, pParam->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); + DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y); } else { - VECTOR predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); + VECTOR predMV = get_pmv2(current->mbs, pParam->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); + DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y); } @@ -1652,110 +1691,102 @@ { int k; for (k=1;k<4;k++) { - if((pEnc->mbParam.vol_flags & XVID_QUARTERPEL)) { - VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, k); + if((pParam->vol_flags & XVID_VOL_QUARTERPEL)) { + VECTOR predMV = get_qpmv2(current->mbs, pParam->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); + DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", 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); + VECTOR predMV = get_pmv2(current->mbs, pParam->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); + DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", 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); + MBCoding(current, pMB, qcoeff, bs, &pEnc->current->sStat); stop_coding_timer(); } } - if ((pEnc->current->vop_flags & XVID_REDUCED)) + if ((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, + image_deblock_rrv(¤t->image, pParam->edged_width, + current->mbs, mb_width, mb_height, pParam->mb_width, 16, 0); } emms(); - /* XXX: hinted me - if (pEnc->current->global_flags & XVID_HINTEDME_GET) { - HintedMEGet(pEnc, 0); - }*/ - - if (pEnc->current->sStat.iMvCount == 0) - pEnc->current->sStat.iMvCount = 1; + if (current->sStat.iMvCount == 0) + current->sStat.iMvCount = 1; - fSigma = (float) sqrt((float) pEnc->current->sStat.iMvSum / pEnc->current->sStat.iMvCount); + fSigma = (float) sqrt((float) current->sStat.iMvSum / current->sStat.iMvCount); - iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode); + iSearchRange = 1 << (3 + pParam->m_fcode); if ((fSigma > iSearchRange / 3) - && (pEnc->mbParam.m_fcode <= (3 + (pEnc->mbParam.vol_flags & XVID_QUARTERPEL?1:0) ))) /* maximum search range 128 */ + && (pParam->m_fcode <= (3 + (pParam->vol_flags & XVID_VOL_QUARTERPEL?1:0) ))) /* maximum search range 128 */ { - pEnc->mbParam.m_fcode++; + pParam->m_fcode++; iSearchRange *= 2; } else if ((fSigma < iSearchRange / 6) && (pEnc->fMvPrevSigma >= 0) && (pEnc->fMvPrevSigma < iSearchRange / 6) - && (pEnc->mbParam.m_fcode >= (2 + (pEnc->mbParam.vol_flags & XVID_QUARTERPEL?1:0) ))) /* minimum search range 16 */ + && (pParam->m_fcode >= (2 + (pParam->vol_flags & XVID_VOL_QUARTERPEL?1:0) ))) /* minimum search range 16 */ { - pEnc->mbParam.m_fcode--; + pParam->m_fcode--; iSearchRange /= 2; } pEnc->fMvPrevSigma = fSigma; /* frame drop code */ - 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) +#if 0 + DPRINTF(XVID_DEBUG_DEBUG, "kmu %i %i %i\n", current->sStat.kblks, current->sStat.mblks, current->sStat.ublks); +#endif + if (current->sStat.kblks + current->sStat.mblks < + (pParam->frame_drop_ratio * mb_width * mb_height) / 100) { - pEnc->current->sStat.kblks = pEnc->current->sStat.mblks = 0; - pEnc->current->sStat.ublks = mb_width * mb_height; + current->sStat.kblks = current->sStat.mblks = 0; + 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); + set_timecodes(current,reference,pParam->fbase); + BitstreamWriteVopHeader(bs, &pEnc->mbParam, current, 0); /* 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) * mb_width * mb_height); + current->quant = reference->quant; + current->motion_flags = reference->motion_flags; + current->rounding_type = reference->rounding_type; + current->fcode = reference->fcode; + current->bcode = reference->bcode; + image_copy(¤t->image, &reference->image, pParam->edged_width, pParam->height); + memcpy(current->mbs, reference->mbs, sizeof(MACROBLOCK) * mb_width * mb_height); } /* 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); + image_dump_yuvpgm(¤t->image, + pParam->edged_width, + pParam->width, pParam->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); + image_dump_yuvpgm(&reference->image, + pParam->edged_width, + pParam->width, pParam->height, s); } */ - /* for divx5 compatibility, we must always pad between the packed p and b frames */ - if ((pEnc->mbParam.global_flags & XVID_PACKED) && pEnc->bframenum_tail > 0) - BitstreamPadAlways(bs); - else - BitstreamPad(bs); + BitstreamPadAlways(bs); /* next_start_code() at the end of VideoObjectPlane() */ - pEnc->current->length = (BitstreamPos(bs) - bits) / 8; + current->length = (BitstreamPos(bs) - bits) / 8; return 0; /* inter */ } @@ -1781,15 +1812,13 @@ fprintf(fp,"Y=%3d X=%3d MB=%2d CBP=%02X\n",y,x,mb->mode,mb->cbp); \ } - /* XXX: pEnc->current->global_flags &= ~XVID_REDUCED; reduced resoltion not yet supported */ + /* XXX: pEnc->current->global_flags &= ~XVID_VOP_REDUCED; reduced resoltion not yet supported */ if (!first){ fp=fopen("C:\\XVIDDBGE.TXT","w"); } #endif - //frame->quarterpel = pEnc->mbParam.m_quarterpel; - /* forward */ image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, @@ -1797,7 +1826,7 @@ start_timer(); image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - (pEnc->mbParam.vol_flags & XVID_QUARTERPEL), 0); + (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0); stop_inter_timer(); /* backward */ @@ -1807,11 +1836,10 @@ start_timer(); image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - (pEnc->mbParam.vol_flags & XVID_QUARTERPEL), 0); + (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0); stop_inter_timer(); start_timer(); - MotionEstimationBVOP(&pEnc->mbParam, frame, ((int32_t)(pEnc->current->stamp - frame->stamp)), /* time_bp */ ((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), /* time_pp */ @@ -1819,16 +1847,8 @@ &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, 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); - } - */ - frame->coding_type = B_VOP; set_timecodes(frame, pEnc->reference,pEnc->mbParam.fbase); @@ -1844,7 +1864,7 @@ for (y = 0; y < pEnc->mbParam.mb_height; y++) { for (x = 0; x < pEnc->mbParam.mb_width; x++) { MACROBLOCK * const mb = &frame->mbs[x + y * pEnc->mbParam.mb_width]; - int direction = frame->vop_flags & XVID_ALTERNATESCAN ? 2 : 0; + int direction = frame->vop_flags & XVID_VOP_ALTERNATESCAN ? 2 : 0; /* decoder ignores mb when refence block is INTER(0,0), CBP=0 */ if (mb->mode == MODE_NOT_CODED) { @@ -1852,7 +1872,7 @@ continue; } - if (mb->mode != MODE_DIRECT_NONE_MV) { + 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, @@ -1862,8 +1882,8 @@ if (mb->mode == MODE_DIRECT_NO4V) mb->mode = MODE_DIRECT; mb->quant = frame->quant; - mb->cbp = - MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, x, y, dct_codes, qcoeff); + if (mb->mode != MODE_DIRECT_NONE_MV) + mb->cbp = MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, x, y, dct_codes, qcoeff); if ( (mb->mode == MODE_DIRECT) && (mb->cbp == 0) && (mb->pmvs[3].x == 0) && (mb->pmvs[3].y == 0) ) { @@ -1885,7 +1905,7 @@ /* TODO: dynamic fcode/bcode ??? */ - BitstreamPad(bs); + BitstreamPadAlways(bs); /* next_start_code() at the end of VideoObjectPlane() */ frame->length = (BitstreamPos(bs) - bits) / 8; #ifdef BFRAMES_DEC_DEBUG