[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.45.2.1, Sat Feb 22 08:49:44 2003 UTC revision 1.45.2.12, Sat Aug 2 15:08:30 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   *   *
6     *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
7     *
8   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
9   *  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
10   *  the Free Software Foundation ; either version 2 of the License, or   *  the Free Software Foundation ; either version 2 of the License, or
# Line 45  Line 47 
47  #include "utils/timer.h"  #include "utils/timer.h"
48  #include "bitstream/mbcoding.h"  #include "bitstream/mbcoding.h"
49    
50    #if defined(_DEBUG)
51    unsigned int xvid_debug = 0; /* xvid debug mask */
52    #endif
53    
54  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
55    
56  #if defined(_MSC_VER)  #if defined(_MSC_VER)
# Line 157  Line 163 
163  {  {
164          unsigned int cpu_flags;          unsigned int cpu_flags;
165    
166          if (XVID_MAJOR(init->version) != 1) /* v1.x.x */          if (XVID_VERSION_MAJOR(init->version) != 1) /* v1.x.x */
167                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
168    
169          cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();          cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();
# Line 282  Line 288 
288    
289  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
290    
291          if ((cpu_flags & XVID_CPU_ASM))          if ((cpu_flags & XVID_CPU_ASM)) {
         {  
292                  vfilter_31 = xvid_VFilter_31_x86;                  vfilter_31 = xvid_VFilter_31_x86;
293                  hfilter_31 = xvid_HFilter_31_x86;                  hfilter_31 = xvid_HFilter_31_x86;
294          }          }
# Line 482  Line 487 
487                  dev16    = dev16_sse2;                  dev16    = dev16_sse2;
488  #endif  #endif
489                  /* Forward and Inverse DCT */                  /* Forward and Inverse DCT */
490    #if 0 /* Both function are known to be unprecise, better keep them deactivated */
491                  idct  = idct_sse2;                  idct  = idct_sse2;
492                  fdct = fdct_sse2;                  fdct = fdct_sse2;
493    #endif
494          }          }
495  #endif  #endif
496    
# Line 510  Line 517 
517            transfer_8to16sub2 = transfer_8to16sub2_ia64;            transfer_8to16sub2 = transfer_8to16sub2_ia64;
518            transfer_16to8add = transfer_16to8add_ia64;            transfer_16to8add = transfer_16to8add_ia64;
519            transfer8x8_copy = transfer8x8_copy_ia64;            transfer8x8_copy = transfer8x8_copy_ia64;
           DPRINTF(DPRINTF_DEBUG, "Using IA-64 assembler routines.");  
520          }          }
521  #endif  #endif
522    
# Line 532  Line 538 
538          }          }
539  #endif  #endif
540    
541    #if defined(_DEBUG)
542        xvid_debug = init->debug;
543    #endif
544    
545          return 0;          return 0;
546  }  }
547    
# Line 539  Line 549 
549  static int  static int
550  xvid_gbl_info(xvid_gbl_info_t * info)  xvid_gbl_info(xvid_gbl_info_t * info)
551  {  {
552          if (XVID_MAJOR(info->version) != 1) /* v1.x.x */          if (XVID_VERSION_MAJOR(info->version) != 1) /* v1.x.x */
553                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
554    
555          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
# Line 565  Line 575 
575          int height2;          int height2;
576          IMAGE img;          IMAGE img;
577    
578          if (XVID_MAJOR(convert->version) != 1)   /* v1.x.x */          if (XVID_VERSION_MAJOR(convert->version) != 1)   /* v1.x.x */
579                return XVID_ERR_VERSION;                return XVID_ERR_VERSION;
580    
581          // const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);  #if 0
582            const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);
583    #endif
584          width = convert->width;          width = convert->width;
585          height = convert->height;          height = convert->height;
586          width2 = convert->width/2;          width2 = convert->width/2;
# Line 640  Line 652 
652  {  {
653          int i, diff = 0;          int i, diff = 0;
654          for (i = 0; i < size; i++)          for (i = 0; i < size; i++)
655                  diff += ABS(blockA[i]-blockB[i]);                  diff += abs(blockA[i]-blockB[i]);
656          return diff;          return diff;
657  }  }
658    
# Line 1055  Line 1067 
1067                                                            (xvid_enc_stats_t *) param2);                                                            (xvid_enc_stats_t *) param2);
1068    
1069          case XVID_ENC_CREATE:          case XVID_ENC_CREATE:
1070                  return enc_create((xvid_enc_create_t *) param1, (xvid_enc_rc_t*)param2);                  return enc_create((xvid_enc_create_t *) param1);
1071    
1072          case XVID_ENC_DESTROY:          case XVID_ENC_DESTROY:
1073                  return enc_destroy((Encoder *) handle);                  return enc_destroy((Encoder *) handle);
Legend:
Removed from v.1.45.2.1  
changed lines
  Added in v.1.45.2.12
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4