[svn] / branches / dev-api-3 / xvidcore / src / encoder.c Repository:
ViewVC logotype

Diff of /branches/dev-api-3/xvidcore/src/encoder.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 671, Sat Nov 23 14:57:09 2002 UTC revision 688, Thu Nov 28 14:45:21 2002 UTC
# Line 39  Line 39 
39   *             MinChen <chenm001@163.com>   *             MinChen <chenm001@163.com>
40   *  14.04.2002 added FrameCodeB()   *  14.04.2002 added FrameCodeB()
41   *   *
42   *  $Id: encoder.c,v 1.76.2.21 2002-11-23 14:57:09 syskin Exp $   *  $Id: encoder.c,v 1.76.2.23 2002-11-28 14:45:21 syskin Exp $
43   *   *
44   ****************************************************************************/   ****************************************************************************/
45    
# Line 926  Line 926 
926          /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%          /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
927           * ivop/pvop/bvop selection           * ivop/pvop/bvop selection
928           * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */           * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
929            pEnc->iFrameNum++;
930    
931          if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop >= 0 ||          if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop >= 0 ||
932                  (pFrame->intra < 0 && pEnc->iMaxKeyInterval > 0 &&                  (pFrame->intra < 0 && pEnc->iMaxKeyInterval > 0 &&
# Line 945  Line 946 
946    
947                  if (pEnc->current->global_flags & XVID_MPEGQUANT) pEnc->mbParam.m_quant_type = MPEG4_QUANT;                  if (pEnc->current->global_flags & XVID_MPEGQUANT) pEnc->mbParam.m_quant_type = MPEG4_QUANT;
948    
949                    if ((pEnc->current->global_flags & XVID_CUSTOM_QMATRIX) > 0) {
950                            if (pFrame->quant_intra_matrix != NULL)
951                                    set_intra_matrix(pFrame->quant_intra_matrix);
952                            if (pFrame->quant_inter_matrix != NULL)
953                                    set_inter_matrix(pFrame->quant_inter_matrix);
954                    }
955    
956    
957                  DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",                  DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
958                                  pEnc->bframenum_head, pEnc->bframenum_tail,                                  pEnc->bframenum_head, pEnc->bframenum_tail,
959                                  pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);                                  pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
# Line 1055  Line 1064 
1064                  goto bvop_loop;                  goto bvop_loop;
1065          }          }
1066    
         pEnc->iFrameNum++;  
   
1067          BitstreamPad(&bs);          BitstreamPad(&bs);
1068          pFrame->length = BitstreamLength(&bs);          pFrame->length = BitstreamLength(&bs);
1069    

Legend:
Removed from v.671  
changed lines
  Added in v.688

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4