[Ffmpeg-cvslog] CVS: ffmpeg cmdutils.c, 1.7, 1.8 cmdutils.h, 1.6, 1.7 ffmpeg.c, 1.346, 1.347
Michael Niedermayer CVS
michael
Sun Sep 11 13:10:27 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv1327
Modified Files:
cmdutils.c cmdutils.h ffmpeg.c
Log Message:
AVOption API improvments
support AVOptions for encoding in ffmpeg.c
Index: cmdutils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/cmdutils.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cmdutils.c 20 Jan 2005 15:31:07 -0000 1.7
+++ cmdutils.c 11 Sep 2005 11:10:24 -0000 1.8
@@ -45,6 +45,15 @@
}
}
+static OptionDef* find_option(const OptionDef *po, const char *name){
+ while (po->name != NULL) {
+ if (!strcmp(name, po->name))
+ break;
+ po++;
+ }
+ return po;
+}
+
void parse_options(int argc, char **argv, const OptionDef *options)
{
const char *opt, *arg;
@@ -57,13 +66,11 @@
opt = argv[optindex++];
if (opt[0] == '-' && opt[1] != '\0') {
- po = options;
- while (po->name != NULL) {
- if (!strcmp(opt + 1, po->name))
- break;
- po++;
- }
+ po= find_option(options, opt + 1);
+ if (!po->name)
+ po= find_option(options, "default");
if (!po->name) {
+unknown_opt:
fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], opt);
exit(1);
}
@@ -85,6 +92,9 @@
*po->u.int_arg = atoi(arg);
} else if (po->flags & OPT_FLOAT) {
*po->u.float_arg = atof(arg);
+ } else if (po->flags & OPT_FUNC2) {
+ if(po->u.func2_arg(opt+1, arg)<0)
+ goto unknown_opt;
} else {
po->u.func_arg(arg);
}
Index: cmdutils.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/cmdutils.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cmdutils.h 3 Jun 2005 14:07:47 -0000 1.6
+++ cmdutils.h 11 Sep 2005 11:10:24 -0000 1.7
@@ -14,11 +14,13 @@
#define OPT_INT 0x0080
#define OPT_FLOAT 0x0100
#define OPT_SUBTITLE 0x0200
+#define OPT_FUNC2 0x0400
union {
- void (*func_arg)(const char *);
+ void (*func_arg)(const char *); //FIXME passing error code as int return would be nicer then exit() in the func
int *int_arg;
char **str_arg;
float *float_arg;
+ int (*func2_arg)(const char *, const char *);
} u;
const char *help;
const char *argname;
Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -d -r1.346 -r1.347
--- ffmpeg.c 11 Sep 2005 08:24:36 -0000 1.346
+++ ffmpeg.c 11 Sep 2005 11:10:24 -0000 1.347
@@ -111,8 +111,6 @@
static int video_mb_lmin = 2*FF_QP2LAMBDA;
static int video_mb_lmax = 31*FF_QP2LAMBDA;
static int video_qdiff = 3;
-static int video_lelim = 0;
-static int video_celim = 0;
static float video_qblur = 0.5;
static float video_qsquish = 0.0;
static float video_qcomp = 0.5;
@@ -291,6 +289,10 @@
static int pgmyuv_compatibility_hack=0;
+const char **opt_names=NULL;
+int opt_name_count=0;
+AVCodecContext *avctx_opts;
+
#define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass"
@@ -2638,26 +2640,6 @@
}
}
-static void opt_lelim(const char *arg)
-{
- video_lelim = atoi(arg);
- if (video_lelim < -99 ||
- video_lelim > 99) {
- fprintf(stderr, "lelim must be >= -99 and <= 99\n");
- exit(1);
- }
-}
-
-static void opt_celim(const char *arg)
-{
- video_celim = atoi(arg);
- if (video_celim < -99 ||
- video_celim > 99) {
- fprintf(stderr, "celim must be >= -99 and <= 99\n");
- exit(1);
- }
-}
-
static void opt_lmax(const char *arg)
{
video_lmax = atof(arg)*FF_QP2LAMBDA;
@@ -3237,6 +3219,13 @@
video_enc->codec_id = codec_id;
codec = avcodec_find_encoder(codec_id);
+
+ for(i=0; i<opt_name_count; i++){
+ AVOption *opt;
+ double d= av_get_double(avctx_opts, opt_names[i], &opt);
+ if(d==d && (opt->flags&AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM))
+ av_set_double(video_enc, opt_names[i], d);
+ }
video_enc->bit_rate = video_bit_rate;
video_enc->bit_rate_tolerance = video_bit_rate_tolerance;
@@ -3383,8 +3372,6 @@
video_enc->lmin = video_lmin;
video_enc->lmax = video_lmax;
video_enc->rc_qsquish = video_qsquish;
- video_enc->luma_elim_threshold = video_lelim;
- video_enc->chroma_elim_threshold = video_celim;
video_enc->mb_lmin = video_mb_lmin;
video_enc->mb_lmax = video_mb_lmax;
video_enc->max_qdiff = video_qdiff;
@@ -3486,7 +3473,7 @@
{
AVStream *st;
AVCodecContext *audio_enc;
- int codec_id;
+ int codec_id, i;
st = av_new_stream(oc, oc->nb_streams);
if (!st) {
@@ -3511,6 +3498,14 @@
audio_enc->channels = audio_channels;
} else {
codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_AUDIO);
+
+ for(i=0; i<opt_name_count; i++){
+ AVOption *opt;
+ double d= av_get_double(avctx_opts, opt_names[i], &opt);
+ if(d==d && (opt->flags&AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM))
+ av_set_double(audio_enc, opt_names[i], d);
+ }
+
if (audio_codec_id != CODEC_ID_NONE)
codec_id = audio_codec_id;
audio_enc->codec_id = codec_id;
@@ -3549,6 +3544,7 @@
AVFormatContext *oc;
AVStream *st;
AVCodecContext *subtitle_enc;
+ int i;
if (nb_output_files <= 0) {
fprintf(stderr, "At least one output file must be specified\n");
@@ -3567,6 +3563,12 @@
if (subtitle_stream_copy) {
st->stream_copy = 1;
} else {
+ for(i=0; i<opt_name_count; i++){
+ AVOption *opt;
+ double d= av_get_double(avctx_opts, opt_names[i], &opt);
+ if(d==d && (opt->flags&AV_OPT_FLAG_SUBTITLE_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM))
+ av_set_double(subtitle_enc, opt_names[i], d);
+ }
subtitle_enc->codec_id = subtitle_codec_id;
}
@@ -4190,6 +4192,18 @@
exit(1);
}
+static int opt_default(const char *opt, const char *arg){
+ AVOption *o= av_set_string(avctx_opts, opt, arg);
+ if(!o)
+ return -1;
+
+ //FIXME we should always use avctx_opts, ... for storing options so there wont be any need to keep track of whats set over this
+ opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1));
+ opt_names[opt_name_count++]= opt;
+
+ return 0;
+}
+
const OptionDef options[] = {
/* main options */
{ "L", 0, {(void*)show_license}, "show license" },
@@ -4297,8 +4311,6 @@
{ "cmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_cmp}, "fullpel compare function", "cmp function" },
{ "precmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_cmp}, "pre motion estimation compare function", "cmp function" },
{ "preme", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_me}, "pre motion estimation", "" },
- { "lelim", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lelim}, "single coefficient elimination threshold for luminance (negative values also consider DC coefficient)", "elim" },
- { "celim", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_celim}, "single coefficient elimination threshold for chrominance (negative values also consider DC coefficient)", "elim" },
{ "lumi_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lumi_mask}, "luminance masking", "" },
{ "dark_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dark_mask}, "darkness masking", "" },
{ "scplx_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_scplx_mask}, "spatial complexity masking", "" },
@@ -4398,6 +4410,7 @@
{ "packetsize", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&mux_packet_size}, "set packet size", "size" },
{ "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_max_delay}, "set the maximum demux-decode delay", "seconds" },
{ "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_preload}, "set the initial demux-decode delay", "seconds" },
+ { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
{ NULL, },
};
@@ -4482,6 +4495,8 @@
show_help_options(options, "\nAdvanced options:\n",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
OPT_EXPERT);
+ av_opt_show(avctx_opts, stdout);
+
exit(1);
}
@@ -4496,6 +4511,8 @@
int64_t ti;
av_register_all();
+
+ avctx_opts= avcodec_alloc_context();
if (argc <= 1)
show_help();
More information about the ffmpeg-cvslog
mailing list