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

Diff of /trunk/xvidcore/vfw/src/codec.c

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

revision 1890, Tue Aug 10 14:17:40 2010 UTC revision 2140, Tue Sep 27 16:09:30 2016 UTC
# Line 3  Line 3 
3   *      XVID VFW FRONTEND   *      XVID VFW FRONTEND
4   *      codec   *      codec
5   *   *
6     *      Copyright(C) 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 17  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., 675 Mass Ave, Cambridge, MA 02139, USA.   *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21   *   *
22   *************************************************************************/   * $Id$
   
 /**************************************************************************  
  *  
  *      History:  
  *  
  *      12.07.2002      num_threads  
  *      23.06.2002      XVID_CPU_CHKONLY; loading speed up  
  *      25.04.2002      ICDECOMPRESS_PREROLL  
  *      17.04.2002      re-enabled lumi masking for 1st pass  
  *      15.04.2002      updated cbr support  
  *      04.04.2002      separated 2-pass code to 2pass.c  
  *                              interlacing support  
  *                              hinted ME support  
  *      23.03.2002      daniel smith <danielsmith@astroboymail.com>  
  *                              changed inter4v to only be in modes 5 or 6  
  *                              fixed null mode crash ?  
  *                              merged foxer's alternative 2-pass code  
  *                              added DEBUGERR output on errors instead of returning  
  *      16.03.2002      daniel smith <danielsmith@astroboymail.com>  
  *                              changed BITMAPV4HEADER to BITMAPINFOHEADER  
  *                                      - prevents memcpy crash in compress_get_format()  
  *                              credits are processed in external 2pass mode  
  *                              motion search precision = 0 now effective in 2-pass  
  *                              modulated quantization  
  *                              added DX50 fourcc  
  *      01.12.2001      inital version; (c)2001 peter ross <pross@xvid.org>  
23   *   *
24   *************************************************************************/   *************************************************************************/
25    
# Line 183  Line 159 
159                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
160          }          }
161    
162            if ((inhdr->biWidth % 4) || (inhdr->biHeight % 4))
163            {
164                    return ICERR_BADFORMAT;
165            }
166    
167          if (lpbiOutput == NULL)          if (lpbiOutput == NULL)
168          {          {
169                  return ICERR_OK;                  return ICERR_OK;
# Line 221  Line 202 
202          outhdr->biClrUsed = 0;          outhdr->biClrUsed = 0;
203          outhdr->biClrImportant = 0;          outhdr->biClrImportant = 0;
204    
205          if (codec->config.fourcc_used == 0)          if ((codec->config.fourcc_used == 0) || (profiles[codec->config.profile].flags & PROFILE_XVID))
206          {          {
207                  outhdr->biCompression = FOURCC_XVID;                  outhdr->biCompression = FOURCC_XVID;
208          }          }
# Line 451  Line 432 
432          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
433          create.version = XVID_VERSION;          create.version = XVID_VERSION;
434    
435        /* Encoder threads */
436        if (codec->config.cpu & XVID_CPU_FORCE)
437                    create.num_threads = codec->config.num_threads;
438            else
439            create.num_threads = info.num_threads; /* Autodetect */
440    
441            /* Encoder slices */
442            if ((profiles[codec->config.profile].flags & PROFILE_RESYNCMARKER) && codec->config.num_slices != 1) {
443    
444                    if (codec->config.num_slices == 0) { /* auto */
445                            int mb_width = (lpbiInput->bmiHeader.biWidth + 15) / 16;
446                            int mb_height = (lpbiInput->bmiHeader.biHeight + 15) / 16;
447    
448                            int slices = (int)((mb_width*mb_height) / 811); /* use multiple slices only above SD resolutions for now */
449    
450                            if (slices > 1) {
451                                    if (create.num_threads <= 1)
452                                            slices &= ~1; /* make even */
453                                    else if (create.num_threads <= slices)
454                                            slices = (slices / create.num_threads) * create.num_threads; /* multiple of threads */
455                                    else if (create.num_threads % slices)
456                                            slices = (!(create.num_threads%2)) ? (create.num_threads/2) : (create.num_threads/3);
457                            }
458    
459                            create.num_slices = slices;
460                    }
461                    else {
462                            create.num_slices = codec->config.num_slices; /* force manual value - by registry edit */
463                    }
464    
465            }
466    
467          /* plugins */          /* plugins */
468          create.plugins = plugins;          create.plugins = plugins;
469          switch (codec->config.mode)          switch (codec->config.mode)
# Line 514  Line 527 
527                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
528                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */
529                  pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;                  pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;
530                    pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate;
     // XXX: xvidcore current provides a "peak bits over 3secs" constraint.  
     //      according to the latest dxn literature, a 1sec constraint is now used  
     pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3;  
531    
532                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
533                  plugins[create.num_plugins].param = &pass2;                  plugins[create.num_plugins].param = &pass2;
# Line 555  Line 565 
565                  create.num_plugins++;                  create.num_plugins++;
566          }          }
567    
568            if (codec->config.debug > 0) {
569          plugins[create.num_plugins].func = vfw_debug;          plugins[create.num_plugins].func = vfw_debug;
570          plugins[create.num_plugins].param = NULL;          plugins[create.num_plugins].param = NULL;
571          create.num_plugins++;          create.num_plugins++;
572            }
573    
574          create.profile = profiles[codec->config.profile].id;          create.profile = profiles[codec->config.profile].id;
575    
# Line 603  Line 615 
615      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
616        create.global |= XVID_GLOBAL_DIVX5_USERDATA;        create.global |= XVID_GLOBAL_DIVX5_USERDATA;
617    
618            if ((profiles[codec->config.profile].flags & PROFILE_EXTRA) ||
619                    (profiles[codec->config.profile].flags & PROFILE_XVID)) {
620              create.frame_drop_ratio = 0;
621            } else {
622          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
623            }
     /* Encoder threads */  
     if (codec->config.num_threads == 0)  
         create.num_threads = info.num_threads; /* Autodetect */  
     else if (codec->config.num_threads == 1)  
         create.num_threads = -1; /* Single-threaded, disable SMP */  
     else  
         create.num_threads = codec->config.num_threads;  
   
624    
625          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
626          {          {
# Line 825  Line 833 
833                  break;                  break;
834          }          }
835    
836            if (quality_preset->vhq_metric == 1)
837                    frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
838    
839          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
840          frame.input.stride[0] = CALC_BI_STRIDE(icc->lpbiInput->biWidth, icc->lpbiInput->biBitCount);          frame.input.stride[0] = CALC_BI_STRIDE(icc->lpbiInput->biWidth, icc->lpbiInput->biBitCount);
841    
# Line 920  Line 931 
931  {  {
932          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
933          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
934            int in_csp = XVID_CSP_NULL, out_csp = XVID_CSP_NULL;
935    
936          if (lpbiInput == NULL)          if (lpbiInput == NULL)
937          {          {
938                  return ICERR_ERROR;                  return ICERR_ERROR;
939          }          }
940    
941          if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && get_colorspace(inhdr) == XVID_CSP_NULL)          if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && inhdr->biCompression != FOURCC_MP4V &&
942                    inhdr->biCompression != FOURCC_xvid && inhdr->biCompression != FOURCC_divx && inhdr->biCompression != FOURCC_dx50 && inhdr->biCompression != FOURCC_mp4v &&
943                    (in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
944          {          {
945                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
946          }          }
# Line 936  Line 950 
950                  return ICERR_OK;                  return ICERR_OK;
951          }          }
952    
953            out_csp = get_colorspace(outhdr);
954    
955          if (inhdr->biWidth != outhdr->biWidth ||          if (inhdr->biWidth != outhdr->biWidth ||
956                  inhdr->biHeight != outhdr->biHeight ||                  inhdr->biHeight != outhdr->biHeight ||
957                  get_colorspace(outhdr) == XVID_CSP_NULL)                  out_csp == XVID_CSP_NULL ||
958                    (in_csp == XVID_CSP_YV12 && in_csp != out_csp))
959          {          {
960                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
961          }          }
# Line 1001  Line 1018 
1018  {  {
1019          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
1020          xvid_gbl_init_t init;          xvid_gbl_init_t init;
1021            xvid_gbl_info_t info;
1022          xvid_dec_create_t create;          xvid_dec_create_t create;
1023          HKEY hKey;          HKEY hKey;
1024    
# Line 1012  Line 1030 
1030          init.debug = codec->config.debug;          init.debug = codec->config.debug;
1031          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
1032    
1033            memset(&info, 0, sizeof(info));
1034            info.version = XVID_VERSION;
1035            codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL);
1036    
1037          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
1038          create.version = XVID_VERSION;          create.version = XVID_VERSION;
1039          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
1040          create.height = lpbiInput->bmiHeader.biHeight;          create.height = lpbiInput->bmiHeader.biHeight;
1041          create.fourcc = inhdr->biCompression;          create.fourcc = inhdr->biCompression;
1042    
1043        /* Decoder threads */
1044        if (codec->config.cpu & XVID_CPU_FORCE)
1045                    create.num_threads = codec->config.num_threads;
1046            else
1047            create.num_threads = info.num_threads; /* Autodetect */
1048    
1049          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))
1050          {          {
1051          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
# Line 1070  Line 1098 
1098          /* --- yv12 --- */          /* --- yv12 --- */
1099          if (icd->lpbiInput->biCompression != FOURCC_XVID &&          if (icd->lpbiInput->biCompression != FOURCC_XVID &&
1100                   icd->lpbiInput->biCompression != FOURCC_DIVX &&                   icd->lpbiInput->biCompression != FOURCC_DIVX &&
1101                   icd->lpbiInput->biCompression != FOURCC_DX50)                   icd->lpbiInput->biCompression != FOURCC_DX50 &&
1102                     icd->lpbiInput->biCompression != FOURCC_MP4V &&
1103                     icd->lpbiInput->biCompression != FOURCC_xvid &&
1104                     icd->lpbiInput->biCompression != FOURCC_divx &&
1105                     icd->lpbiInput->biCompression != FOURCC_dx50 &&
1106                     icd->lpbiInput->biCompression != FOURCC_mp4v)
1107          {          {
1108                  xvid_gbl_convert_t convert;                  xvid_gbl_convert_t convert;
1109    
Legend:
Removed from v.1890  
changed lines
  Added in v.2140
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4