[cvs] / xvidcore / src / xvid.c Repository:
ViewVC logotype

Diff of /xvidcore/src/xvid.c

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

revision 1.42, Sun Feb 16 05:11:39 2003 UTC revision 1.43, Wed Feb 19 21:13:00 2003 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Native API implementation  -   *  - Native API implementation  -
5   *   *
  *  This program is an implementation of a part of one or more MPEG-4  
  *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending  
  *  to use this software module in hardware or software products are  
  *  advised that its use may infringe existing patents or copyrights, and  
  *  any such use would be at such party's own risk.  The original  
  *  developer of this software module and his/her company, and subsequent  
  *  editors and their companies, will have no liability for use of this  
  *  software or modifications or derivatives thereof.  
  *  
6   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by   *  it under the terms of the GNU General Public License as published by
8   *  the Free Software Foundation ; either version 2 of the License, or   *  the Free Software Foundation ; either version 2 of the License, or
# Line 26  Line 17 
17   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
18   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
19   *   *
  ****************************************************************************/  
   
 /*****************************************************************************  
  *  
  *  History  
  *  
  *      - 23.06.2002    added XVID_CPU_CHKONLY  
  *  - 17.03.2002        Added interpolate8x8_halfpel_hv_xmm  
  *  - 22.12.2001  API change: added xvid_init() - Isibaar  
  *  - 16.12.2001        inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>  
  *  
20   *  $Id$   *  $Id$
21   *   *
22   ****************************************************************************/   ****************************************************************************/
# Line 84  Line 64 
64    
65    
66  /*  /*
67  calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled   * Calls the funcptr, and returns whether SIGILL (illegal instruction) was
68  return values:   * signalled
69  -1 : could not determine   *
70  0  : SIGILL was *not* signalled   * Return values:
71  1  : SIGILL was signalled   *  -1 : could not determine
72     *   0 : SIGILL was *not* signalled
73     *   1 : SIGILL was signalled
74  */  */
75    
76  int  int
# Line 316  Line 298 
298          dev16    = dev16_c;          dev16    = dev16_c;
299          sad16v   = sad16v_c;          sad16v   = sad16v_c;
300    
301  //      Halfpel8_Refine = Halfpel8_Refine_c;  /*      Halfpel8_Refine = Halfpel8_Refine_c; */
302    
303  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
304    
# Line 526  Line 508 
508  #endif  #endif
509    
510  #if defined(ARCH_IS_IA64)  #if defined(ARCH_IS_IA64)
511          if ((cpu_flags & XVID_CPU_ASM)) { //use assembler routines?          if ((cpu_flags & XVID_CPU_ASM)) { /* use assembler routines? */
512            idct_ia64_init();            idct_ia64_init();
513            fdct = fdct_ia64;            fdct = fdct_ia64;
514            idct = idct_ia64;   //not yet working, crashes            idct = idct_ia64;   /*not yet working, crashes */
515            interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_ia64;            interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_ia64;
516            interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_ia64;            interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_ia64;
517            interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_ia64;            interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_ia64;
# Line 537  Line 519 
519            sad16bi = sad16bi_ia64;            sad16bi = sad16bi_ia64;
520            sad8 = sad8_ia64;            sad8 = sad8_ia64;
521            dev16 = dev16_ia64;            dev16 = dev16_ia64;
522  //        Halfpel8_Refine = Halfpel8_Refine_ia64;  /*        Halfpel8_Refine = Halfpel8_Refine_ia64; */
523            quant_intra = quant_intra_ia64;            quant_intra = quant_intra_ia64;
524            dequant_intra = dequant_intra_ia64;            dequant_intra = dequant_intra_ia64;
525            quant_inter = quant_inter_ia64;            quant_inter = quant_inter_ia64;
# Line 548  Line 530 
530            transfer_8to16sub2 = transfer_8to16sub2_ia64;            transfer_8to16sub2 = transfer_8to16sub2_ia64;
531            transfer_16to8add = transfer_16to8add_ia64;            transfer_16to8add = transfer_16to8add_ia64;
532            transfer8x8_copy = transfer8x8_copy_ia64;            transfer8x8_copy = transfer8x8_copy_ia64;
533            DEBUG("Using IA-64 assembler routines.\n");            DPRINTF(DPRINTF_DEBUG, "Using IA-64 assembler routines.");
534          }          }
535  #endif  #endif
536    
# Line 578  Line 560 
560  static int  static int
561  xvid_init_convert(XVID_INIT_CONVERTINFO* convert)  xvid_init_convert(XVID_INIT_CONVERTINFO* convert)
562  {  {
563          // const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);  /*
564            const int flip1 =
565                    (convert->input.colorspace & XVID_CSP_VFLIP) ^
566                    (convert->output.colorspace & XVID_CSP_VFLIP);
567    */
568          const int width = convert->width;          const int width = convert->width;
569          const int height = convert->height;          const int height = convert->height;
570          const int width2 = convert->width/2;          const int width2 = convert->width/2;
# Line 751  Line 737 
737          int64_t timeSTART;          int64_t timeSTART;
738          int64_t timeA = 0;          int64_t timeA = 0;
739          int64_t timeB = 0;          int64_t timeB = 0;
740          int retA, retB;          int retA = 0, retB = 0;
741          DECLARE_ALIGNED_MATRIX(arrayX, 1, 64, int16_t, CACHE_LINE);          DECLARE_ALIGNED_MATRIX(arrayX, 1, 64, int16_t, CACHE_LINE);
742          DECLARE_ALIGNED_MATRIX(arrayA, 1, 64, int16_t, CACHE_LINE);          DECLARE_ALIGNED_MATRIX(arrayA, 1, 64, int16_t, CACHE_LINE);
743          DECLARE_ALIGNED_MATRIX(arrayB, 1, 64, int16_t, CACHE_LINE);          DECLARE_ALIGNED_MATRIX(arrayB, 1, 64, int16_t, CACHE_LINE);

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43

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