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

Diff of /xvidcore/src/encoder.c

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

revision 1.95.2.59, Wed Dec 17 15:16:16 2003 UTC revision 1.95.2.62, Sat Dec 20 11:54:14 2003 UTC
# Line 1121  Line 1121 
1121    
1122          pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr;          pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr;
1123          inc_frame_num(pEnc);          inc_frame_num(pEnc);
1124          pEnc->current->vol_flags = pEnc->mbParam.vol_flags;          pEnc->current->vol_flags = frame->vol_flags;
1125          pEnc->current->vop_flags = frame->vop_flags;          pEnc->current->vop_flags = frame->vop_flags;
1126          pEnc->current->motion_flags = frame->motion;          pEnc->current->motion_flags = frame->motion;
1127          pEnc->current->fcode = pEnc->mbParam.m_fcode;          pEnc->current->fcode = pEnc->mbParam.m_fcode;
# Line 1156  Line 1156 
1156                  }                  }
1157          }          }
1158    
1159            if (type != I_VOP)
1160                    pEnc->current->vol_flags = pEnc->mbParam.vol_flags; /* don't allow VOL changes here */
1161    
1162          /* bframes buffer overflow check */          /* bframes buffer overflow check */
1163          if (type == B_VOP && pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) {          if (type == B_VOP && pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) {
1164                  type = P_VOP;                  type = P_VOP;
# Line 1268  Line 1271 
1271                  pEnc->iFrameNum = 1;                  pEnc->iFrameNum = 1;
1272    
1273                  /* ---- update vol flags at IVOP ----------- */                  /* ---- update vol flags at IVOP ----------- */
1274                  pEnc->mbParam.vol_flags = frame->vol_flags;                  pEnc->mbParam.vol_flags = pEnc->current->vol_flags;
1275    
1276                  /* Aspect ratio */                  /* Aspect ratio */
1277                  switch(frame->par) {                  switch(frame->par) {
# Line 1449  Line 1452 
1452    
1453          SetMacroblockQuants(&pEnc->mbParam, pEnc->current);          SetMacroblockQuants(&pEnc->mbParam, pEnc->current);
1454    
1455          BitstreamWriteVolHeader(bs, &pEnc->mbParam);          BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current);
1456    
1457          set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);          set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);
1458    
# Line 1644  Line 1647 
1647    
1648          set_timecodes(current,reference,pParam->fbase);          set_timecodes(current,reference,pParam->fbase);
1649          if (vol_header)          if (vol_header)
1650          {       BitstreamWriteVolHeader(bs, &pEnc->mbParam);          {       BitstreamWriteVolHeader(bs, &pEnc->mbParam, current);
1651                  BitstreamPad(bs);                  BitstreamPad(bs);
1652          }          }
1653    
Legend:
Removed from v.1.95.2.59  
changed lines
  Added in v.1.95.2.62
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4