[svn] / branches / dev-api-4 / xvidcore / examples / xvid_encraw.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/examples/xvid_encraw.c

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

revision 1118, Sat Aug 9 16:46:46 2003 UTC revision 1119, Sat Aug 9 17:19:20 2003 UTC
# Line 21  Line 21 
21   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24   * $Id: xvid_encraw.c,v 1.11.2.33 2003-08-09 16:46:46 Isibaar Exp $   * $Id: xvid_encraw.c,v 1.11.2.34 2003-08-09 17:19:20 edgomez Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 130  Line 130 
130  static int ARG_STATS = 0;  static int ARG_STATS = 0;
131  static int ARG_DUMP = 0;  static int ARG_DUMP = 0;
132  static int ARG_LUMIMASKING = 0;  static int ARG_LUMIMASKING = 0;
 static int ARG_QUARTERPEL = 0;  
133  static int ARG_BITRATE = 0;  static int ARG_BITRATE = 0;
134  static int ARG_SINGLE = 0;  static int ARG_SINGLE = 0;
135  static char *ARG_PASS1 = 0;  static char *ARG_PASS1 = 0;
# Line 151  Line 150 
150  static int ARG_PACKED = 0;  static int ARG_PACKED = 0;
151  static int ARG_DEBUG = 0;  static int ARG_DEBUG = 0;
152  static int ARG_VOPDEBUG = 0;  static int ARG_VOPDEBUG = 0;
153    static int ARG_GMC = 0;
154    static int ARG_QPEL = 0;
155    
156  #ifndef READ_PNM  #ifndef READ_PNM
157  #define IMAGE_SIZE(x,y) ((x)*(y)*3/2)  #define IMAGE_SIZE(x,y) ((x)*(y)*3/2)
# Line 322  Line 323 
323                          ARG_DUMP = 1;                          ARG_DUMP = 1;
324                  } else if (strcmp("-lumimasking", argv[i]) == 0) {                  } else if (strcmp("-lumimasking", argv[i]) == 0) {
325                          ARG_LUMIMASKING = 1;                          ARG_LUMIMASKING = 1;
                 } else if (strcmp("-quarterpel", argv[i]) == 0) {  
                         ARG_QUARTERPEL = 1;  
326                  } else if (strcmp("-type", argv[i]) == 0 && i < argc - 1) {                  } else if (strcmp("-type", argv[i]) == 0 && i < argc - 1) {
327                          i++;                          i++;
328                          ARG_INPUTTYPE = atoi(argv[i]);                          ARG_INPUTTYPE = atoi(argv[i]);
# Line 340  Line 339 
339                          ARG_OUTPUTFILE = argv[i];                          ARG_OUTPUTFILE = argv[i];
340                  } else if (strcmp("-vop_debug", argv[i]) == 0) {                  } else if (strcmp("-vop_debug", argv[i]) == 0) {
341                          ARG_VOPDEBUG = 1;                          ARG_VOPDEBUG = 1;
342                    } else if (strcmp("-qpel", argv[i]) == 0) {
343                            ARG_QPEL = 1;
344                    } else if (strcmp("-gmc", argv[i]) == 0) {
345                            ARG_GMC = 1;
346                  } else if (strcmp("-help", argv[i])) {                  } else if (strcmp("-help", argv[i])) {
347                          usage();                          usage();
348                          return (0);                          return (0);
# Line 685  Line 688 
688          fprintf(stderr, "Other options\n");          fprintf(stderr, "Other options\n");
689          fprintf(stderr, " -asm            : use assembly optmized code\n");          fprintf(stderr, " -asm            : use assembly optmized code\n");
690          fprintf(stderr, " -quality integer: quality ([0..%d])\n", ME_ELEMENTS - 1);          fprintf(stderr, " -quality integer: quality ([0..%d])\n", ME_ELEMENTS - 1);
691          fprintf(stderr, " -quarterpel     : use quarterpel refinement\n");          fprintf(stderr, " -qpel           : use quarter pixel ME\n");
692            fprintf(stderr, " -gmc            : use global motion compensation\n");
693          fprintf(stderr, " -packed         : packed mode\n");          fprintf(stderr, " -packed         : packed mode\n");
694          fprintf(stderr, " -lumimasking    : use lumimasking algorithm\n");          fprintf(stderr, " -lumimasking    : use lumimasking algorithm\n");
695          fprintf(stderr, " -stats          : print stats about encoded frames\n");          fprintf(stderr, " -stats          : print stats about encoded frames\n");
# Line 1069  Line 1073 
1073          }          }
1074    
1075          /* Set up core's general features */          /* Set up core's general features */
1076          xvid_enc_frame.vol_flags = XVID_VOL_GMC;          xvid_enc_frame.vol_flags = 0;
1077          if (ARG_STATS)          if (ARG_STATS)
1078                  xvid_enc_frame.vol_flags |= XVID_VOL_EXTRASTATS;                  xvid_enc_frame.vol_flags |= XVID_VOL_EXTRASTATS;
1079            if (ARG_QPEL)
         if (ARG_QUARTERPEL)  
1080                  xvid_enc_frame.vol_flags |= XVID_VOL_QUARTERPEL;                  xvid_enc_frame.vol_flags |= XVID_VOL_QUARTERPEL;
1081            if (ARG_GMC)
1082                    xvid_enc_frame.vol_flags |= XVID_VOL_GMC;
1083    
1084          /* Set up core's general features */          /* Set up core's general features */
1085          xvid_enc_frame.vop_flags = vop_presets[ARG_QUALITY];          xvid_enc_frame.vop_flags = vop_presets[ARG_QUALITY];
1086            if (ARG_QPEL && (xvid_enc_frame.vop_flags & XVID_ME_HALFPELREFINE16))
1087                    xvid_enc_frame.vop_flags |= XVID_ME_QUARTERPELREFINE16;
1088            if (ARG_QPEL && (xvid_enc_frame.vop_flags & XVID_ME_HALFPELREFINE8))
1089                    xvid_enc_frame.vop_flags |= XVID_ME_QUARTERPELREFINE8;
1090            if (ARG_GMC)
1091                    xvid_enc_frame.vop_flags |= XVID_ME_GME_REFINE;
1092    
1093      if (ARG_VOPDEBUG) {      if (ARG_VOPDEBUG) {
1094          xvid_enc_frame.vop_flags |= XVID_VOP_DEBUG;          xvid_enc_frame.vop_flags |= XVID_VOP_DEBUG;
1095      }      }
# Line 1091  Line 1103 
1103          /* Set up motion estimation flags */          /* Set up motion estimation flags */
1104          xvid_enc_frame.motion = motion_presets[ARG_QUALITY];          xvid_enc_frame.motion = motion_presets[ARG_QUALITY];
1105    
         if (ARG_QUARTERPEL)  
                 xvid_enc_frame.motion |= (XVID_ME_QUARTERPELREFINE16 | XVID_ME_QUARTERPELREFINE8);  
   
1106          /* We don't use special matrices */          /* We don't use special matrices */
1107          xvid_enc_frame.quant_intra_matrix = NULL;          xvid_enc_frame.quant_intra_matrix = NULL;
1108          xvid_enc_frame.quant_inter_matrix = NULL;          xvid_enc_frame.quant_inter_matrix = NULL;
1109    
1110          /* Encode the frame */          /* Encode the frame */
1111          ret =          ret = xvid_encore(enc_handle, XVID_ENC_ENCODE, &xvid_enc_frame,
                 xvid_encore(enc_handle, XVID_ENC_ENCODE, &xvid_enc_frame,  
1112                                          &xvid_enc_stats);                                          &xvid_enc_stats);
1113    
1114          *key = (xvid_enc_frame.out_flags & XVID_KEYFRAME);          *key = (xvid_enc_frame.out_flags & XVID_KEYFRAME);

Legend:
Removed from v.1118  
changed lines
  Added in v.1119

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4