[svn] / trunk / xvidcore / src / bitstream / bitstream.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/bitstream/bitstream.c

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

revision 1696, Mon Mar 27 11:21:48 2006 UTC revision 1785, Tue Jul 24 09:43:10 2007 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: bitstream.c,v 1.56 2006-03-27 11:21:48 Skal Exp $   * $Id: bitstream.c,v 1.58 2007-07-24 09:43:10 Isibaar Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 820  Line 820 
820                                  dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment;                                  dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment;
821                                  dec->time_bp = dec->time_pp - (int32_t)(dec->last_non_b_time - dec->time);                                  dec->time_bp = dec->time_pp - (int32_t)(dec->last_non_b_time - dec->time);
822                          }                          }
823                if (dec->time_pp <= 0) dec->time_pp = 1;
824                          DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp);                          DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp);
825                          DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp);                          DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp);
826    
# Line 1443  Line 1444 
1444      else if (frame->coding_type == P_VOP)      else if (frame->coding_type == P_VOP)
1445        nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER-1 + frame->fcode;        nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER-1 + frame->fcode;
1446      else /* B_VOP */      else /* B_VOP */
1447        nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER, NUMBITS_VP_RESYNC_MARKER-1 + MAX(frame->fcode, frame->bcode));        nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER+1, NUMBITS_VP_RESYNC_MARKER-1 + MAX(frame->fcode, frame->bcode));
1448    
1449      BitstreamPadAlways(bs);      BitstreamPadAlways(bs);
1450      BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);      BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);
Legend:
Removed from v.1696  
changed lines
  Added in v.1785
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4