[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 1945, Thu Jan 27 13:13:16 2011 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: codec.c,v 1.30.2.2 2011-01-27 13:13:16 Isibaar Exp $
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 578  Line 610 
610    
611          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
612    
     /* 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;  
   
   
613          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
614          {          {
615          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
# Line 798  Line 821 
821                  break;                  break;
822          }          }
823    
824            if (quality_preset->vhq_metric == 1)
825                    frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
826    
827          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
828          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);
829    
# Line 893  Line 919 
919  {  {
920          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
921          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
922            int in_csp = XVID_CSP_NULL, out_csp = XVID_CSP_NULL;
923    
924          if (lpbiInput == NULL)          if (lpbiInput == NULL)
925          {          {
926                  return ICERR_ERROR;                  return ICERR_ERROR;
927          }          }
928    
929          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 && (in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
930          {          {
931                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
932          }          }
# Line 909  Line 936 
936                  return ICERR_OK;                  return ICERR_OK;
937          }          }
938    
939            out_csp = get_colorspace(outhdr);
940    
941          if (inhdr->biWidth != outhdr->biWidth ||          if (inhdr->biWidth != outhdr->biWidth ||
942                  inhdr->biHeight != outhdr->biHeight ||                  inhdr->biHeight != outhdr->biHeight ||
943                  get_colorspace(outhdr) == XVID_CSP_NULL)                  out_csp == XVID_CSP_NULL ||
944                    (in_csp == XVID_CSP_YV12 && in_csp != out_csp))
945          {          {
946                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
947          }          }
# Line 974  Line 1004 
1004  {  {
1005          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
1006          xvid_gbl_init_t init;          xvid_gbl_init_t init;
1007            xvid_gbl_info_t info;
1008          xvid_dec_create_t create;          xvid_dec_create_t create;
1009          HKEY hKey;          HKEY hKey;
1010    
# Line 985  Line 1016 
1016          init.debug = codec->config.debug;          init.debug = codec->config.debug;
1017          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
1018    
1019            memset(&info, 0, sizeof(info));
1020            info.version = XVID_VERSION;
1021            codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL);
1022    
1023          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
1024          create.version = XVID_VERSION;          create.version = XVID_VERSION;
1025          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
1026          create.height = lpbiInput->bmiHeader.biHeight;          create.height = lpbiInput->bmiHeader.biHeight;
1027          create.fourcc = inhdr->biCompression;          create.fourcc = inhdr->biCompression;
1028    
1029        /* Decoder threads */
1030        if (codec->config.cpu & XVID_CPU_FORCE)
1031                    create.num_threads = codec->config.num_threads;
1032            else
1033            create.num_threads = info.num_threads; /* Autodetect */
1034    
1035          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))
1036          {          {
1037          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
Legend:
Removed from v.1910  
changed lines
  Added in v.1945
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4