[svn] / branches / release-1_3-branch / xvidcore / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/vfw/src/codec.c

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

trunk/xvidcore/vfw/src/codec.c revision 1910, Thu Dec 2 06:46:07 2010 UTC branches/release-1_3-branch/xvidcore/vfw/src/codec.c revision 2139, Tue Sep 27 15:39:48 2016 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., 675 Mass Ave, Cambridge, MA 02139, USA.   *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21   *   *
22   * $Id: codec.c,v 1.27 2010-12-02 06:46:07 Isibaar Exp $   * $Id$
23   *   *
24   *************************************************************************/   *************************************************************************/
25    
# Line 427  Line 427 
427          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
428          create.version = XVID_VERSION;          create.version = XVID_VERSION;
429    
430        /* Encoder threads */
431        if (codec->config.cpu & XVID_CPU_FORCE)
432                    create.num_threads = codec->config.num_threads;
433            else
434            create.num_threads = info.num_threads; /* Autodetect */
435    
436            /* Encoder slices */
437            if ((profiles[codec->config.profile].flags & PROFILE_RESYNCMARKER) && codec->config.num_slices != 1) {
438    
439                    if (codec->config.num_slices == 0) { /* auto */
440                            int mb_width = (lpbiInput->bmiHeader.biWidth + 15) / 16;
441                            int mb_height = (lpbiInput->bmiHeader.biHeight + 15) / 16;
442    
443                            int slices = (int)((mb_width*mb_height) / 811); /* use multiple slices only above SD resolutions for now */
444    
445                            if (slices > 1) {
446                                    if (create.num_threads <= 1)
447                                            slices &= ~1; /* make even */
448                                    else if (create.num_threads <= slices)
449                                            slices = (slices / create.num_threads) * create.num_threads; /* multiple of threads */
450                                    else if (create.num_threads % slices)
451                                            slices = (!(create.num_threads%2)) ? (create.num_threads/2) : (create.num_threads/3);
452                            }
453    
454                            create.num_slices = slices;
455                    }
456                    else {
457                            create.num_slices = codec->config.num_slices; /* force manual value - by registry edit */
458                    }
459    
460            }
461    
462          /* plugins */          /* plugins */
463          create.plugins = plugins;          create.plugins = plugins;
464          switch (codec->config.mode)          switch (codec->config.mode)
# Line 528  Line 560 
560                  create.num_plugins++;                  create.num_plugins++;
561          }          }
562    
563            if (config->debug > 0) {
564          plugins[create.num_plugins].func = vfw_debug;          plugins[create.num_plugins].func = vfw_debug;
565          plugins[create.num_plugins].param = NULL;          plugins[create.num_plugins].param = NULL;
566          create.num_plugins++;          create.num_plugins++;
567            }
568          create.profile = profiles[codec->config.profile].id;          create.profile = profiles[codec->config.profile].id;
569    
570          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
# Line 576  Line 609 
609      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
610        create.global |= XVID_GLOBAL_DIVX5_USERDATA;        create.global |= XVID_GLOBAL_DIVX5_USERDATA;
611    
612            if ((profiles[codec->config.profile].flags & PROFILE_EXTRA) ||
613                    (profiles[codec->config.profile].flags & PROFILE_XVID)) {
614              create.frame_drop_ratio = 0;
615            } else {
616          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
617            }
     /* 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;  
   
618    
619          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
620          {          {
# Line 798  Line 827 
827                  break;                  break;
828          }          }
829    
830            if (quality_preset->vhq_metric == 1)
831                    frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
832    
833          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
834          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);
835    
# Line 893  Line 925 
925  {  {
926          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
927          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
928            int in_csp = XVID_CSP_NULL, out_csp = XVID_CSP_NULL;
929    
930          if (lpbiInput == NULL)          if (lpbiInput == NULL)
931          {          {
932                  return ICERR_ERROR;                  return ICERR_ERROR;
933          }          }
934    
935          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 &&
936                    inhdr->biCompression != FOURCC_xvid && inhdr->biCompression != FOURCC_divx && inhdr->biCompression != FOURCC_dx50 && inhdr->biCompression != FOURCC_mp4v &&
937                    (in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
938          {          {
939                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
940          }          }
# Line 909  Line 944 
944                  return ICERR_OK;                  return ICERR_OK;
945          }          }
946    
947            out_csp = get_colorspace(outhdr);
948    
949          if (inhdr->biWidth != outhdr->biWidth ||          if (inhdr->biWidth != outhdr->biWidth ||
950                  inhdr->biHeight != outhdr->biHeight ||                  inhdr->biHeight != outhdr->biHeight ||
951                  get_colorspace(outhdr) == XVID_CSP_NULL)                  out_csp == XVID_CSP_NULL ||
952                    (in_csp == XVID_CSP_YV12 && in_csp != out_csp))
953          {          {
954                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
955          }          }
# Line 974  Line 1012 
1012  {  {
1013          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
1014          xvid_gbl_init_t init;          xvid_gbl_init_t init;
1015            xvid_gbl_info_t info;
1016          xvid_dec_create_t create;          xvid_dec_create_t create;
1017          HKEY hKey;          HKEY hKey;
1018    
# Line 985  Line 1024 
1024          init.debug = codec->config.debug;          init.debug = codec->config.debug;
1025          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
1026    
1027            memset(&info, 0, sizeof(info));
1028            info.version = XVID_VERSION;
1029            codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL);
1030    
1031          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
1032          create.version = XVID_VERSION;          create.version = XVID_VERSION;
1033          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
1034          create.height = lpbiInput->bmiHeader.biHeight;          create.height = lpbiInput->bmiHeader.biHeight;
1035          create.fourcc = inhdr->biCompression;          create.fourcc = inhdr->biCompression;
1036    
1037        /* Decoder threads */
1038        if (codec->config.cpu & XVID_CPU_FORCE)
1039                    create.num_threads = codec->config.num_threads;
1040            else
1041            create.num_threads = info.num_threads; /* Autodetect */
1042    
1043          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))
1044          {          {
1045          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
# Line 1043  Line 1092 
1092          /* --- yv12 --- */          /* --- yv12 --- */
1093          if (icd->lpbiInput->biCompression != FOURCC_XVID &&          if (icd->lpbiInput->biCompression != FOURCC_XVID &&
1094                   icd->lpbiInput->biCompression != FOURCC_DIVX &&                   icd->lpbiInput->biCompression != FOURCC_DIVX &&
1095                   icd->lpbiInput->biCompression != FOURCC_DX50)                   icd->lpbiInput->biCompression != FOURCC_DX50 &&
1096                     icd->lpbiInput->biCompression != FOURCC_MP4V &&
1097                     icd->lpbiInput->biCompression != FOURCC_xvid &&
1098                     icd->lpbiInput->biCompression != FOURCC_divx &&
1099                     icd->lpbiInput->biCompression != FOURCC_dx50 &&
1100                     icd->lpbiInput->biCompression != FOURCC_mp4v)
1101          {          {
1102                  xvid_gbl_convert_t convert;                  xvid_gbl_convert_t convert;
1103    
Legend:
Removed from v.1910  
changed lines
  Added in v.2139
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4