[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

revision 1910, Thu Dec 2 06:46:07 2010 UTC revision 1917, Wed Dec 22 16:52:12 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.29 2010-12-22 16:52:12 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 rows = (lpbiInput->bmiHeader.biHeight + 15) / 16;
441                            int slices = (rows > 36) ? 2 : 1;
442    
443                            create.num_slices = (rows > 45) ? 4 : slices;
444    
445                            if (create.num_slices > create.num_threads)
446                                    create.num_slices = create.num_threads;
447                    }
448                    else {
449                            create.num_slices = codec->config.num_slices;
450                    }
451    
452            }
453    
454          /* plugins */          /* plugins */
455          create.plugins = plugins;          create.plugins = plugins;
456          switch (codec->config.mode)          switch (codec->config.mode)
# Line 578  Line 602 
602    
603          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
604    
     /* 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;  
   
   
605          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
606          {          {
607          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
# Line 798  Line 813 
813                  break;                  break;
814          }          }
815    
816            if (quality_preset->vhq_metric == 1)
817                    frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
818    
819          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
820          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);
821    
# Line 974  Line 992 
992  {  {
993          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
994          xvid_gbl_init_t init;          xvid_gbl_init_t init;
995            xvid_gbl_info_t info;
996          xvid_dec_create_t create;          xvid_dec_create_t create;
997          HKEY hKey;          HKEY hKey;
998    
# Line 985  Line 1004 
1004          init.debug = codec->config.debug;          init.debug = codec->config.debug;
1005          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
1006    
1007            memset(&info, 0, sizeof(info));
1008            info.version = XVID_VERSION;
1009            codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL);
1010    
1011          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
1012          create.version = XVID_VERSION;          create.version = XVID_VERSION;
1013          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
1014          create.height = lpbiInput->bmiHeader.biHeight;          create.height = lpbiInput->bmiHeader.biHeight;
1015          create.fourcc = inhdr->biCompression;          create.fourcc = inhdr->biCompression;
1016    
1017        /* Decoder threads */
1018        if (codec->config.cpu & XVID_CPU_FORCE)
1019                    create.num_threads = codec->config.num_threads;
1020            else
1021            create.num_threads = info.num_threads; /* Autodetect */
1022    
1023          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))
1024          {          {
1025          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
Legend:
Removed from v.1910  
changed lines
  Added in v.1917
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4