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

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

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

revision 1350, Tue Feb 3 02:56:57 2004 UTC revision 1371, Sun Feb 29 12:57:58 2004 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: decoder.c,v 1.49.2.31 2004-02-03 02:56:57 syskin Exp $   * $Id: decoder.c,v 1.49.2.34 2004-02-29 12:57:58 edgomez Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 779  Line 779 
779    
780          start_timer();          start_timer();
781          image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,          image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
782                                          dec->width, dec->height);                                          dec->width, dec->height, dec->bs_version);
783          stop_edges_timer();          stop_edges_timer();
784    
785          if (gmc_warp) {          if (gmc_warp) {
# Line 1180  Line 1180 
1180    
1181          start_timer();          start_timer();
1182          image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,          image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
1183                                          dec->width, dec->height);                                          dec->width, dec->height, dec->bs_version);
1184          image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height,          image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height,
1185                                          dec->width, dec->height);                                          dec->width, dec->height, dec->bs_version);
1186          stop_edges_timer();          stop_edges_timer();
1187    
1188          for (y = 0; y < dec->mb_height; y++) {          for (y = 0; y < dec->mb_height; y++) {
# Line 1526  Line 1526 
1526                  dec->frames++;                  dec->frames++;
1527          }          }
1528    
1529    #if 0 /* Avoids to read to much data because of 32bit reads in our BS functions */
1530          BitstreamByteAlign(&bs);          BitstreamByteAlign(&bs);
1531    #endif
1532    
1533          /* low_delay_default mode: repeat in packed_mode */          /* low_delay_default mode: repeat in packed_mode */
1534          if (dec->low_delay_default && dec->packed_mode && output == 0 && success == 0) {          if (dec->low_delay_default && dec->packed_mode && output == 0 && success == 0) {
# Line 1557  Line 1559 
1559          emms();          emms();
1560          stop_global_timer();          stop_global_timer();
1561    
1562          return BitstreamPos(&bs) / 8;   /* number of bytes consumed */          return (BitstreamPos(&bs) + 7) / 8;     /* number of bytes consumed */
1563  }  }
Legend:
Removed from v.1350  
changed lines
  Added in v.1371
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4