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

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

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

revision 923, Sat Mar 15 16:41:32 2003 UTC revision 924, Sat Mar 15 17:03:17 2003 UTC
# Line 26  Line 26 
26   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
27   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
28   *   *
29   *  $Id: encoder.c,v 1.95.2.6 2003-03-15 16:04:38 suxen_drol Exp $   *  $Id: encoder.c,v 1.95.2.7 2003-03-15 17:03:17 suxen_drol Exp $
30   *   *
31   ****************************************************************************/   ****************************************************************************/
32    
# Line 166  Line 166 
166      /* framerate */      /* framerate */
167      pEnc->mbParam.fincr = MAX(create->fincr, 0);      pEnc->mbParam.fincr = MAX(create->fincr, 0);
168          pEnc->mbParam.fbase = create->fincr <= 0 ? 25 : create->fbase;          pEnc->mbParam.fbase = create->fincr <= 0 ? 25 : create->fbase;
169        if (pEnc->mbParam.fincr>0)
170          simplify_time(&pEnc->mbParam.fincr, &pEnc->mbParam.fbase);          simplify_time(&pEnc->mbParam.fincr, &pEnc->mbParam.fbase);
171    
172      /* plugin */      /* plugin */
# Line 636  Line 637 
637    
638      data.width = pEnc->mbParam.width;      data.width = pEnc->mbParam.width;
639      data.height = pEnc->mbParam.height;      data.height = pEnc->mbParam.height;
640      data.fincr = pEnc->mbParam.fincr;      data.fincr = frame->fincr;
641      data.fbase = pEnc->mbParam.fbase;      data.fbase = pEnc->mbParam.fbase;
642    
643      data.reference.csp = XVID_CSP_USER;      data.reference.csp = XVID_CSP_USER;
# Line 750  Line 751 
751      pEnc->current->frame_num = pEnc->m_framenum;      pEnc->current->frame_num = pEnc->m_framenum;
752          pEnc->current->stamp = pEnc->mbParam.m_stamp;   /* first frame is zero */          pEnc->current->stamp = pEnc->mbParam.m_stamp;   /* first frame is zero */
753    
754      pEnc->mbParam.m_stamp += pEnc->mbParam.fincr;      pEnc->mbParam.m_stamp += pEnc->current->fincr;
755      pEnc->m_framenum++; /* debug ticker */      pEnc->m_framenum++; /* debug ticker */
756  }  }
757    
# Line 977  Line 978 
978           * init pEnc->current fields           * init pEnc->current fields
979           * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */           * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
980    
981    
982        pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr;
983      pEnc->current->vol_flags = pEnc->mbParam.vol_flags;      pEnc->current->vol_flags = pEnc->mbParam.vol_flags;
984      pEnc->current->vop_flags = frame->vop_flags;      pEnc->current->vop_flags = frame->vop_flags;
985          pEnc->current->motion_flags = frame->motion;          pEnc->current->motion_flags = frame->motion;

Legend:
Removed from v.923  
changed lines
  Added in v.924

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