--- branches/dev-api-3/xvidcore/src/encoder.c 2002/09/23 20:36:02 530 +++ branches/dev-api-3/xvidcore/src/encoder.c 2002/09/29 15:53:42 569 @@ -39,7 +39,7 @@ * MinChen * 14.04.2002 added FrameCodeB() * - * $Id: encoder.c,v 1.76.2.1 2002-09-23 20:36:01 chl Exp $ + * $Id: encoder.c,v 1.76.2.5 2002-09-29 15:53:42 chl Exp $ * ****************************************************************************/ @@ -410,12 +410,9 @@ pEnc->queue_tail = 0; pEnc->queue_size = 0; - - pEnc->mbParam.m_seconds = 0; - pEnc->mbParam.m_ticks = 0; + pEnc->mbParam.m_stamp = 0; +; pEnc->m_framenum = 0; - pEnc->last_pframe = 0; - pEnc->last_sync = 0; pParam->handle = (void *) pEnc; @@ -604,15 +601,8 @@ static __inline void inc_frame_num(Encoder * pEnc) { - pEnc->mbParam.m_ticks += pEnc->mbParam.fincr; - - pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase; - if (pEnc->mbParam.m_ticks < pEnc->last_sync) - pEnc->mbParam.m_seconds = 1; - // more than 1 second since last I or P is not supported. - else - pEnc->mbParam.m_seconds = 0; - + pEnc->current->stamp = pEnc->mbParam.m_stamp; // first frame is zero + pEnc->mbParam.m_stamp += pEnc->mbParam.fincr; } @@ -641,6 +631,27 @@ 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); + + +} + + + /***************************************************************************** @@ -659,7 +670,7 @@ { uint16_t x, y; Bitstream bs; - uint32_t bits; + uint32_t bits, mode; int input_valid = 1; @@ -737,6 +748,7 @@ pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); BitstreamPad(&bs); BitstreamPutBits(&bs, 0x7f, 8); @@ -809,6 +821,7 @@ pFrame->intra = 0; + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); // write N_VOP BitstreamPad(&bs); pFrame->length = BitstreamLength(&bs); @@ -846,9 +859,6 @@ pEnc->current->fcode = pEnc->mbParam.m_fcode; pEnc->current->bcode = pEnc->mbParam.m_fcode; - pEnc->current->seconds = pEnc->mbParam.m_seconds; - pEnc->current->ticks = pEnc->mbParam.m_ticks; - inc_frame_num(pEnc); #ifdef _DEBUG_PSNR @@ -907,9 +917,12 @@ if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop >= 0 || (pFrame->intra < 0 && pEnc->iMaxKeyInterval > 0 && pEnc->iFrameNum >= pEnc->iMaxKeyInterval) - || image_mad(&pEnc->reference->image, &pEnc->current->image, + || /*image_mad(&pEnc->reference->image, &pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.width, - pEnc->mbParam.height) > 30) { + pEnc->mbParam.height) > 30) {*/ + 2 == (mode = MEanalysis(&pEnc->reference->image, &pEnc->current->image, + &pEnc->mbParam, pEnc->current->mbs, pEnc->current->fcode))) { + /* * This will be coded as an Intra Frame */ @@ -957,7 +970,7 @@ * NB : sequences like "IIBB" decode fine with msfdam but, * go screwy with divx 5.00 */ - } else if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { + } else if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes || mode != 0) { /* * This will be coded as a Predicted Frame */ @@ -1052,7 +1065,6 @@ pFrame->length, pFrame->intra); } - stop_global_timer(); write_timer(); @@ -1096,10 +1108,15 @@ 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; + /* 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, @@ -1484,6 +1501,8 @@ if ((pEnc->global & XVID_GLOBAL_PACKED)) { BitstreamWriteUserData(bs, DIVX501B481P, strlen(DIVX501B481P)); } + + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); *pBits = BitstreamPos(bs); @@ -1524,9 +1543,6 @@ pEnc->sStat.iMvCount = 0; pEnc->mbParam.m_fcode = 2; - pEnc->last_pframe = pEnc->current->ticks; - pEnc->last_sync = pEnc->current->ticks; - if (pEnc->current->global_flags & XVID_HINTEDME_GET) { HintedMEGet(pEnc, 1); } @@ -1560,8 +1576,7 @@ start_timer(); image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->current->global_flags & XVID_INTERLACING); + pEnc->mbParam.width, pEnc->mbParam.height); stop_edges_timer(); pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type; @@ -1606,7 +1621,9 @@ 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); @@ -1747,7 +1764,7 @@ pEnc->sStat.fMvPrevSigma = fSigma; -#ifdef BFRAMES +#ifdef FRAMEDROP /* frame drop code */ // DPRINTF(DPRINTF_DEBUG, "kmu %i %i %i", pEnc->sStat.kblks, pEnc->sStat.mblks, pEnc->sStat.ublks); if (pEnc->sStat.kblks + pEnc->sStat.mblks < @@ -1757,6 +1774,8 @@ pEnc->sStat.ublks = pEnc->mbParam.mb_width * pEnc->mbParam.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 @@ -1773,10 +1792,6 @@ *pBits = BitstreamPos(bs) - *pBits; - pEnc->time_pp = ((int32_t)pEnc->mbParam.fbase - (int32_t)pEnc->last_pframe + (int32_t)pEnc->current->ticks) % - (int32_t)pEnc->mbParam.fbase; - pEnc->last_pframe = pEnc->current->ticks; - return 0; // inter } @@ -1809,8 +1824,7 @@ // forward image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height, - frame->global_flags & XVID_INTERLACING); + pEnc->mbParam.height); start_timer(); image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, @@ -1820,8 +1834,7 @@ // backward image_setedges(b_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height, - frame->global_flags & XVID_INTERLACING); + pEnc->mbParam.height); start_timer(); image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, @@ -1829,10 +1842,11 @@ stop_inter_timer(); start_timer(); + MotionEstimationBVOP(&pEnc->mbParam, frame, - ((int32_t)pEnc->mbParam.fbase + pEnc->last_pframe - frame->ticks) % pEnc->mbParam.fbase, - pEnc->time_pp, - pEnc->reference->mbs, f_ref, + ((int32_t)(pEnc->current->stamp - frame->stamp)), // time_bp + ((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), // time_pp + pEnc->reference->mbs, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, pEnc->current->mbs, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV); @@ -1846,6 +1860,8 @@ } */ frame->coding_type = B_VOP; + + set_timecodes(frame, pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1); *pBits = BitstreamPos(bs); @@ -1859,6 +1875,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 = pEnc->global & XVID_ALTERNATESCAN ? 2 : 0; // decoder ignores mb when refence block is INTER(0,0), CBP=0 if (mb->mode == MODE_NOT_CODED) { @@ -1890,7 +1907,7 @@ #endif start_timer(); MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs, - &pEnc->sStat); + &pEnc->sStat, direction); stop_coding_timer(); } }