[svn] / branches / dev-api-4 / xvidcore / src / xvid.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/xvid.c

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

trunk/xvidcore/src/xvid.c revision 874, Wed Feb 19 21:13:00 2003 UTC branches/dev-api-4/xvidcore/src/xvid.c revision 1031, Sat May 17 13:26:51 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.45.2.4 2003-05-17 13:26:42 suxen_drol Exp $
21   *   *
22   ****************************************************************************/   ****************************************************************************/
23    
# Line 45  Line 45 
45  #include "utils/timer.h"  #include "utils/timer.h"
46  #include "bitstream/mbcoding.h"  #include "bitstream/mbcoding.h"
47    
48    #if defined(_DEBUG)
49    unsigned int xvid_debug = 0; /* xvid debug mask */
50    #endif
51    
52  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
53    
54  #if defined(_MSC_VER)  #if defined(_MSC_VER)
# Line 153  Line 157 
157    
158    
159  static  static
160  int xvid_init_init(XVID_INIT_PARAM * init_param)  int xvid_gbl_init(xvid_gbl_init_t * init)
 {  
         int cpu_flags;  
   
         /* Inform the client the API version */  
         init_param->api_version = API_VERSION;  
   
         /* Inform the client the core build - unused because we're still alpha */  
         init_param->core_build = 1000;  
   
         /* Do we have to force CPU features  ? */  
         if ((init_param->cpu_flags & XVID_CPU_FORCE)) {  
   
                 cpu_flags = init_param->cpu_flags;  
   
         } else {  
   
                 cpu_flags = detect_cpu_flags();  
         }  
   
         if ((init_param->cpu_flags & XVID_CPU_CHKONLY))  
161          {          {
162                  init_param->cpu_flags = cpu_flags;          unsigned int cpu_flags;
                 return XVID_ERR_OK;  
         }  
163    
164          init_param->cpu_flags = cpu_flags;          if (XVID_MAJOR(init->version) != 1) /* v1.x.x */
165                    return XVID_ERR_VERSION;
166    
167            cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();
168    
169          /* Initialize the function pointers */          /* Initialize the function pointers */
170          idct_int32_init();          idct_int32_init();
# Line 552  Line 536 
536          }          }
537  #endif  #endif
538    
539          return XVID_ERR_OK;  #if defined(_DEBUG)
540        xvid_debug = init->debug;
541    #endif
542    
543        return 0;
544  }  }
545    
546    
547    static int
548    xvid_gbl_info(xvid_gbl_info_t * info)
549    {
550            if (XVID_MAJOR(info->version) != 1) /* v1.x.x */
551                    return XVID_ERR_VERSION;
552    
553            info->actual_version = XVID_VERSION;
554            info->build = "dev-api-4";
555            info->cpu_flags = detect_cpu_flags();
556    
557    #if defined(_SMP) && defined(WIN32)
558            info->num_threads = pthread_num_processors_np();;
559    #else
560            info->num_threads = 0;
561    #endif
562    
563            return 0;
564    }
565    
566    
567  static int  static int
568  xvid_init_convert(XVID_INIT_CONVERTINFO* convert)  xvid_gbl_convert(xvid_gbl_convert_t* convert)
569  {  {
570  /*          int width;
571          const int flip1 =          int height;
572                  (convert->input.colorspace & XVID_CSP_VFLIP) ^          int width2;
573                  (convert->output.colorspace & XVID_CSP_VFLIP);          int height2;
 */  
         const int width = convert->width;  
         const int height = convert->height;  
         const int width2 = convert->width/2;  
         const int height2 = convert->height/2;  
574          IMAGE img;          IMAGE img;
575    
576          switch (convert->input.colorspace & ~XVID_CSP_VFLIP)          if (XVID_MAJOR(convert->version) != 1)   /* v1.x.x */
577                  return XVID_ERR_VERSION;
578    
579            // const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);
580            width = convert->width;
581            height = convert->height;
582            width2 = convert->width/2;
583            height2 = convert->height/2;
584    
585            switch (convert->input.csp & ~XVID_CSP_VFLIP)
586          {          {
587                  case XVID_CSP_YV12 :                  case XVID_CSP_YV12 :
588                          img.y = convert->input.y;                          img.y = convert->input.plane[0];
589                          img.v = (uint8_t*)convert->input.y + width*height;                          img.v = (uint8_t*)convert->input.plane[0] + convert->input.stride[0]*height;
590                          img.u = (uint8_t*)convert->input.y + width*height + width2*height2;                          img.u = (uint8_t*)convert->input.plane[0] + convert->input.stride[0]*height + (convert->input.stride[0]/2)*height2;
591                          image_output(&img, width, height, width,                          image_output(&img, width, height, width,
592                                                  convert->output.y, convert->output.y_stride,                                                  (uint8_t**)convert->output.plane, convert->output.stride,
593                                                  convert->output.colorspace, convert->interlacing);                                                  convert->output.csp, convert->interlacing);
594                          break;                          break;
595    
596                  default :                  default :
# Line 588  Line 599 
599    
600    
601          emms();          emms();
602          return XVID_ERR_OK;          return 0;
603  }  }
604    
605    
# Line 637  Line 648 
648  {  {
649          int i, diff = 0;          int i, diff = 0;
650          for (i = 0; i < size; i++)          for (i = 0; i < size; i++)
651                  diff += ABS(blockA[i]-blockB[i]);                  diff += abs(blockA[i]-blockB[i]);
652          return diff;          return diff;
653  }  }
654    
# Line 811  Line 822 
822    
823  int xvid_init_test(int flags)  int xvid_init_test(int flags)
824  {  {
825    #if defined(ARCH_IS_IA32)
826          int cpu_flags;          int cpu_flags;
827    #endif
828    
829          srand(time(0));          printf("XviD tests\n\n");
   
         printf("xvid_init_test\n");  
830    
831  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
832          cpu_flags = detect_cpu_flags();          cpu_flags = detect_cpu_flags();
833    #endif
834    
835          idct_int32_init();          idct_int32_init();
836          emms_mmx();          emms();
837    
838            srand(time(0));
839    
840            /* fDCT test */
841          printf("--- fdct ---\n");          printf("--- fdct ---\n");
842                  test_transform(fdct_int32, fdct_int32, "c", TEST_FDCT, flags);                  test_transform(fdct_int32, fdct_int32, "c", TEST_FDCT, flags);
843    
844    #if defined(ARCH_IS_IA32)
845          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
846                  test_transform(fdct_int32, fdct_mmx, "mmx", TEST_FDCT, flags);                  test_transform(fdct_int32, fdct_mmx, "mmx", TEST_FDCT, flags);
847          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
848                  test_transform(fdct_int32, fdct_sse2, "sse2", TEST_FDCT, flags);                  test_transform(fdct_int32, fdct_sse2, "sse2", TEST_FDCT, flags);
849    #endif
850    
851            /* iDCT test */
852          printf("\n--- idct ---\n");          printf("\n--- idct ---\n");
853                  test_transform(idct_int32, idct_int32, "c", TEST_IDCT, flags);                  test_transform(idct_int32, idct_int32, "c", TEST_IDCT, flags);
854    
855    #if defined(ARCH_IS_IA32)
856          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
857                  test_transform(idct_int32, idct_mmx, "mmx", TEST_IDCT, flags);                  test_transform(idct_int32, idct_mmx, "mmx", TEST_IDCT, flags);
858          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
# Line 839  Line 861 
861                  test_transform(idct_int32, idct_3dne, "3dne", TEST_IDCT, flags);                  test_transform(idct_int32, idct_3dne, "3dne", TEST_IDCT, flags);
862          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
863                  test_transform(idct_int32, idct_sse2, "sse2", TEST_IDCT, flags);                  test_transform(idct_int32, idct_sse2, "sse2", TEST_IDCT, flags);
864    #endif
865    
866            /* Intra quantization test */
867          printf("\n--- quant intra ---\n");          printf("\n--- quant intra ---\n");
868                  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);
869    
870    #if defined(ARCH_IS_IA32)
871          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
872                  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);
873          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
874                  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);
875          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
876                  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);
877    #endif
878    
879            /* Inter quantization test */
880          printf("\n--- quant inter ---\n");          printf("\n--- quant inter ---\n");
881                  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);
882    
883    #if defined(ARCH_IS_IA32)
884          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
885                  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);
886          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
887                  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);
888          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
889                  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);
890    #endif
891    
892            /* Intra dequantization test */
893          printf("\n--- dequant intra ---\n");          printf("\n--- dequant intra ---\n");
894                  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);
895    
896    #if defined(ARCH_IS_IA32)
897          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
898                  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);
899          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
# Line 868  Line 902 
902                  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);
903          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
904                  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);
905    #endif
906    
907            /* Inter dequantization test */
908          printf("\n--- dequant inter ---\n");          printf("\n--- dequant inter ---\n");
909                  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);
910    
911    #if defined(ARCH_IS_IA32)
912          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
913                  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);
914          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
# Line 879  Line 917 
917                  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);
918          if (cpu_flags & XVID_CPU_SSE2)          if (cpu_flags & XVID_CPU_SSE2)
919                  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);
920    #endif
921    
922          printf("\n--- quant4_intra ---\n");          /* Intra quantization test */
923            printf("\n--- quant4 intra ---\n");
924                  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);
925    
926    #if defined(ARCH_IS_IA32)
927          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
928                  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);
929          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
930                  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);
931    #endif
932    
933          printf("\n--- quant4_inter ---\n");          /* Inter quantization test */
934            printf("\n--- quant4 inter ---\n");
935                  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);
936    
937    #if defined(ARCH_IS_IA32)
938          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
939                  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);
940          if (cpu_flags & XVID_CPU_MMXEXT)          if (cpu_flags & XVID_CPU_MMXEXT)
941                  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);
942    #endif
943    
944          printf("\n--- dequant4_intra ---\n");          /* Intra dequantization test */
945            printf("\n--- dequant4 intra ---\n");
946                  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);
947    
948    #if defined(ARCH_IS_IA32)
949          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
950                  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);
951          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
952                  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);
953    #endif
954    
955          printf("\n--- dequant4_inter ---\n");          /* Inter dequantization test */
956            printf("\n--- dequant4 inter ---\n");
957                  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);
958    
959    #if defined(ARCH_IS_IA32)
960          if (cpu_flags & XVID_CPU_MMX)          if (cpu_flags & XVID_CPU_MMX)
961                  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);
962          if (cpu_flags & XVID_CPU_3DNOWEXT)          if (cpu_flags & XVID_CPU_3DNOWEXT)
963                  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();  
   
964  #endif  #endif
965    
966          return XVID_ERR_OK;          emms();
967    
968            return 0;
969  }  }
970    
971    
972    /*****************************************************************************
973     * XviD Global Entry point
974     *
975     * Well this function initialize all internal function pointers according
976     * to the CPU features forced by the library client or autodetected (depending
977     * on the XVID_CPU_FORCE flag). It also initializes vlc coding tables and all
978     * image colorspace transformation tables.
979     *
980     ****************************************************************************/
981    
982    
983  int  int
984  xvid_init(void *handle,  xvid_global(void *handle,
985                    int opt,                    int opt,
986                    void *param1,                    void *param1,
987                    void *param2)                    void *param2)
988  {  {
989          switch(opt)          switch(opt)
990          {          {
991                  case XVID_INIT_INIT :                  case XVID_GBL_INIT :
992                          return xvid_init_init((XVID_INIT_PARAM*)param1);                          return xvid_gbl_init((xvid_gbl_init_t*)param1);
993    
994                  case XVID_INIT_CONVERT :          case XVID_GBL_INFO :
995                          return xvid_init_convert((XVID_INIT_CONVERTINFO*)param1);              return xvid_gbl_info((xvid_gbl_info_t*)param1);
996    
997                  case XVID_INIT_TEST :                  case XVID_GBL_CONVERT :
998                          return xvid_init_test((int)param1);                          return xvid_gbl_convert((xvid_gbl_convert_t*)param1);
999    
1000                    case XVID_GBL_TEST :
1001                    {
1002                            ptr_t flags = (ptr_t)param1;
1003                            return xvid_init_test((int)flags);
1004                    }
1005                  default :                  default :
1006                          return XVID_ERR_FAIL;                          return XVID_ERR_FAIL;
1007          }          }
# Line 955  Line 1024 
1024                          void *param2)                          void *param2)
1025  {  {
1026          switch (opt) {          switch (opt) {
         case XVID_DEC_DECODE:  
                 return decoder_decode((DECODER *) handle, (XVID_DEC_FRAME *) param1, (XVID_DEC_STATS*) param2);  
   
1027          case XVID_DEC_CREATE:          case XVID_DEC_CREATE:
1028                  return decoder_create((XVID_DEC_PARAM *) param1);                  return decoder_create((xvid_dec_create_t *) param1);
1029    
1030          case XVID_DEC_DESTROY:          case XVID_DEC_DESTROY:
1031                  return decoder_destroy((DECODER *) handle);                  return decoder_destroy((DECODER *) handle);
1032    
1033            case XVID_DEC_DECODE:
1034                    return decoder_decode((DECODER *) handle, (xvid_dec_frame_t *) param1, (xvid_dec_stats_t*) param2);
1035    
1036          default:          default:
1037                  return XVID_ERR_FAIL;                  return XVID_ERR_FAIL;
1038          }          }
# Line 989  Line 1058 
1058          switch (opt) {          switch (opt) {
1059          case XVID_ENC_ENCODE:          case XVID_ENC_ENCODE:
1060    
1061                  if (((Encoder *) handle)->mbParam.max_bframes >= 0)                  return enc_encode((Encoder *) handle,
1062                  return encoder_encode_bframes((Encoder *) handle, (XVID_ENC_FRAME *) param1,                                                            (xvid_enc_frame_t *) param1,
1063                                                            (XVID_ENC_STATS *) param2);                                                            (xvid_enc_stats_t *) param2);
                 else  
                 return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,  
                                                           (XVID_ENC_STATS *) param2);  
1064    
1065          case XVID_ENC_CREATE:          case XVID_ENC_CREATE:
1066                  return encoder_create((XVID_ENC_PARAM *) param1);                  return enc_create((xvid_enc_create_t *) param1);
1067    
1068          case XVID_ENC_DESTROY:          case XVID_ENC_DESTROY:
1069                  return encoder_destroy((Encoder *) handle);                  return enc_destroy((Encoder *) handle);
1070    
1071          default:          default:
1072                  return XVID_ERR_FAIL;                  return XVID_ERR_FAIL;
Legend:
Removed from v.874  
changed lines
  Added in v.1031
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4