[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 1107, Sat Aug 2 15:08:48 2003 UTC revision 1122, Wed Aug 13 11:44:02 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.10 2003-08-02 15:08:12 edgomez Exp $   * $Id: decoder.c,v 1.49.2.11 2003-08-13 11:43:47 edgomez Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 1731  Line 1731 
1731          WARPPOINTS gmc_warp;          WARPPOINTS gmc_warp;
1732          int coding_type;          int coding_type;
1733          int success, output, seen_something;          int success, output, seen_something;
         idctFuncPtr idct_save;  
1734    
1735          if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1))      /* v1.x.x */          if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1))      /* v1.x.x */
1736                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
# Line 1777  Line 1776 
1776          success = 0;          success = 0;
1777          output = 0;          output = 0;
1778          seen_something = 0;          seen_something = 0;
         idct_save = idct;  
1779    
1780  repeat:  repeat:
1781    
# Line 1819  Line 1817 
1817    
1818          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 */
1819    
 #if defined(ARCH_IS_IA32)  
         /*  
          * /!\ Ugly hack /!\  
          * IA32: Prior to xvid bitstream 10, we were using Walten's mmx/xmm idct  
          */  
         if((idct == simple_idct_mmx) && (dec->bs_version < 10))  
                 idct = idct_mmx;  
 #endif  
   
1820          /* packed_mode: special-N_VOP treament */          /* packed_mode: special-N_VOP treament */
1821          if (dec->packed_mode && coding_type == N_VOP)          if (dec->packed_mode && coding_type == N_VOP)
1822          {          {
# Line 1956  Line 1945 
1945          emms();          emms();
1946          stop_global_timer();          stop_global_timer();
1947    
         idct = idct_save;  
   
1948          return BitstreamPos(&bs) / 8;   /* number of bytes consumed */          return BitstreamPos(&bs) / 8;   /* number of bytes consumed */
1949  }  }

Legend:
Removed from v.1107  
changed lines
  Added in v.1122

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