[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 1906, Tue Nov 16 14:42:07 2010 UTC revision 1914, Tue Dec 21 16:56:42 2010 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: codec.c,v 1.28 2010-12-21 16:56:42 Isibaar Exp $
   
 /**************************************************************************  
  *  
  *      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 221  Line 197 
197          outhdr->biClrUsed = 0;          outhdr->biClrUsed = 0;
198          outhdr->biClrImportant = 0;          outhdr->biClrImportant = 0;
199    
200          if (codec->config.fourcc_used == 0)          if ((codec->config.fourcc_used == 0) || (profiles[codec->config.profile].flags & PROFILE_XVID))
201          {          {
202                  outhdr->biCompression = FOURCC_XVID;                  outhdr->biCompression = FOURCC_XVID;
203          }          }
# Line 451  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 602  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 822  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 998  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 1009  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.1906  
changed lines
  Added in v.1914
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4