[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 963, Sat Mar 29 12:01:36 2003 UTC revision 964, Sun Mar 30 00:36:53 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.16 2003-03-27 17:09:48 edgomez Exp $   *  $Id: encoder.c,v 1.95.2.17 2003-03-30 00:36:53 edgomez Exp $
30   *   *
31   ****************************************************************************/   ****************************************************************************/
32    
# Line 1353  Line 1353 
1353          }          }
1354          emms();          emms();
1355    
1356    /* XXX: Remove the two #if 0 blocks when we are sure we must always pad the stream */
1357    #if 0
1358          /* for divx5 compatibility, we must always pad between the packed p and b frames */          /* for divx5 compatibility, we must always pad between the packed p and b frames */
1359          if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0)          if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0)
1360    #endif
1361                  BitstreamPadAlways(bs);                  BitstreamPadAlways(bs);
1362    #if 0
1363          else          else
1364                  BitstreamPad(bs);                  BitstreamPad(bs);
1365    #endif
1366      pEnc->current->length = (BitstreamPos(bs) - bits) / 8;      pEnc->current->length = (BitstreamPos(bs) - bits) / 8;
1367    
1368          pEnc->fMvPrevSigma = -1;          pEnc->fMvPrevSigma = -1;
# Line 1754  Line 1759 
1759          }          }
1760          */          */
1761    
1762    /* XXX: Remove the two #if 0 blocks when we are sure we must always pad the stream */
1763    #if 0
1764          /* for divx5 compatibility, we must always pad between the packed p and b frames */          /* for divx5 compatibility, we must always pad between the packed p and b frames */
1765          if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0)          if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0)
1766    #endif
1767                  BitstreamPadAlways(bs);                  BitstreamPadAlways(bs);
1768    #if 0
1769          else          else
1770                  BitstreamPad(bs);                  BitstreamPad(bs);
1771    #endif
1772    
1773      pEnc->current->length = (BitstreamPos(bs) - bits) / 8;      pEnc->current->length = (BitstreamPos(bs) - bits) / 8;
1774    
# Line 1890  Line 1900 
1900    
1901          /* TODO: dynamic fcode/bcode ??? */          /* TODO: dynamic fcode/bcode ??? */
1902    
1903      BitstreamPad(bs);      BitstreamPadAlways(bs);
1904          frame->length = (BitstreamPos(bs) - bits) / 8;          frame->length = (BitstreamPos(bs) - bits) / 8;
1905    
1906  #ifdef BFRAMES_DEC_DEBUG  #ifdef BFRAMES_DEC_DEBUG

Legend:
Removed from v.963  
changed lines
  Added in v.964

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