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

Diff of /trunk/xvidcore/src/xvid.c

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

revision 1653, Tue Nov 22 10:23:01 2005 UTC revision 1688, Sat Feb 25 04:41:12 2006 UTC
# Line 19  Line 19 
19   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   * $Id: xvid.c,v 1.65 2005-11-22 10:23:01 suxen_drol Exp $   * $Id: xvid.c,v 1.68 2006-02-25 04:41:12 suxen_drol Exp $
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# Line 636  Line 636 
636           * features there really are. */           * features there really are. */
637          if (cpu_flags & XVID_CPU_ASM) {          if (cpu_flags & XVID_CPU_ASM) {
638                  /* SIMD state flusher */                  /* SIMD state flusher */
639                  emms = emms_3dn;                  emms = emms_mmx;
640    
641                  /* DCT operators */                  /* DCT operators */
642                  fdct = fdct_skal_x86_64;                  fdct = fdct_skal_x86_64;
# Line 712  Line 712 
712                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
713    
714          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
715          info->build = "xvid-1.1.0-beta2";          info->build = "xvid-1.2.0-dev";
716          info->cpu_flags = detect_cpu_flags();          info->cpu_flags = detect_cpu_flags();
   
 #if defined(_SMP) && defined(WIN32)  
         info->num_threads = pthread_num_processors_np();;  
 #else  
717          info->num_threads = 0;          info->num_threads = 0;
718    
719    #if defined(WIN32)
720      {
721        DWORD dwProcessAffinityMask, dwSystemAffinityMask;
722        if (GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask)) {
723          int i;
724          for(i=0; i<32; i++) {
725            if ((dwProcessAffinityMask & (1<<i)))
726              info->num_threads++;
727          }
728        }
729      }
730  #endif  #endif
731    
732          return 0;          return 0;
Legend:
Removed from v.1653  
changed lines
  Added in v.1688
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4