[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 1910, Thu Dec 2 06:46:07 2010 UTC revision 1914, Tue Dec 21 16:56:42 2010 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.28 2010-12-21 16:56:42 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          /* plugins */          /* plugins */
437          create.plugins = plugins;          create.plugins = plugins;
438          switch (codec->config.mode)          switch (codec->config.mode)
# Line 578  Line 584 
584    
585          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
586    
     /* 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;  
   
   
587          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
588          {          {
589          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
# Line 798  Line 795 
795                  break;                  break;
796          }          }
797    
798            if (quality_preset->vhq_metric == 1)
799                    frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
800    
801          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
802          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);
803    
# Line 974  Line 974 
974  {  {
975          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
976          xvid_gbl_init_t init;          xvid_gbl_init_t init;
977            xvid_gbl_info_t info;
978          xvid_dec_create_t create;          xvid_dec_create_t create;
979          HKEY hKey;          HKEY hKey;
980    
# Line 985  Line 986 
986          init.debug = codec->config.debug;          init.debug = codec->config.debug;
987          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
988    
989            memset(&info, 0, sizeof(info));
990            info.version = XVID_VERSION;
991            codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL);
992    
993          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
994          create.version = XVID_VERSION;          create.version = XVID_VERSION;
995          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
996          create.height = lpbiInput->bmiHeader.biHeight;          create.height = lpbiInput->bmiHeader.biHeight;
997          create.fourcc = inhdr->biCompression;          create.fourcc = inhdr->biCompression;
998    
999        /* Decoder threads */
1000        if (codec->config.cpu & XVID_CPU_FORCE)
1001                    create.num_threads = codec->config.num_threads;
1002            else
1003            create.num_threads = info.num_threads; /* Autodetect */
1004    
1005          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))
1006          {          {
1007          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :

Legend:
Removed from v.1910  
changed lines
  Added in v.1914

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4