[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 1914, Tue Dec 21 16:56:42 2010 UTC revision 1952, Wed Feb 16 19:04:39 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.28 2010-12-21 16:56:42 Isibaar Exp $   * $Id: codec.c,v 1.33 2011-02-16 18:59:45 Isibaar Exp $
23   *   *
24   *************************************************************************/   *************************************************************************/
25    
# Line 433  Line 433 
433          else          else
434          create.num_threads = info.num_threads; /* Autodetect */          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 582  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            }
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 893  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 909  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 1054  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.1914  
changed lines
  Added in v.1952
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4