[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 874, Wed Feb 19 21:13:00 2003 UTC revision 1066, Wed Jun 11 14:10:59 2003 UTC
# Line 17  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   *   *
20   * $Id: xvid.c,v 1.43 2003-02-19 21:13:00 edgomez Exp $   * $Id: xvid.c,v 1.47 2003-06-11 14:10:55 Isibaar Exp $
21   *   *
22   ****************************************************************************/   ****************************************************************************/
23    
# Line 488  Line 488 
488    
489          if ((cpu_flags & XVID_CPU_SSE2)) {          if ((cpu_flags & XVID_CPU_SSE2)) {
490    
491    #if defined(EXPERIMENTAL_SSE2_CODE) /* many people reported crashes with SSE2 */
492                                                                            /* better deactivate it completely and fix everything */
493                                                                            /* in dev-api-4 */
494                  calc_cbp = calc_cbp_sse2;                  calc_cbp = calc_cbp_sse2;
495    
496                  /* Quantization */                  /* Quantization */
# Line 496  Line 499 
499                  quant_inter   = quant_inter_sse2;                  quant_inter   = quant_inter_sse2;
500                  dequant_inter = dequant_inter_sse2;                  dequant_inter = dequant_inter_sse2;
501    
 #if defined(EXPERIMENTAL_SSE2_CODE)  
502                  /* ME; slower than xmm */                  /* ME; slower than xmm */
503                  sad16    = sad16_sse2;                  sad16    = sad16_sse2;
504                  dev16    = dev16_sse2;                  dev16    = dev16_sse2;
505  #endif  #endif
506                  /* Forward and Inverse DCT */                  /* Forward and Inverse DCT */
507                  idct  = idct_sse2;                  /* idct  = idct_sse2;
508                  fdct = fdct_sse2;                  /* fdct = fdct_sse2; Both are none to be unprecise - better deactivate for now */
509          }          }
510  #endif  #endif
511    
# Line 811  Line 813 
813    
814  int xvid_init_test(int flags)  int xvid_init_test(int flags)
815  {  {
816    #if defined(ARCH_IS_IA32)
817          int cpu_flags;          int cpu_flags;
818    #endif
819    
820          srand(time(0));          printf("XviD tests\n\n");
   
         printf("xvid_init_test\n");  
821    
822  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
823          cpu_flags = detect_cpu_flags();          cpu_flags = detect_cpu_flags();
824    #endif
825    
826          idct_int32_init();          idct_int32_init();
827          emms_mmx();          emms();
828    
829            srand(time(0));
830    
831            /* fDCT test */
832          printf("--- fdct ---\n");          printf("--- fdct ---\n");
833                  test_transform(fdct_int32, fdct_int32, "c", TEST_FDCT, flags);                  test_transform(fdct_int32, fdct_int32, "c", TEST_FDCT, flags);
834    
835    #if defined(ARCH_IS_IA32)
836          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
837                  test_transform(fdct_int32, fdct_mmx, "mmx", TEST_FDCT, flags);                  test_transform(fdct_int32, fdct_mmx, "mmx", TEST_FDCT, flags);
838          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
839                  test_transform(fdct_int32, fdct_sse2, "sse2", TEST_FDCT, flags);                  test_transform(fdct_int32, fdct_sse2, "sse2", TEST_FDCT, flags);
840    #endif
841    
842            /* iDCT test */
843          printf("\n--- idct ---\n");          printf("\n--- idct ---\n");
844                  test_transform(idct_int32, idct_int32, "c", TEST_IDCT, flags);                  test_transform(idct_int32, idct_int32, "c", TEST_IDCT, flags);
845    
846    #if defined(ARCH_IS_IA32)
847          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
848                  test_transform(idct_int32, idct_mmx, "mmx", TEST_IDCT, flags);                  test_transform(idct_int32, idct_mmx, "mmx", TEST_IDCT, flags);
849          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
# Line 839  Line 852 
852                  test_transform(idct_int32, idct_3dne, "3dne", TEST_IDCT, flags);                  test_transform(idct_int32, idct_3dne, "3dne", TEST_IDCT, flags);
853          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
854                  test_transform(idct_int32, idct_sse2, "sse2", TEST_IDCT, flags);                  test_transform(idct_int32, idct_sse2, "sse2", TEST_IDCT, flags);
855    #endif
856    
857            /* Intra quantization test */
858          printf("\n--- quant intra ---\n");          printf("\n--- quant intra ---\n");
859                  test_quant(quant_intra_c, quant_intra_c, "c", TEST_QUANT_INTRA, flags);                  test_quant(quant_intra_c, quant_intra_c, "c", TEST_QUANT_INTRA, flags);
860    
861    #if defined(ARCH_IS_IA32)
862          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
863                  test_quant(quant_intra_c, quant_intra_mmx, "mmx", TEST_QUANT_INTRA, flags);                  test_quant(quant_intra_c, quant_intra_mmx, "mmx", TEST_QUANT_INTRA, flags);
864          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
865                  test_quant(quant_intra_c, quant_intra_3dne, "3dne", TEST_QUANT_INTRA, flags);                  test_quant(quant_intra_c, quant_intra_3dne, "3dne", TEST_QUANT_INTRA, flags);
866          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
867                  test_quant(quant_intra_c, quant_intra_sse2, "sse2", TEST_QUANT_INTRA, flags);                  test_quant(quant_intra_c, quant_intra_sse2, "sse2", TEST_QUANT_INTRA, flags);
868    #endif
869    
870            /* Inter quantization test */
871          printf("\n--- quant inter ---\n");          printf("\n--- quant inter ---\n");
872                  test_quant(quant_inter_c, quant_inter_c, "c", TEST_QUANT_INTER, flags);                  test_quant(quant_inter_c, quant_inter_c, "c", TEST_QUANT_INTER, flags);
873    
874    #if defined(ARCH_IS_IA32)
875          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
876                  test_quant(quant_inter_c, quant_inter_mmx, "mmx", TEST_QUANT_INTER, flags);                  test_quant(quant_inter_c, quant_inter_mmx, "mmx", TEST_QUANT_INTER, flags);
877          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
878                  test_quant(quant_inter_c, quant_inter_3dne, "3dne", TEST_QUANT_INTER, flags);                  test_quant(quant_inter_c, quant_inter_3dne, "3dne", TEST_QUANT_INTER, flags);
879          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
880                  test_quant(quant_inter_c, quant_inter_sse2, "sse2", TEST_QUANT_INTER, flags);                  test_quant(quant_inter_c, quant_inter_sse2, "sse2", TEST_QUANT_INTER, flags);
881    #endif
882    
883            /* Intra dequantization test */
884          printf("\n--- dequant intra ---\n");          printf("\n--- dequant intra ---\n");
885                  test_quant(dequant_intra_c, dequant_intra_c, "c", TEST_DEQUANT_INTRA, flags);                  test_quant(dequant_intra_c, dequant_intra_c, "c", TEST_DEQUANT_INTRA, flags);
886    
887    #if defined(ARCH_IS_IA32)
888          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
889                  test_quant(dequant_intra_c, dequant_intra_mmx, "mmx", TEST_DEQUANT_INTRA, flags);                  test_quant(dequant_intra_c, dequant_intra_mmx, "mmx", TEST_DEQUANT_INTRA, flags);
890          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
# Line 868  Line 893 
893                  test_quant(dequant_intra_c, dequant_intra_3dne, "3dne", TEST_DEQUANT_INTRA, flags);                  test_quant(dequant_intra_c, dequant_intra_3dne, "3dne", TEST_DEQUANT_INTRA, flags);
894          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
895                  test_quant(dequant_intra_c, dequant_intra_sse2, "sse2", TEST_DEQUANT_INTRA, flags);                  test_quant(dequant_intra_c, dequant_intra_sse2, "sse2", TEST_DEQUANT_INTRA, flags);
896    #endif
897    
898            /* Inter dequantization test */
899          printf("\n--- dequant inter ---\n");          printf("\n--- dequant inter ---\n");
900                  test_quant(dequant_inter_c, dequant_inter_c, "c", TEST_DEQUANT_INTER, flags);                  test_quant(dequant_inter_c, dequant_inter_c, "c", TEST_DEQUANT_INTER, flags);
901    
902    #if defined(ARCH_IS_IA32)
903          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
904                  test_quant(dequant_inter_c, dequant_inter_mmx, "mmx", TEST_DEQUANT_INTER, flags);                  test_quant(dequant_inter_c, dequant_inter_mmx, "mmx", TEST_DEQUANT_INTER, flags);
905          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
# Line 879  Line 908 
908                  test_quant(dequant_inter_c, dequant_inter_3dne, "3dne", TEST_DEQUANT_INTER, flags);                  test_quant(dequant_inter_c, dequant_inter_3dne, "3dne", TEST_DEQUANT_INTER, flags);
909          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
910                  test_quant(dequant_inter_c, dequant_inter_sse2, "sse2", TEST_DEQUANT_INTER, flags);                  test_quant(dequant_inter_c, dequant_inter_sse2, "sse2", TEST_DEQUANT_INTER, flags);
911    #endif
912    
913          printf("\n--- quant4_intra ---\n");          /* Intra quantization test */
914            printf("\n--- quant4 intra ---\n");
915                  test_quant(quant4_intra_c, quant4_intra_c, "c", TEST_QUANT_INTRA, flags);                  test_quant(quant4_intra_c, quant4_intra_c, "c", TEST_QUANT_INTRA, flags);
916    
917    #if defined(ARCH_IS_IA32)
918          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
919                  test_quant(quant4_intra_c, quant4_intra_mmx, "mmx", TEST_QUANT_INTRA, flags);                  test_quant(quant4_intra_c, quant4_intra_mmx, "mmx", TEST_QUANT_INTRA, flags);
920          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
921                  test_quant(quant4_intra_c, quant4_intra_xmm, "xmm", TEST_QUANT_INTRA, flags);                  test_quant(quant4_intra_c, quant4_intra_xmm, "xmm", TEST_QUANT_INTRA, flags);
922    #endif
923    
924          printf("\n--- quant4_inter ---\n");          /* Inter quantization test */
925            printf("\n--- quant4 inter ---\n");
926                  test_quant(quant4_inter_c, quant4_inter_c, "c", TEST_QUANT_INTER, flags);                  test_quant(quant4_inter_c, quant4_inter_c, "c", TEST_QUANT_INTER, flags);
927    
928    #if defined(ARCH_IS_IA32)
929          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
930                  test_quant(quant4_inter_c, quant4_inter_mmx, "mmx", TEST_QUANT_INTER, flags);                  test_quant(quant4_inter_c, quant4_inter_mmx, "mmx", TEST_QUANT_INTER, flags);
931          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
932                  test_quant(quant4_inter_c, quant4_inter_xmm, "xmm", TEST_QUANT_INTER, flags);                  test_quant(quant4_inter_c, quant4_inter_xmm, "xmm", TEST_QUANT_INTER, flags);
933    #endif
934    
935          printf("\n--- dequant4_intra ---\n");          /* Intra dequantization test */
936            printf("\n--- dequant4 intra ---\n");
937                  test_quant(dequant4_intra_c, dequant4_intra_c, "c", TEST_DEQUANT_INTRA, flags);                  test_quant(dequant4_intra_c, dequant4_intra_c, "c", TEST_DEQUANT_INTRA, flags);
938    
939    #if defined(ARCH_IS_IA32)
940          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
941                  test_quant(dequant4_intra_c, dequant4_intra_mmx, "mmx", TEST_DEQUANT_INTRA, flags);                  test_quant(dequant4_intra_c, dequant4_intra_mmx, "mmx", TEST_DEQUANT_INTRA, flags);
942          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
943                  test_quant(dequant4_intra_c, dequant4_intra_3dne, "3dne", TEST_DEQUANT_INTRA, flags);                  test_quant(dequant4_intra_c, dequant4_intra_3dne, "3dne", TEST_DEQUANT_INTRA, flags);
944    #endif
945    
946          printf("\n--- dequant4_inter ---\n");          /* Inter dequantization test */
947            printf("\n--- dequant4 inter ---\n");
948                  test_quant(dequant4_inter_c, dequant4_inter_c, "c", TEST_DEQUANT_INTER, flags);                  test_quant(dequant4_inter_c, dequant4_inter_c, "c", TEST_DEQUANT_INTER, flags);
949    
950    #if defined(ARCH_IS_IA32)
951          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
952                  test_quant(dequant4_inter_c, dequant4_inter_mmx, "mmx", TEST_DEQUANT_INTER, flags);                  test_quant(dequant4_inter_c, dequant4_inter_mmx, "mmx", TEST_DEQUANT_INTER, flags);
953          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
954                  test_quant(dequant4_inter_c, dequant4_inter_3dne, "3dne", TEST_DEQUANT_INTER, flags);                  test_quant(dequant4_inter_c, dequant4_inter_3dne, "3dne", TEST_DEQUANT_INTER, flags);
   
         emms_mmx();  
   
955  #endif  #endif
956    
957            emms();
958    
959          return XVID_ERR_OK;          return XVID_ERR_OK;
960  }  }
961    
# Line 931  Line 975 
975                          return xvid_init_convert((XVID_INIT_CONVERTINFO*)param1);                          return xvid_init_convert((XVID_INIT_CONVERTINFO*)param1);
976    
977                  case XVID_INIT_TEST :                  case XVID_INIT_TEST :
978                          return xvid_init_test((int)param1);                  {
979                            ptr_t flags = (ptr_t)param1;
980                            return xvid_init_test((int)flags);
981                    }
982                  default :                  default :
983                          return XVID_ERR_FAIL;                          return XVID_ERR_FAIL;
984          }          }
# Line 990  Line 1036 
1036          case XVID_ENC_ENCODE:          case XVID_ENC_ENCODE:
1037    
1038                  if (((Encoder *) handle)->mbParam.max_bframes >= 0)                  if (((Encoder *) handle)->mbParam.max_bframes >= 0)
1039                  return encoder_encode_bframes((Encoder *) handle, (XVID_ENC_FRAME *) param1,                          return encoder_encode_bframes((Encoder *) handle,
1040                                                                                      (XVID_ENC_FRAME *) param1,
1041                                                            (XVID_ENC_STATS *) param2);                                                            (XVID_ENC_STATS *) param2);
1042                  else                  else
1043                  return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,                          return encoder_encode((Encoder *) handle,
1044                                                                      (XVID_ENC_FRAME *) param1,
1045                                                            (XVID_ENC_STATS *) param2);                                                            (XVID_ENC_STATS *) param2);
1046    
1047          case XVID_ENC_CREATE:          case XVID_ENC_CREATE:
Legend:
Removed from v.874  
changed lines
  Added in v.1066
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4