[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 1887, Mon May 10 13:50:46 2010 UTC branches/release-1_3-branch/xvidcore/vfw/src/codec.c revision 1985, Wed May 18 09:02:35 2011 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$
   
 /**************************************************************************  
  *  
  *      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            /* 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 514  Line 522 
522                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
523                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */
524                  pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;                  pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;
525                    pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate;
     // XXX: xvidcore current provides a "peak bits over 3secs" constraint.  
     //      according to the latest dxn literature, a 1sec constraint is now used  
     pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3;  
526    
527                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
528                  plugins[create.num_plugins].param = &pass2;                  plugins[create.num_plugins].param = &pass2;
# Line 603  Line 608 
608      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
609        create.global |= XVID_GLOBAL_DIVX5_USERDATA;        create.global |= XVID_GLOBAL_DIVX5_USERDATA;
610    
611            if ((profiles[codec->config.profile].flags & PROFILE_EXTRA) ||
612                    (profiles[codec->config.profile].flags & PROFILE_XVID)) {
613              create.frame_drop_ratio = 0;
614            } else {
615          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
616            }
     /* 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;  
   
617    
618          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
619          {          {
# Line 825  Line 826 
826                  break;                  break;
827          }          }
828    
829            if (quality_preset->vhq_metric == 1)
830                    frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
831    
832          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
833          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);
834    
# Line 920  Line 924 
924  {  {
925          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
926          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
927            int in_csp = XVID_CSP_NULL, out_csp = XVID_CSP_NULL;
928    
929          if (lpbiInput == NULL)          if (lpbiInput == NULL)
930          {          {
931                  return ICERR_ERROR;                  return ICERR_ERROR;
932          }          }
933    
934          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 &&
935                    inhdr->biCompression != FOURCC_xvid && inhdr->biCompression != FOURCC_divx && inhdr->biCompression != FOURCC_dx50 && inhdr->biCompression != FOURCC_mp4v &&
936                    (in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
937          {          {
938                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
939          }          }
# Line 936  Line 943 
943                  return ICERR_OK;                  return ICERR_OK;
944          }          }
945    
946            out_csp = get_colorspace(outhdr);
947    
948          if (inhdr->biWidth != outhdr->biWidth ||          if (inhdr->biWidth != outhdr->biWidth ||
949                  inhdr->biHeight != outhdr->biHeight ||                  inhdr->biHeight != outhdr->biHeight ||
950                  get_colorspace(outhdr) == XVID_CSP_NULL)                  out_csp == XVID_CSP_NULL ||
951                    (in_csp == XVID_CSP_YV12 && in_csp != out_csp))
952          {          {
953                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
954          }          }
# Line 999  Line 1009 
1009    
1010  LRESULT decompress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)  LRESULT decompress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
1011  {  {
1012            BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
1013          xvid_gbl_init_t init;          xvid_gbl_init_t init;
1014            xvid_gbl_info_t info;
1015          xvid_dec_create_t create;          xvid_dec_create_t create;
1016          HKEY hKey;          HKEY hKey;
1017    
# Line 1011  Line 1023 
1023    init.debug = codec->config.debug;    init.debug = codec->config.debug;
1024          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
1025    
1026            memset(&info, 0, sizeof(info));
1027            info.version = XVID_VERSION;
1028            codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL);
1029    
1030          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
1031          create.version = XVID_VERSION;          create.version = XVID_VERSION;
1032          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
1033          create.height = lpbiInput->bmiHeader.biHeight;          create.height = lpbiInput->bmiHeader.biHeight;
1034            create.fourcc = inhdr->biCompression;
1035    
1036        /* Decoder threads */
1037        if (codec->config.cpu & XVID_CPU_FORCE)
1038                    create.num_threads = codec->config.num_threads;
1039            else
1040            create.num_threads = info.num_threads; /* Autodetect */
1041    
1042          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))          switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL))
1043          {          {
# Line 1068  Line 1091 
1091          /* --- yv12 --- */          /* --- yv12 --- */
1092          if (icd->lpbiInput->biCompression != FOURCC_XVID &&          if (icd->lpbiInput->biCompression != FOURCC_XVID &&
1093                   icd->lpbiInput->biCompression != FOURCC_DIVX &&                   icd->lpbiInput->biCompression != FOURCC_DIVX &&
1094                   icd->lpbiInput->biCompression != FOURCC_DX50)                   icd->lpbiInput->biCompression != FOURCC_DX50 &&
1095                     icd->lpbiInput->biCompression != FOURCC_MP4V &&
1096                     icd->lpbiInput->biCompression != FOURCC_xvid &&
1097                     icd->lpbiInput->biCompression != FOURCC_divx &&
1098                     icd->lpbiInput->biCompression != FOURCC_dx50 &&
1099                     icd->lpbiInput->biCompression != FOURCC_mp4v)
1100          {          {
1101                  xvid_gbl_convert_t convert;                  xvid_gbl_convert_t convert;
1102    
Legend:
Removed from v.1887  
changed lines
  Added in v.1985
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4