[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 1933, Thu Dec 30 22:08:02 2010 UTC revision 2139, Tue Sep 27 15:39:48 2016 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.30.2.1 2010-12-30 22:07:43 Isibaar Exp $   * $Id$
23   *   *
24   *************************************************************************/   *************************************************************************/
25    
# Line 560  Line 560 
560                  create.num_plugins++;                  create.num_plugins++;
561          }          }
562    
563            if (config->debug > 0) {
564          plugins[create.num_plugins].func = vfw_debug;          plugins[create.num_plugins].func = vfw_debug;
565          plugins[create.num_plugins].param = NULL;          plugins[create.num_plugins].param = NULL;
566          create.num_plugins++;          create.num_plugins++;
567            }
568          create.profile = profiles[codec->config.profile].id;          create.profile = profiles[codec->config.profile].id;
569    
570          create.width = lpbiInput->bmiHeader.biWidth;          create.width = lpbiInput->bmiHeader.biWidth;
# Line 608  Line 609 
609      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
610        create.global |= XVID_GLOBAL_DIVX5_USERDATA;        create.global |= XVID_GLOBAL_DIVX5_USERDATA;
611    
612            if ((profiles[codec->config.profile].flags & PROFILE_EXTRA) ||
613                    (profiles[codec->config.profile].flags & PROFILE_XVID)) {
614              create.frame_drop_ratio = 0;
615            } else {
616          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
617            }
618    
619          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
620          {          {
# Line 919  Line 925 
925  {  {
926          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;          BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
927          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;          BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
928            int in_csp = XVID_CSP_NULL, out_csp = XVID_CSP_NULL;
929    
930          if (lpbiInput == NULL)          if (lpbiInput == NULL)
931          {          {
932                  return ICERR_ERROR;                  return ICERR_ERROR;
933          }          }
934    
935          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 &&
936                    inhdr->biCompression != FOURCC_xvid && inhdr->biCompression != FOURCC_divx && inhdr->biCompression != FOURCC_dx50 && inhdr->biCompression != FOURCC_mp4v &&
937                    (in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
938          {          {
939                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
940          }          }
# Line 935  Line 944 
944                  return ICERR_OK;                  return ICERR_OK;
945          }          }
946    
947            out_csp = get_colorspace(outhdr);
948    
949          if (inhdr->biWidth != outhdr->biWidth ||          if (inhdr->biWidth != outhdr->biWidth ||
950                  inhdr->biHeight != outhdr->biHeight ||                  inhdr->biHeight != outhdr->biHeight ||
951                  get_colorspace(outhdr) == XVID_CSP_NULL)                  out_csp == XVID_CSP_NULL ||
952                    (in_csp == XVID_CSP_YV12 && in_csp != out_csp))
953          {          {
954                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
955          }          }
# Line 1080  Line 1092 
1092          /* --- yv12 --- */          /* --- yv12 --- */
1093          if (icd->lpbiInput->biCompression != FOURCC_XVID &&          if (icd->lpbiInput->biCompression != FOURCC_XVID &&
1094                   icd->lpbiInput->biCompression != FOURCC_DIVX &&                   icd->lpbiInput->biCompression != FOURCC_DIVX &&
1095                   icd->lpbiInput->biCompression != FOURCC_DX50)                   icd->lpbiInput->biCompression != FOURCC_DX50 &&
1096                     icd->lpbiInput->biCompression != FOURCC_MP4V &&
1097                     icd->lpbiInput->biCompression != FOURCC_xvid &&
1098                     icd->lpbiInput->biCompression != FOURCC_divx &&
1099                     icd->lpbiInput->biCompression != FOURCC_dx50 &&
1100                     icd->lpbiInput->biCompression != FOURCC_mp4v)
1101          {          {
1102                  xvid_gbl_convert_t convert;                  xvid_gbl_convert_t convert;
1103    
Legend:
Removed from v.1933  
changed lines
  Added in v.2139
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4