--- branches/dev-api-4/xvidcore/src/encoder.c 2003/06/09 13:55:56 1054 +++ branches/dev-api-4/xvidcore/src/encoder.c 2003/08/26 14:07:11 1131 @@ -21,7 +21,7 @@ * 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.27 2003-06-09 13:50:34 edgomez Exp $ + * $Id: encoder.c,v 1.95.2.40 2003-08-26 14:07:11 edgomez Exp $ * ****************************************************************************/ @@ -38,13 +38,14 @@ #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" @@ -114,9 +115,9 @@ enc_create(xvid_enc_create_t * create) { Encoder *pEnc; - int n; + int n; - if (XVID_MAJOR(create->version) != 1) /* v1.x.x */ + if (XVID_VERSION_MAJOR(create->version) != 1) /* v1.x.x */ return XVID_ERR_VERSION; if (create->width%2 || create->height%2) @@ -206,8 +207,9 @@ 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; } - /* XXX: error checking */ /* bframes */ pEnc->mbParam.max_bframes = MAX(create->max_bframes, 0); @@ -224,20 +226,7 @@ pEnc->mbParam.frame_drop_ratio = MAX(create->frame_drop_ratio, 0); /* max keyframe interval */ - pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ? - 10 * pEnc->mbParam.fbase / pEnc->mbParam.fincr : create->max_key_interval; - - /* 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 * (int)pEnc->mbParam.fbase) / (int)pEnc->mbParam.fincr : create->max_key_interval; /* allocate working frame-image memory */ @@ -510,6 +499,7 @@ xvid_free(pEnc->current); xvid_free(pEnc->reference); + xvid_err_memory1a: if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) { xvid_free(pEnc->temp_dquants); } @@ -698,16 +688,18 @@ data.frame_num = frame->frame_num; if (opt == XVID_PLG_BEFORE) { - data.type = XVID_TYPE_AUTO; - data.quant = 0; + 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); } - - /* todo: [vol,vop,motion]_flags*/ + + data.vol_flags = frame->vol_flags; + data.vop_flags = frame->vop_flags; + data.motion_flags = frame->motion_flags; } else { /* XVID_PLG_AFTER */ if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) { @@ -748,7 +740,7 @@ 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.dquant[j*data.dquant_stride + i] = frame->mbs[j*pEnc->mbParam.mb_width + i].dquant; } } @@ -778,7 +770,7 @@ } /* call plugins */ - for (i=0; inum_plugins;i++) { + for (i=0; i<(unsigned int)pEnc->num_plugins;i++) { emms(); if (pEnc->plugins[i].func) { if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, 0) < 0) { @@ -804,7 +796,10 @@ frame->mbs[j*pEnc->mbParam.mb_width + i].dquant = 0; } } - /* todo: [vol,vop,motion]_flags*/ + + frame->vol_flags = data.vol_flags; + frame->vop_flags = data.vop_flags; + frame->motion_flags = data.motion_flags; } } @@ -871,7 +866,7 @@ int type; Bitstream bs; - if (XVID_MAJOR(xFrame->version) != 1 || (stats && XVID_MAJOR(stats->version) != 1)) /* v1.x.x */ + if (XVID_VERSION_MAJOR(xFrame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1)) /* v1.x.x */ return XVID_ERR_VERSION; xFrame->out_flags = 0; @@ -908,13 +903,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; } @@ -1200,9 +1195,25 @@ 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; + switch(frame->par) { + case XVID_PAR_11_VGA: + case XVID_PAR_43_PAL: + case XVID_PAR_43_NTSC: + case XVID_PAR_169_PAL: + case XVID_PAR_169_NTSC: + case XVID_PAR_EXT: + pEnc->mbParam.par = frame->par; + break; + default: + pEnc->mbParam.par = XVID_PAR_EXT; + break; + } + pEnc->mbParam.par_width = (frame->par_width)?frame->par_width:1; + pEnc->mbParam.par_height = (frame->par_height)?frame->par_height:1; if ((pEnc->mbParam.vol_flags & XVID_VOL_MPEGQUANT)) { if (frame->quant_intra_matrix != NULL) @@ -1256,7 +1267,7 @@ * on next enc_encode call we must flush bframes * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ -done_flush: +/*done_flush:*/ pEnc->flush_bframes = 1; @@ -1288,6 +1299,10 @@ { unsigned int i,j; int quant = frame->quant; + if (quant > 31) + frame->quant = quant = 31; + else if (quant < 1) + frame->quant = quant = 1; for (j=0; jmb_height; j++) for (i=0; imb_width; i++) { @@ -1295,7 +1310,7 @@ quant += pMB->dquant; if (quant > 31) quant = 31; - if (quant < 1) + else if (quant < 1) quant = 1; pMB->quant = quant; } @@ -1359,7 +1374,8 @@ 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; @@ -1398,26 +1414,13 @@ } emms(); -/* 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 + 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 */ } @@ -1439,164 +1442,168 @@ 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; - if ((pEnc->current->vop_flags & XVID_VOP_REDUCED)) + /* IMAGE *pCurrent = ¤t->image; */ + IMAGE *pRef = &reference->image; + + 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_VOP_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_VOL_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; + current->coding_type = P_VOP; - SetMacroblockQuants(&pEnc->mbParam, pEnc->current); - + SetMacroblockQuants(&pEnc->mbParam, current); + 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); + 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_ME_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); - stop_motion_timer(); + 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; - if (bIntra == 1) return FrameCodeI(pEnc, bs); + 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); - 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; + } 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 */ + } + } - 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); + bIntra = + MotionEstimation(&pEnc->mbParam, current, reference, + &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, + &pEnc->vGMC, iLimit); - } - set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); + 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); + 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(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 & 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; - } - } 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_VOL_QUARTERPEL), - (pEnc->current->vop_flags & XVID_VOP_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(); @@ -1608,16 +1615,16 @@ 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(); @@ -1627,10 +1634,10 @@ skip_possible = (pMB->cbp == 0) && (pMB->mode == MODE_INTER) && (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_VOL_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) ); @@ -1640,16 +1647,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; @@ -1657,19 +1664,19 @@ } 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); + 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 */ @@ -1684,19 +1691,19 @@ } /* ordinary case: normal coded INTER/INTER4V block */ - if ((pEnc->current->vop_flags & XVID_VOP_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_VOL_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(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(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); @@ -1707,13 +1714,13 @@ { 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); + 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(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(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); @@ -1722,44 +1729,39 @@ } } - 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_VOP_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 (current->sStat.iMvCount == 0) + current->sStat.iMvCount = 1; - if (pEnc->current->sStat.iMvCount == 0) - pEnc->current->sStat.iMvCount = 1; + fSigma = (float) sqrt((float) current->sStat.iMvSum / current->sStat.iMvCount); - fSigma = (float) sqrt((float) pEnc->current->sStat.iMvSum / pEnc->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_VOL_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_VOL_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; } @@ -1767,57 +1769,47 @@ /* frame drop code */ #if 0 - DPRINTF(XVID_DEBUG_DEBUG, "kmu %i %i %i\n", pEnc->current->sStat.kblks, pEnc->current->sStat.mblks, pEnc->current->sStat.ublks); + DPRINTF(XVID_DEBUG_DEBUG, "kmu %i %i %i\n", current->sStat.kblks, current->sStat.mblks, current->sStat.ublks); #endif - if (pEnc->current->sStat.kblks + pEnc->current->sStat.mblks < - (pEnc->mbParam.frame_drop_ratio * mb_width * mb_height) / 100) + 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); } */ -/* 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 + 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 */ } @@ -1850,8 +1842,6 @@ } #endif - /* frame->quarterpel = pEnc->mbParam.m_quarterpel; */ - /* forward */ image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, @@ -1873,7 +1863,6 @@ 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 */ @@ -1881,16 +1870,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); @@ -1933,9 +1914,12 @@ } } -#ifdef BFRAMES_DEC_DEBUG - BFRAME_DEBUG -#endif + /* keep only bits 5-2 -- Chroma blocks will just be skipped by the + * coding function for BFrames, that's why we don't zero teh DC + * coeffs */ + if ((frame->vop_flags & XVID_VOP_GREYSCALE)) + mb->cbp &= 0x3C; + start_timer(); MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs, &frame->sStat, direction); @@ -1947,7 +1931,7 @@ /* TODO: dynamic fcode/bcode ??? */ - BitstreamPadAlways(bs); + BitstreamPadAlways(bs); /* next_start_code() at the end of VideoObjectPlane() */ frame->length = (BitstreamPos(bs) - bits) / 8; #ifdef BFRAMES_DEC_DEBUG