[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 384, Mon Aug 19 19:19: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.75 2002-08-19 19:19:40 chl Exp $
43   *   *
44   ****************************************************************************/   ****************************************************************************/
45    
# Line 425  Line 425 
425          pEnc->mbParam.m_ticks = 0;          pEnc->mbParam.m_ticks = 0;
426          pEnc->m_framenum = 0;          pEnc->m_framenum = 0;
427          pEnc->last_pframe = 0;          pEnc->last_pframe = 0;
428            pEnc->last_sync = 0;
429  #endif  #endif
430    
431          pParam->handle = (void *) pEnc;          pParam->handle = (void *) pEnc;
# Line 623  Line 624 
624  #ifdef BFRAMES  #ifdef BFRAMES
625  void inc_frame_num(Encoder * pEnc)  void inc_frame_num(Encoder * pEnc)
626  {  {
         pEnc->iFrameNum++;  
627          pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;          pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;
628    
         pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase;  
629          pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase;          pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase;
630    
631    /*      fprintf(stderr, "ENC %c %i:%i %i\n",
632                    pEnc->current->coding_type == I_VOP ? 'I' : pEnc->current->coding_type == P_VOP ? 'P' : 'B',
633                    pEnc->mbParam.m_seconds, pEnc->mbParam.m_ticks,pEnc->last_sync);
634    */
635    
636            if (pEnc->mbParam.m_ticks < pEnc->last_sync)
637                    pEnc->mbParam.m_seconds = 1;            // more than 1 second since last I or P is not supported.
638            else
639                    pEnc->mbParam.m_seconds = 0;
640    
641            if (pEnc->current->coding_type != B_VOP)
642                    pEnc->last_sync = pEnc->mbParam.m_ticks;
643    
644  }  }
645  #endif  #endif
646    
# Line 826  Line 839 
839    
840                  pFrame->intra = 0;                  pFrame->intra = 0;
841    
842                  BitstreamPutBits(&bs, 0x7f, 8);                  BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); // write N_VOP
843                  BitstreamPad(&bs);                  BitstreamPad(&bs);
844                  pFrame->length = BitstreamLength(&bs);                  pFrame->length = BitstreamLength(&bs);
845    
# Line 1044  Line 1057 
1057                  goto bvop_loop;                  goto bvop_loop;
1058          }          }
1059    
1060            pEnc->iFrameNum++;
1061    
1062          BitstreamPad(&bs);          BitstreamPad(&bs);
1063          pFrame->length = BitstreamLength(&bs);          pFrame->length = BitstreamLength(&bs);
1064    
# Line 1253  Line 1268 
1268    
1269  #ifdef BFRAMES  #ifdef BFRAMES
1270          inc_frame_num(pEnc);          inc_frame_num(pEnc);
 #else  
         pEnc->iFrameNum++;  
1271  #endif  #endif
1272            pEnc->iFrameNum++;
1273    
1274          stop_global_timer();          stop_global_timer();
1275          write_timer();          write_timer();
# Line 1577  Line 1590 
1590          DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);          DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
1591    
1592          int iLimit;          int iLimit;
1593          int x, y;          int x, y, k;
1594          int iSearchRange;          int iSearchRange;
1595          int bIntra;          int bIntra;
1596    
# Line 1936  Line 1949 
1949    
1950                          mb->quant = frame->quant;                          mb->quant = frame->quant;
1951                          mb->cbp =                          mb->cbp =
1952                                  MBTransQuantInter(&pEnc->mbParam, frame, mb, x, y, dct_codes,                                  MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, dct_codes, qcoeff);
                                                                   qcoeff);  
1953                          //mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant);                          //mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant);
1954    
1955                          if ( (mb->mode == MODE_DIRECT) && (mb->cbp == 0)                          if ( (mb->mode == MODE_DIRECT) && (mb->cbp == 0)

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

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