[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 1665, Sat Dec 17 12:04:52 2005 UTC revision 1679, Wed Feb 15 20:58:43 2006 UTC
# Line 21  Line 21 
21   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24   * $Id: encoder.c,v 1.122 2005-12-17 12:04:52 syskin Exp $   * $Id: encoder.c,v 1.124 2006-02-15 20:58:43 Isibaar Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 1384  Line 1384 
1384    
1385                  if ( FrameCodeP(pEnc, &bs) == 0 ) {                  if ( FrameCodeP(pEnc, &bs) == 0 ) {
1386                          /* N-VOP, we mustn't code b-frames yet */                          /* N-VOP, we mustn't code b-frames yet */
1387                            if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) ||
1388                                     pEnc->mbParam.max_bframes == 0)
1389                          call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);                          call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
1390                          goto done;                          goto done;
1391                  }                  }
# Line 1494  Line 1496 
1496          BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1, pEnc->current->mbs[0].quant);          BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1, pEnc->current->mbs[0].quant);
1497    
1498          pEnc->current->sStat.iTextBits = 0;          pEnc->current->sStat.iTextBits = 0;
1499            pEnc->current->sStat.iMVBits = 0;
1500          pEnc->current->sStat.kblks = mb_width * mb_height;          pEnc->current->sStat.kblks = mb_width * mb_height;
1501          pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0;          pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0;
1502    
# Line 1603  Line 1606 
1606          }          }
1607    
1608          current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =          current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =
1609                  current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 0;                  current->sStat.kblks = current->sStat.mblks = current->sStat.ublks =
1610                    current->sStat.iMVBits = 0;
1611    
1612          current->coding_type = P_VOP;          current->coding_type = P_VOP;
1613    
# Line 1795  Line 1799 
1799                  (pParam->frame_drop_ratio * mb_width * mb_height) / 100 &&                  (pParam->frame_drop_ratio * mb_width * mb_height) / 100 &&
1800                  ( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) )                  ( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) )
1801          {          {
1802                  current->sStat.kblks = current->sStat.mblks = 0;                  current->sStat.kblks = current->sStat.mblks = current->sStat.iTextBits = 0;
1803                  current->sStat.ublks = mb_width * mb_height;                  current->sStat.ublks = mb_width * mb_height;
1804    
1805                  BitstreamReset(bs);                  BitstreamReset(bs);
# Line 1926  Line 1930 
1930          BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1, frame->quant);          BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1, frame->quant);
1931    
1932          frame->sStat.iTextBits = 0;          frame->sStat.iTextBits = 0;
1933            frame->sStat.iMVBits = 0;
1934          frame->sStat.iMvSum = 0;          frame->sStat.iMvSum = 0;
1935          frame->sStat.iMvCount = 0;          frame->sStat.iMvCount = 0;
1936          frame->sStat.kblks = frame->sStat.mblks = frame->sStat.ublks = 0;          frame->sStat.kblks = frame->sStat.mblks = frame->sStat.ublks = 0;
Legend:
Removed from v.1665  
changed lines
  Added in v.1679
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4