--- encoder.c 2002/12/13 11:54:17 1.76.2.30 +++ encoder.c 2002/09/05 19:34:35 1.80 @@ -1,7 +1,9 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Encoder main module - + * - Encoder main module - + * + * Copyright(C) 2002 Michael Militzer * * 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 @@ -26,24 +28,10 @@ * 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.76.2.30 2002/12/13 11:54:17 syskin Exp $ + * $Id: encoder.c,v 1.80 2002/09/05 19:34:35 edgomez Exp $ * ****************************************************************************/ - #include #include #include @@ -54,8 +42,6 @@ #include "global.h" #include "utils/timer.h" #include "image/image.h" -#include "image/font.h" -#include "motion/sad.h" #include "motion/motion.h" #include "bitstream/cbp.h" #include "utils/mbfunctions.h" @@ -68,6 +54,9 @@ #include "quant/quant_matrix.h" #include "utils/mem_align.h" +#ifdef _SMP +#include "motion/smp_motion_est.h" +#endif /***************************************************************************** * Local macros ****************************************************************************/ @@ -89,11 +78,6 @@ bool force_inter, bool vol_header); -static void FrameCodeB(Encoder * pEnc, - FRAMEINFO * frame, - Bitstream * bs, - uint32_t * pBits); - /***************************************************************************** * Local data ****************************************************************************/ @@ -107,12 +91,19 @@ }; +static void __inline +image_null(IMAGE * image) +{ + image->y = image->u = image->v = NULL; +} + + /***************************************************************************** * Encoder creation * * This function creates an Encoder instance, it allocates all necessary - * image buffers (reference, current and bframes) and initialize the internal - * xvid encoder paremeters according to the XVID_ENC_PARAM input parameter. + * image buffers (reference, current) and initialize the internal xvid + * encoder paremeters according to the XVID_ENC_PARAM input parameter. * * The code seems to be very long but is very basic, mainly memory allocation * and cleaning code. @@ -224,14 +215,18 @@ pEnc->mbParam.m_quant_type = H263_QUANT; - pEnc->fMvPrevSigma = -1; +#ifdef _SMP + pEnc->mbParam.num_threads = MIN(pParam->num_threads, MAXNUMTHREADS); +#endif + + pEnc->sStat.fMvPrevSigma = -1; /* Fill rate control parameters */ pEnc->bitrate = pParam->rc_bitrate; pEnc->iFrameNum = 0; - pEnc->mbParam.iMaxKeyInterval = pParam->max_key_interval; + pEnc->iMaxKeyInterval = pParam->max_key_interval; /* try to allocate frame memory */ @@ -258,11 +253,6 @@ #ifdef _DEBUG_PSNR image_null(&pEnc->sOriginal); #endif - - image_null(&pEnc->f_refh); - image_null(&pEnc->f_refv); - image_null(&pEnc->f_refhv); - image_null(&pEnc->current->image); image_null(&pEnc->reference->image); image_null(&pEnc->vInterH); @@ -277,20 +267,6 @@ pEnc->mbParam.edged_height) < 0) goto xvid_err_memory3; #endif - - if (image_create - (&pEnc->f_refh, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height) < 0) - goto xvid_err_memory3; - if (image_create - (&pEnc->f_refv, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height) < 0) - goto xvid_err_memory3; - if (image_create - (&pEnc->f_refhv, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height) < 0) - goto xvid_err_memory3; - if (image_create (&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) @@ -320,94 +296,6 @@ pEnc->mbParam.edged_height) < 0) goto xvid_err_memory3; - - - /* B Frames specific init */ - - pEnc->mbParam.global = pParam->global; - pEnc->mbParam.max_bframes = pParam->max_bframes; - pEnc->mbParam.bquant_ratio = pParam->bquant_ratio; - pEnc->mbParam.bquant_offset = pParam->bquant_offset; - pEnc->mbParam.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 *), - CACHE_LINE); - - if (pEnc->bframes == NULL) - goto xvid_err_memory3; - - for (n = 0; n < pEnc->mbParam.max_bframes; n++) - pEnc->bframes[n] = NULL; - - - for (n = 0; n < pEnc->mbParam.max_bframes; n++) { - pEnc->bframes[n] = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE); - - if (pEnc->bframes[n] == NULL) - goto xvid_err_memory4; - - pEnc->bframes[n]->mbs = - xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * - pEnc->mbParam.mb_height, CACHE_LINE); - - if (pEnc->bframes[n]->mbs == NULL) - goto xvid_err_memory4; - - image_null(&pEnc->bframes[n]->image); - - if (image_create - (&pEnc->bframes[n]->image, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height) < 0) - goto xvid_err_memory4; - - } - } - - 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; - - pEnc->queue = - xvid_malloc(pEnc->mbParam.max_bframes * sizeof(IMAGE), - CACHE_LINE); - - 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; n++) { - if (image_create - (&pEnc->queue[n], 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; - - pEnc->mbParam.m_stamp = 0; - - pEnc->m_framenum = 0; - pEnc->current->stamp = 0; - pEnc->reference->stamp = 0; - pParam->handle = (void *) pEnc; if (pParam->rc_bitrate) { @@ -426,52 +314,12 @@ * We handle all XVID_ERR_MEMORY here, this makes the code lighter */ - xvid_err_memory5: - - - if (pEnc->mbParam.max_bframes > 0) { - - for (i = 0; i < pEnc->mbParam.max_bframes; i++) { - image_destroy(&pEnc->queue[i], pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height); - } - xvid_free(pEnc->queue); - } - - xvid_err_memory4: - - if (pEnc->mbParam.max_bframes > 0) { - - for (i = 0; i < pEnc->mbParam.max_bframes; i++) { - - if (pEnc->bframes[i] == NULL) - continue; - - image_destroy(&pEnc->bframes[i]->image, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height); - - xvid_free(pEnc->bframes[i]->mbs); - - xvid_free(pEnc->bframes[i]); - - } - - xvid_free(pEnc->bframes); - } - xvid_err_memory3: #ifdef _DEBUG_PSNR image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); #endif - 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); - image_destroy(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->reference->image, pEnc->mbParam.edged_width, @@ -515,43 +363,10 @@ int encoder_destroy(Encoder * pEnc) { - int i; ENC_CHECK(pEnc); - /* B Frames specific */ - if (pEnc->mbParam.max_bframes > 0) { - - for (i = 0; i < pEnc->mbParam.max_bframes; i++) { - - image_destroy(&pEnc->queue[i], pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height); - } - xvid_free(pEnc->queue); - } - - - if (pEnc->mbParam.max_bframes > 0) { - - for (i = 0; i < pEnc->mbParam.max_bframes; i++) { - - if (pEnc->bframes[i] == NULL) - continue; - - image_destroy(&pEnc->bframes[i]->image, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height); - - xvid_free(pEnc->bframes[i]->mbs); - - xvid_free(pEnc->bframes[i]); - } - - xvid_free(pEnc->bframes); - - } - /* All images, reference, current etc ... */ - image_destroy(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->reference->image, pEnc->mbParam.edged_width, @@ -567,20 +382,12 @@ image_destroy(&pEnc->vInterHVf, 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); - #ifdef _DEBUG_PSNR image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); #endif /* Encoder structure */ - xvid_free(pEnc->current->mbs); xvid_free(pEnc->current); @@ -593,529 +400,13 @@ } -static __inline void inc_frame_num(Encoder * pEnc) +void inc_frame_num(Encoder * pEnc) { - pEnc->current->stamp = pEnc->mbParam.m_stamp; // first frame is zero - pEnc->mbParam.m_stamp += pEnc->mbParam.fincr; -} - - -static __inline void -queue_image(Encoder * pEnc, XVID_ENC_FRAME * pFrame) -{ - if (pEnc->queue_size >= pEnc->mbParam.max_bframes) - { - DPRINTF(DPRINTF_DEBUG,"FATAL: QUEUE FULL"); - return; - } - - 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); - - - start_timer(); - if (image_input - (&pEnc->queue[pEnc->queue_tail], pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING)) - 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); - -*/ -} - - - -/* convert pFrame->intra to coding_type */ -static int intra2coding_type(int intra) -{ - if (intra < 0) return -1; - if (intra == 1) return I_VOP; - if (intra == 2) return B_VOP; - - return P_VOP; -} - - - -/***************************************************************************** - * 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 - ****************************************************************************/ - -int -encoder_encode_bframes(Encoder * pEnc, - XVID_ENC_FRAME * pFrame, - XVID_ENC_STATS * pResult) -{ - uint16_t x, y; - Bitstream bs; - uint32_t bits, mode; - - int input_valid = 1; - int bframes_count = 0; - -#ifdef _DEBUG_PSNR - float psnr; - char temp[128]; -#endif - - ENC_CHECK(pEnc); - ENC_CHECK(pFrame); - ENC_CHECK(pFrame->image); - - start_global_timer(); - - 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); - - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); - - FrameCodeP(pEnc, &bs, &bits, 1, 0); - bframes_count = 0; - - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - pFrame->intra = 0; - - emms(); - - return XVID_ERR_OK; - } - - - 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); - - FrameCodeB(pEnc, pEnc->bframes[pEnc->bframenum_head], &bs, &bits); - pEnc->bframenum_head++; - - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - pFrame->intra = 2; - - if (input_valid) - queue_image(pEnc, pFrame); - - emms(); - - return XVID_ERR_OK; - } - - if (pEnc->bframenum_head > 0) { - pEnc->bframenum_head = pEnc->bframenum_tail = 0; - - /* 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 & XVID_GLOBAL_PACKED)) { - int tmp; - - 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); - - BitstreamPad(&bs); - - tmp = pEnc->current->seconds; - pEnc->current->seconds = 0; /* force time_base = 0 */ - BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); - pEnc->current->seconds = tmp; - - pFrame->length = BitstreamLength(&bs); - pFrame->intra = 4; - - if (input_valid) - queue_image(pEnc, pFrame); - - emms(); - - return XVID_ERR_OK; - } - } - - -bvop_loop: - - if (pEnc->bframenum_dx50bvop != -1) - { - - SWAP(pEnc->current, pEnc->reference); - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_dx50bvop]); - - if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "DX50 IVOP"); - } - - if (input_valid) - { - queue_image(pEnc, pFrame); - input_valid = 0; - } - - } else if (input_valid) { - - SWAP(pEnc->current, pEnc->reference); - - start_timer(); - if (image_input - (&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING)) - { - emms(); - return XVID_ERR_FORMAT; - } - stop_conv_timer(); - - // 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]); - } - pEnc->queue_head = (pEnc->queue_head + 1) % pEnc->mbParam.max_bframes; - pEnc->queue_tail = (pEnc->queue_tail + 1) % pEnc->mbParam.max_bframes; - } - - } else if (pEnc->queue_size > 0) { - - SWAP(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--; - - } else { - - /* if nothing was encoded, write an 'ignore this frame' flag - to the bitstream */ - - 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); - - BitstreamPutBits(&bs, 0x7f, 8); - pFrame->intra = 5; - } - - pFrame->length = BitstreamLength(&bs); - emms(); - return XVID_ERR_OK; - } - - pEnc->flush_bframes = 0; - - emms(); - - // only inc frame num, adapt quant, etc. if we havent seen it before - if (pEnc->bframenum_dx50bvop < 0 ) - { - mode = intra2coding_type(pFrame->intra); - if (pFrame->quant == 0) - pEnc->current->quant = RateControlGetQ(&pEnc->rate_control, 0); - else - pEnc->current->quant = pFrame->quant; - -/* if (pEnc->current->quant < 1) - pEnc->current->quant = 1; - - if (pEnc->current->quant > 31) - pEnc->current->quant = 31; -*/ - pEnc->current->global_flags = pFrame->general; - pEnc->current->motion_flags = pFrame->motion; - - /* ToDo : dynamic fcode (in both directions) */ - pEnc->current->fcode = pEnc->mbParam.m_fcode; - pEnc->current->bcode = pEnc->mbParam.m_fcode; - - inc_frame_num(pEnc); - -#ifdef _DEBUG_PSNR - image_copy(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.height); -#endif - - emms(); - - if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 5, - "%i if:%i st:%i", pEnc->m_framenum++, pEnc->iFrameNum, pEnc->current->stamp); - } - - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - * Luminance masking - * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - - 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); - } - - } - - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - * ivop/pvop/bvop selection - * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - pEnc->iFrameNum++; - - if (pEnc->iFrameNum == 0 || pEnc->bframenum_dx50bvop >= 0 || - (mode < 0 && pEnc->mbParam.iMaxKeyInterval > 0 && - pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval)) - { - mode = I_VOP; - }else{ - mode = MEanalysis(&pEnc->reference->image, pEnc->current, - &pEnc->mbParam, pEnc->mbParam.iMaxKeyInterval, - (mode < 0) ? pEnc->iFrameNum : 0, - bframes_count++); - } - - if (mode == I_VOP) { - /* - * This will be coded as an Intra Frame - */ - if ((pEnc->current->global_flags & XVID_QUARTERPEL)) - pEnc->mbParam.m_quarterpel = 1; - else - pEnc->mbParam.m_quarterpel = 0; - - if (pEnc->current->global_flags & XVID_MPEGQUANT) pEnc->mbParam.m_quant_type = MPEG4_QUANT; - - if ((pEnc->current->global_flags & XVID_CUSTOM_QMATRIX) > 0) { - if (pFrame->quant_intra_matrix != NULL) - set_intra_matrix(pFrame->quant_intra_matrix); - if (pFrame->quant_inter_matrix != NULL) - set_inter_matrix(pFrame->quant_inter_matrix); - } - - - 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->mbParam.global & XVID_GLOBAL_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->mbParam.global & XVID_GLOBAL_DX50BVOP) && pEnc->bframenum_tail > 0) { - - pEnc->bframenum_tail--; - pEnc->bframenum_dx50bvop = pEnc->bframenum_tail; - - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_dx50bvop]); - if ((pEnc->mbParam.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); - bframes_count = 0; - - pFrame->intra = 0; - - } else { - - FrameCodeI(pEnc, &bs, &bits); - bframes_count = 0; - pFrame->intra = 1; - - pEnc->bframenum_dx50bvop = -1; - } - - pEnc->flush_bframes = 1; - - if ((pEnc->mbParam.global & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) { - BitstreamPadAlways(&bs); - input_valid = 0; - goto ipvop_loop; - } - - /* - * NB : sequences like "IIBB" decode fine with msfdam but, - * go screwy with divx 5.00 - */ - } else if (mode == P_VOP || pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { - /* - * This will be coded as a Predicted Frame - */ - - 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->mbParam.global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "PVOP"); - } - - FrameCodeP(pEnc, &bs, &bits, 1, 0); - bframes_count = 0; - pFrame->intra = 0; - pEnc->flush_bframes = 1; - - if ((pEnc->mbParam.global & XVID_GLOBAL_PACKED) && (pEnc->bframenum_tail > 0)) { - BitstreamPadAlways(&bs); - input_valid = 0; - goto ipvop_loop; - } - - } else { /* mode == B_VOP */ - /* - * This will be coded as a Bidirectional Frame - */ - - if ((pEnc->mbParam.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->mbParam.bquant_ratio) / 2) + pEnc->mbParam.bquant_offset)/100; - - } else { - pEnc->current->quant = pFrame->bquant; - } - - 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\n", - pEnc->bframenum_head, pEnc->bframenum_tail, - pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size,pEnc->current->quant); - - /* store frame into bframe buffer & swap ref back to current */ - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); - SWAP(pEnc->current, pEnc->reference); - - pEnc->bframenum_tail++; - -// bframe report by koepi - pFrame->intra = 2; - pFrame->length = 0; - - input_valid = 0; - goto bvop_loop; - } - - BitstreamPad(&bs); - pFrame->length = BitstreamLength(&bs); - - if (pResult) { - pResult->quant = pEnc->current->quant; - pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); - pResult->kblks = pEnc->current->sStat.kblks; - pResult->mblks = pEnc->current->sStat.mblks; - pResult->ublks = pEnc->current->sStat.ublks; - } - - 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); - } - - stop_global_timer(); - write_timer(); - - emms(); - return XVID_ERR_OK; + pEnc->mbParam.m_ticks += pEnc->mbParam.fincr; + pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase; + pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase; } - - /***************************************************************************** * "original" IP frame encoder entry point * @@ -1151,21 +442,14 @@ pEnc->current->global_flags = pFrame->general; pEnc->current->motion_flags = pFrame->motion; + pEnc->current->seconds = pEnc->mbParam.m_seconds; + pEnc->current->ticks = pEnc->mbParam.m_ticks; pEnc->mbParam.hint = &pFrame->hint; - inc_frame_num(pEnc); - - /* disable alternate scan flag if interlacing is not enabled */ - if ((pEnc->current->global_flags & XVID_ALTERNATESCAN) && - !(pEnc->current->global_flags & XVID_INTERLACING)) - { - pEnc->current->global_flags -= XVID_ALTERNATESCAN; - } - start_timer(); if (image_input (&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING) < 0) + pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace) < 0) return XVID_ERR_FORMAT; stop_conv_timer(); @@ -1184,11 +468,6 @@ pEnc->current->quant = pFrame->quant; } - if ((pEnc->current->global_flags & XVID_QUARTERPEL)) - pEnc->mbParam.m_quarterpel = 1; - else - pEnc->mbParam.m_quarterpel = 0; - if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { int *temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * @@ -1250,8 +529,8 @@ if (pFrame->intra < 0) { if ((pEnc->iFrameNum == 0) - || ((pEnc->mbParam.iMaxKeyInterval > 0) - && (pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval))) { + || ((pEnc->iMaxKeyInterval > 0) + && (pEnc->iFrameNum >= pEnc->iMaxKeyInterval))) { pFrame->intra = FrameCodeI(pEnc, &bs, &bits); } else { pFrame->intra = FrameCodeP(pEnc, &bs, &bits, 0, write_vol_header); @@ -1272,10 +551,10 @@ if (pResult) { pResult->quant = pEnc->current->quant; - pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); - pResult->kblks = pEnc->current->sStat.kblks; - pResult->mblks = pEnc->current->sStat.mblks; - pResult->ublks = pEnc->current->sStat.ublks; + pResult->hlength = pFrame->length - (pEnc->sStat.iTextBits / 8); + pResult->kblks = pEnc->sStat.kblks; + pResult->mblks = pEnc->sStat.mblks; + pResult->ublks = pEnc->sStat.ublks; } emms(); @@ -1294,6 +573,7 @@ DEBUG(temp); #endif + inc_frame_num(pEnc); pEnc->iFrameNum++; stop_global_timer(); @@ -1533,56 +813,29 @@ Bitstream * bs, uint32_t * pBits) { - 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; - if ((pEnc->current->global_flags & XVID_REDUCED)) - { - 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->iFrameNum = 0; pEnc->mbParam.m_rounding_type = 1; pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type; - pEnc->current->quarterpel = pEnc->mbParam.m_quarterpel; pEnc->current->coding_type = I_VOP; BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); - /* XXX: move this stuff to BitstreamWriteVolHeader */ -#define DIVX501B481P "DivX501b481p" - if ((pEnc->mbParam.global & XVID_GLOBAL_PACKED)) { - BitstreamWriteUserData(bs, DIVX501B481P, strlen(DIVX501B481P)); - } - -#define XVID_ID "XviD" XVID_BS_VERSION - BitstreamWriteUserData(bs, XVID_ID, strlen(XVID_ID)); - - set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); *pBits = BitstreamPos(bs); - pEnc->current->sStat.iTextBits = 0; - pEnc->current->sStat.kblks = mb_width * mb_height; - pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0; + pEnc->sStat.iTextBits = 0; + pEnc->sStat.kblks = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height; + pEnc->sStat.mblks = pEnc->sStat.ublks = 0; - for (y = 0; y < mb_height; y++) - for (x = 0; x < mb_width; x++) { + 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]; @@ -1601,19 +854,16 @@ 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); + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); stop_coding_timer(); } - if ((pEnc->current->global_flags & XVID_REDUCED)) - { - image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, - pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width); - } emms(); *pBits = BitstreamPos(bs) - *pBits; - pEnc->fMvPrevSigma = -1; + pEnc->sStat.fMvPrevSigma = -1; + pEnc->sStat.iMvSum = 0; + pEnc->sStat.iMvCount = 0; pEnc->mbParam.m_fcode = 2; if (pEnc->current->global_flags & XVID_HINTEDME_GET) { @@ -1625,7 +875,6 @@ #define INTRA_THRESHOLD 0.5 -#define BFRAME_SKIP_THRESHHOLD 30 static int FrameCodeP(Encoder * pEnc, @@ -1639,88 +888,81 @@ 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; /* IMAGE *pCurrent = &pEnc->current->image; */ IMAGE *pRef = &pEnc->reference->image; - if ((pEnc->current->global_flags & XVID_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->mbParam.width, pEnc->mbParam.height, + pEnc->current->global_flags & XVID_INTERLACING); 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)(mb_width * mb_height * INTRA_THRESHOLD); + iLimit = + (int) (pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * + INTRA_THRESHOLD); else - iLimit = mb_width * mb_height + 1; + iLimit = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height + 1; if ((pEnc->current->global_flags & XVID_HALFPEL)) { start_timer(); image_interpolate(pRef, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - pEnc->mbParam.m_quarterpel, pEnc->current->rounding_type); stop_inter_timer(); } - if (pEnc->current->global_flags & XVID_GMC) { -// printf("Global Motion = %d %d quarterpel=%d\n", pEnc->current->GMC_MV.x, pEnc->current->GMC_MV.y,pEnc->current->quarterpel); - DPRINTF(DPRINTF_HEADER, "Global Motion = %d %d quarterpel=%d\n", pEnc->current->GMC_MV.x, pEnc->current->GMC_MV.y,pEnc->current->quarterpel); - pEnc->current->coding_type = S_VOP; - } else - pEnc->current->coding_type = P_VOP; - start_timer(); - if (pEnc->current->global_flags & XVID_HINTEDME_SET) + if (pEnc->current->global_flags & XVID_HINTEDME_SET) { HintedMESet(pEnc, &bIntra); - else + } 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 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 ( (pEnc->current->GMC_MV.x == 0) && (pEnc->current->GMC_MV.y == 0) ) - pEnc->current->coding_type = P_VOP; /* no global motion -> no GMC */ + if (bIntra == 1) { + return FrameCodeI(pEnc, bs, pBits); + } + pEnc->current->coding_type = P_VOP; if (vol_header) BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); - - set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); 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 < mb_height; y++) { - for (x = 0; x < mb_width; x++) { + 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]; @@ -1734,8 +976,6 @@ dct_codes, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width, - pEnc->mbParam.m_quarterpel, - (pEnc->current->global_flags & XVID_REDUCED), pEnc->current->rounding_type); stop_comp_timer(); @@ -1753,10 +993,9 @@ pMB->field_pred = 0; - if (pMB->mode != MODE_NOT_CODED) - pMB->cbp = - MBTransQuantInter(&pEnc->mbParam, pEnc->current, pMB, x, y, - dct_codes, qcoeff); + 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, @@ -1768,310 +1007,69 @@ stop_prediction_timer(); if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) { - pEnc->current->sStat.kblks++; + 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->current->sStat.mblks++; + pEnc->sStat.mblks++; } else { - pEnc->current->sStat.ublks++; + pEnc->sStat.ublks++; } start_timer(); /* Finished processing the MB, now check if to CODE or SKIP */ - skip_possible = (pMB->cbp == 0) & (pMB->mode == MODE_INTER) & - (pMB->dquant == NO_CHANGE); - - if(pEnc->mbParam.m_quarterpel) - { skip_possible &= (pMB->qmvs[0].x == pEnc->current->GMC_MV.x) & (pMB->qmvs[0].y == pEnc->current->GMC_MV.y); - } - else - { skip_possible &= (pMB->mvs[0].x == pEnc->current->GMC_MV.x) & (pMB->mvs[0].y == pEnc->current->GMC_MV.y); - } - - if ( (pMB->mode == MODE_NOT_CODED) || (skip_possible)) { + if (pMB->cbp == 0 && pMB->mode == MODE_INTER && pMB->mvs[0].x == 0 && + pMB->mvs[0].y == 0) { -/* This is a candidate for SKIPping, but for P-VOPs check intermediate B-frames first */ - int bSkip = 1; + MBSkip(bs); /* without B-frames, no precautions are needed */ - if (pEnc->current->coding_type == P_VOP) /* special rule for P-VOP's SKIP */ - 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) - { - VECTOR predMV; - if(pEnc->mbParam.m_quarterpel) { - predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = pMB->qmvs[0].x - predMV.x; /* with GMC, qmvs doesn't have to be (0,0)! */ - pMB->pmvs[0].y = pMB->qmvs[0].y - predMV.y; - } - else { - predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = pMB->mvs[0].x - predMV.x; /* with GMC, mvs doesn't have to be (0,0)! */ - pMB->pmvs[0].y = pMB->mvs[0].y - predMV.y; - } - pMB->mode = MODE_INTER; - pMB->cbp = 0; - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); - } - else - { - pMB->mode = MODE_NOT_CODED; - MBSkip(bs); - } - - } else { - if (pEnc->current->global_flags & XVID_GREYSCALE) - { pMB->cbp &= 0x3C; /* keep only bits 5-2 */ + } + else { + if (pEnc->current->global_flags & XVID_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; } - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); } stop_coding_timer(); } } - if ((pEnc->current->global_flags & XVID_REDUCED)) - { - image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, - pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width); - } - emms(); if (pEnc->current->global_flags & XVID_HINTEDME_GET) { HintedMEGet(pEnc, 0); } - if (pEnc->current->sStat.iMvCount == 0) - pEnc->current->sStat.iMvCount = 1; + if (pEnc->sStat.iMvCount == 0) + pEnc->sStat.iMvCount = 1; - fSigma = (float) sqrt((float) pEnc->current->sStat.iMvSum / pEnc->current->sStat.iMvCount); + fSigma = (float) sqrt((float) pEnc->sStat.iMvSum / pEnc->sStat.iMvCount); iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode); if ((fSigma > iSearchRange / 3) - && (pEnc->mbParam.m_fcode <= (3 + pEnc->mbParam.m_quarterpel))) // maximum search range 128 + && (pEnc->mbParam.m_fcode <= 3)) // maximum search range 128 { pEnc->mbParam.m_fcode++; iSearchRange *= 2; } else if ((fSigma < iSearchRange / 6) - && (pEnc->fMvPrevSigma >= 0) - && (pEnc->fMvPrevSigma < iSearchRange / 6) - && (pEnc->mbParam.m_fcode >= (2 + pEnc->mbParam.m_quarterpel))) // minimum search range 16 + && (pEnc->sStat.fMvPrevSigma >= 0) + && (pEnc->sStat.fMvPrevSigma < iSearchRange / 6) + && (pEnc->mbParam.m_fcode >= 2)) // minimum search range 16 { pEnc->mbParam.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) - { - 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 - 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); - } - - /* 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); - } - */ - + pEnc->sStat.fMvPrevSigma = fSigma; *pBits = BitstreamPos(bs) - *pBits; return 0; // inter -} - - -static void -FrameCodeB(Encoder * pEnc, - FRAMEINFO * frame, - Bitstream * bs, - uint32_t * pBits) -{ - int16_t dct_codes[6 * 64]; - int16_t qcoeff[6 * 64]; - uint32_t x, y; - - IMAGE *f_ref = &pEnc->reference->image; - IMAGE *b_ref = &pEnc->current->image; - -#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); \ - } - - pEnc->current->global_flags &= ~XVID_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, - 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, - pEnc->mbParam.m_quarterpel, 0); - stop_inter_timer(); - - // backward - image_setedges(b_ref, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height); - start_timer(); - image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, - pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - pEnc->mbParam.m_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 - pEnc->reference->mbs, f_ref, - &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); - BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1); - - *pBits = BitstreamPos(bs); - - frame->sStat.iTextBits = 0; - frame->sStat.iMvSum = 0; - frame->sStat.iMvCount = 0; - frame->sStat.kblks = frame->sStat.mblks = frame->sStat.ublks = 0; - - 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 = pEnc->mbParam.global & XVID_ALTERNATESCAN ? 2 : 0; - - // decoder ignores mb when refence block is INTER(0,0), CBP=0 - if (mb->mode == MODE_NOT_CODED) { - //mb->mvs[0].x = mb->mvs[0].y = mb->cbp = 0; - continue; - } - - if (mb->mode != MODE_DIRECT_NONE_MV) { - 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); - - if (mb->mode == MODE_DIRECT_NO4V) mb->mode = MODE_DIRECT; - mb->quant = frame->quant; - - mb->cbp = - MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, dct_codes, qcoeff); - - 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 - } - } - -#ifdef BFRAMES_DEC_DEBUG - BFRAME_DEBUG -#endif - start_timer(); - MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs, - &frame->sStat, direction); - stop_coding_timer(); - } - } - - emms(); - - // TODO: dynamic fcode/bcode ??? - - *pBits = BitstreamPos(bs) - *pBits; - -#ifdef BFRAMES_DEC_DEBUG - if (!first){ - first=1; - if (fp) - fclose(fp); - } -#endif } - - -/* in case internal output is needed somewhere... */ -/* { - FILE *filehandle; - filehandle=fopen("last-b.pgm","wb"); - if (filehandle) - { - fprintf(filehandle,"P5\n\n"); // - fprintf(filehandle,"%d %d 255\n",pEnc->mbParam.edged_width,pEnc->mbParam.edged_height); - fwrite(frame->image.y,pEnc->mbParam.edged_width,pEnc->mbParam.edged_height,filehandle); - fclose(filehandle); - } - } -*/