[cvs] / xvidcore / examples / xvid_encraw.c Repository:
ViewVC logotype

Diff of /xvidcore/examples/xvid_encraw.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11.2.38, Wed Dec 10 22:58:32 2003 UTC revision 1.14, Fri Apr 2 21:29:21 2004 UTC
# Line 363  Line 363 
363   *                            Arguments checking   *                            Arguments checking
364   ****************************************************************************/   ****************************************************************************/
365    
366          if (XDIM <= 0 || XDIM >= 2048 || YDIM <= 0 || YDIM >= 2048) {          if (XDIM <= 0 || XDIM >= 4096 || YDIM <= 0 || YDIM >= 4096) {
367                  fprintf(stderr,                  fprintf(stderr,
368                                  "Trying to retreive width and height from PGM header\n");                                  "Trying to retreive width and height from PGM header\n");
369                  ARG_INPUTTYPE = 1;              /* pgm */                  ARG_INPUTTYPE = 1;              /* pgm */
# Line 729  Line 729 
729                  return (1);                  return (1);
730    
731          fscanf(handle, "%d %d %d", &xsize, &ysize, &depth);          fscanf(handle, "%d %d %d", &xsize, &ysize, &depth);
732          if ((xsize > 1440) || (ysize > 2880) || (depth != 255)) {          if ((xsize > 4096) || (ysize > 4096*3/2) || (depth != 255)) {
733                  fprintf(stderr, "%d %d %d\n", xsize, ysize, depth);                  fprintf(stderr, "%d %d %d\n", xsize, ysize, depth);
734                  return (2);                  return (2);
735          }          }
# Line 1094  Line 1094 
1094    
1095          /* Set up core's general features */          /* Set up core's general features */
1096          xvid_enc_frame.vop_flags = vop_presets[ARG_QUALITY];          xvid_enc_frame.vop_flags = vop_presets[ARG_QUALITY];
         if (ARG_GMC)  
                 xvid_enc_frame.vop_flags |= XVID_ME_GME_REFINE;  
1097    
1098      if (ARG_VOPDEBUG) {      if (ARG_VOPDEBUG) {
1099          xvid_enc_frame.vop_flags |= XVID_VOP_DEBUG;          xvid_enc_frame.vop_flags |= XVID_VOP_DEBUG;
# Line 1110  Line 1108 
1108          /* Set up motion estimation flags */          /* Set up motion estimation flags */
1109          xvid_enc_frame.motion = motion_presets[ARG_QUALITY];          xvid_enc_frame.motion = motion_presets[ARG_QUALITY];
1110    
1111            if (ARG_GMC)
1112                    xvid_enc_frame.motion |= XVID_ME_GME_REFINE;
1113    
1114          if (ARG_QPEL)          if (ARG_QPEL)
1115                  xvid_enc_frame.motion |= XVID_ME_QUARTERPELREFINE16;                  xvid_enc_frame.motion |= XVID_ME_QUARTERPELREFINE16;
1116          if (ARG_QPEL && (xvid_enc_frame.vop_flags & XVID_VOP_INTER4V))          if (ARG_QPEL && (xvid_enc_frame.vop_flags & XVID_VOP_INTER4V))
Legend:
Removed from v.1.11.2.38  
changed lines
  Added in v.1.14
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4