[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 1054, Mon Jun 9 13:55:56 2003 UTC revision 1058, Mon Jun 9 19:42:25 2003 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.7 2003-06-09 13:49:50 edgomez Exp $   * $Id: decoder.c,v 1.49.2.8 2003-06-09 19:41:53 edgomez Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 1742  Line 1742 
1742          WARPPOINTS gmc_warp;          WARPPOINTS gmc_warp;
1743          int coding_type;          int coding_type;
1744          int success, output, seen_something;          int success, output, seen_something;
1745            idctFuncPtr idct_save;
1746    
1747          if (XVID_MAJOR(frame->version) != 1 || (stats && XVID_MAJOR(stats->version) != 1))      /* v1.x.x */          if (XVID_MAJOR(frame->version) != 1 || (stats && XVID_MAJOR(stats->version) != 1))      /* v1.x.x */
1748                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
# Line 1787  Line 1788 
1788          success = 0;          success = 0;
1789          output = 0;          output = 0;
1790          seen_something = 0;          seen_something = 0;
1791            idct_save = idct;
1792    
1793  repeat:  repeat:
1794    
# Line 1828  Line 1830 
1830    
1831          dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;  /* init pred vector to 0 */          dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;  /* init pred vector to 0 */
1832    
1833    #if defined(ARCH_IS_IA32)
1834            /*
1835             * /!\ Ugly hack /!\
1836             * IA32: Prior to xvid bitstream 10, we were using Walten's mmx/xmm idct
1837             */
1838            if((idct == simple_idct_mmx) && (dec->bs_version < 10))
1839                    idct = idct_mmx;
1840    #endif
1841    
1842          /* packed_mode: special-N_VOP treament */          /* packed_mode: special-N_VOP treament */
1843          if (dec->packed_mode && coding_type == N_VOP)          if (dec->packed_mode && coding_type == N_VOP)
# Line 1957  Line 1967 
1967          emms();          emms();
1968          stop_global_timer();          stop_global_timer();
1969    
1970            idct = idct_save;
1971    
1972          return BitstreamPos(&bs) / 8;   /* number of bytes consumed */          return BitstreamPos(&bs) / 8;   /* number of bytes consumed */
1973  }  }
Legend:
Removed from v.1054  
changed lines
  Added in v.1058
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4