[svn] / trunk / xvidcore / src / encoder.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/encoder.c

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

revision 353, Wed Jul 31 18:19:49 2002 UTC revision 360, Sun Aug 4 23:27:40 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.68 2002-07-31 18:19:49 chl Exp $   *  $Id: encoder.c,v 1.72 2002-08-04 23:27:40 Isibaar Exp $
43   *   *
44   ****************************************************************************/   ****************************************************************************/
45    
# Line 623  Line 623 
623  #ifdef BFRAMES  #ifdef BFRAMES
624  void inc_frame_num(Encoder * pEnc)  void inc_frame_num(Encoder * pEnc)
625  {  {
         pEnc->iFrameNum++;  
626          pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;          pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;
627    
628          pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase;          pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase;
# Line 826  Line 825 
825    
826                  pFrame->intra = 0;                  pFrame->intra = 0;
827    
828                  BitstreamPutBits(&bs, 0x7f, 8);                  BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); // write N_VOP
829                  BitstreamPad(&bs);                  BitstreamPad(&bs);
830                  pFrame->length = BitstreamLength(&bs);                  pFrame->length = BitstreamLength(&bs);
831    
# Line 1044  Line 1043 
1043                  goto bvop_loop;                  goto bvop_loop;
1044          }          }
1045    
1046            pEnc->iFrameNum++;
1047    
1048          BitstreamPad(&bs);          BitstreamPad(&bs);
1049          pFrame->length = BitstreamLength(&bs);          pFrame->length = BitstreamLength(&bs);
1050    
# Line 1253  Line 1254 
1254    
1255  #ifdef BFRAMES  #ifdef BFRAMES
1256          inc_frame_num(pEnc);          inc_frame_num(pEnc);
 #else  
         pEnc->iFrameNum++;  
1257  #endif  #endif
1258            pEnc->iFrameNum++;
1259    
1260          stop_global_timer();          stop_global_timer();
1261          write_timer();          write_timer();
# Line 1577  Line 1576 
1576          DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);          DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
1577    
1578          int iLimit;          int iLimit;
1579          int x, y;          int x, y, k;
1580          int iSearchRange;          int iSearchRange;
1581          int bIntra;          int bIntra;
1582    

Legend:
Removed from v.353  
changed lines
  Added in v.360

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