Skip to content

F
ffmpeg.wasm-core
Commit 8bbf6db9 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

AVOption API improvments 

support AVOptions for encoding in ffmpeg.c

Originally committed as revision 4580 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a26e1d4c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 169 deletions
cmdutils.c
View file @ 8bbf6db9
......@@ -45,6 +45,15 @@ void show_help_options(const OptionDef *options, const char *msg, int mask, int
}
}
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 @@ void parse_options(int argc, char **argv, const OptionDef *options)
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 @@ void parse_options(int argc, char **argv, const OptionDef *options)
*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);
}
......
cmdutils.h
View file @ 8bbf6db9
......@@ -14,11 +14,13 @@ typedef struct {
#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;
......
ffmpeg.c
View file @ 8bbf6db9
......@@ -111,8 +111,6 @@ static int video_lmax = 31*FF_QP2LAMBDA;
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 limit_filesize = 0; //
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_qsquish(const char *arg)
}
}
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 @@ static void new_video_stream(AVFormatContext *oc)
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 @@ static void new_video_stream(AVFormatContext *oc)
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 @@ static void new_audio_stream(AVFormatContext *oc)
{
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 @@ static void new_audio_stream(AVFormatContext *oc)
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 @@ static void opt_new_subtitle_stream(void)
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 @@ static void opt_new_subtitle_stream(void)
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 @@ static void show_version(void)
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 @@ const OptionDef options[] = {
{ "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 @@ const OptionDef options[] = {
{ "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 @@ static void show_help(void)
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 @@ int main(int argc, char **argv)
int64_t ti;
av_register_all();
avctx_opts= avcodec_alloc_context();
if (argc <= 1)
show_help();
......
libavcodec/avcodec.h
View file @ 8bbf6db9
......@@ -21,8 +21,8 @@ extern "C" {
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
#define LIBAVCODEC_VERSION_INT ((49<<16)+(2<<8)+0)
#define LIBAVCODEC_VERSION 49.2.0
#define LIBAVCODEC_VERSION_INT ((50<<16)+(0<<8)+0)
#define LIBAVCODEC_VERSION 50.0.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
......@@ -703,6 +703,10 @@ typedef struct AVOption {
#define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding
#define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding
#define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ...
#define AV_OPT_FLAG_AUDIO_PARAM 8
#define AV_OPT_FLAG_VIDEO_PARAM 16
#define AV_OPT_FLAG_SUBTITLE_PARAM 32
//FIXME think about enc-audio, ... style flags
} AVOption;
/**
......@@ -1883,14 +1887,16 @@ typedef struct AVCodecContext {
enum AVDiscard skip_frame;
} AVCodecContext;
int av_set_string(void *obj, const char *name, const char *val);
int av_set_double(void *obj, const char *name, double n);
int av_set_q(void *obj, const char *name, AVRational n);
int av_set_int(void *obj, const char *name, int64_t n);
const char *av_get_string(void *obj, const char *name);
double av_get_double(void *obj, const char *name);
AVOption *av_set_string(void *obj, const char *name, const char *val);
AVOption *av_set_double(void *obj, const char *name, double n);
AVOption *av_set_q(void *obj, const char *name, AVRational n);
AVOption *av_set_int(void *obj, const char *name, int64_t n);
double av_get_double(void *obj, const char *name, AVOption **o_out);
AVRational av_get_q(void *obj, const char *name, AVOption **o_out);
int64_t av_get_int(void *obj, const char *name, AVOption **o_out);
const char *av_get_string(void *obj, const char *name, AVOption **o_out, char *buf, int buf_len);
AVOption *av_next_option(void *obj, AVOption *last);
int av_opt_show(void *obj, FILE *f);
/**
* AVCodec.
......
libavcodec/opt.c
View file @ 8bbf6db9
......@@ -52,46 +52,36 @@ AVOption *av_next_option(void *obj, AVOption *last){
else return (*(AVClass**)obj)->option;
}
static int av_set_number(void *obj, const char *name, double num, int den, int64_t intnum){
static AVOption *av_set_number(void *obj, const char *name, double num, int den, int64_t intnum){
AVOption *o= find_opt(obj, name);
void *dst;
if(!o || o->offset<=0)
return -1;
return NULL;
if(o->max*den < num*intnum || o->min*den > num*intnum)
return -1;
return NULL;
dst= ((uint8_t*)obj) + o->offset;
switch(o->type){
case FF_OPT_TYPE_INT:
*(int*)dst= lrintf(num/den)*intnum;
break;
case FF_OPT_TYPE_INT64:
*(int64_t*)dst= lrintf(num/den)*intnum;
break;
case FF_OPT_TYPE_FLOAT:
*(float*)dst= num*intnum/den;
break;
case FF_OPT_TYPE_DOUBLE:
*(double*)dst= num*intnum/den;
break;
case FF_OPT_TYPE_INT: *(int *)dst= lrintf(num/den)*intnum; break;
case FF_OPT_TYPE_INT64: *(int64_t *)dst= lrintf(num/den)*intnum; break;
case FF_OPT_TYPE_FLOAT: *(float *)dst= num*intnum/den; break;
case FF_OPT_TYPE_DOUBLE:*(double *)dst= num*intnum/den; break;
case FF_OPT_TYPE_RATIONAL:
if((int)num == num)
*(AVRational*)dst= (AVRational){num*intnum, den};
else
*(AVRational*)dst= av_d2q(num*intnum/den, 1<<24);
if((int)num == num) *(AVRational*)dst= (AVRational){num*intnum, den};
else *(AVRational*)dst= av_d2q(num*intnum/den, 1<<24);
default:
return -1;
return NULL;
}
return 0;
return o;
}
//FIXME use eval.c maybe?
int av_set_string(void *obj, const char *name, const char *val){
AVOption *av_set_string(void *obj, const char *name, const char *val){
AVOption *o= find_opt(obj, name);
if(!o || !val || o->offset<=0)
return -1;
return NULL;
if(o->type != FF_OPT_TYPE_STRING){
double d=0, tmp_d;
for(;;){
......@@ -113,56 +103,136 @@ int av_set_string(void *obj, const char *name, const char *val){
else if(!strcmp(buf, "default")) d+= o->default_val;
else if(!strcmp(buf, "max" )) d+= o->max;
else if(!strcmp(buf, "min" )) d+= o->min;
else return -1;
else return NULL;
}
if(*val == '+') val++;
if(!*val)
return av_set_number(obj, name, d, 1, 1);
}
return -1;
return NULL;
}
memcpy(((uint8_t*)obj) + o->offset, val, sizeof(val));
return 0;
return o;
}
int av_set_double(void *obj, const char *name, double n){
AVOption *av_set_double(void *obj, const char *name, double n){
return av_set_number(obj, name, n, 1, 1);
}
int av_set_q(void *obj, const char *name, AVRational n){
AVOption *av_set_q(void *obj, const char *name, AVRational n){
return av_set_number(obj, name, n.num, n.den, 1);
}
int av_set_int(void *obj, const char *name, int64_t n){
AVOption *av_set_int(void *obj, const char *name, int64_t n){
return av_set_number(obj, name, 1, 1, n);
}
const char *av_get_string(void *obj, const char *name){
/**
*
* @param buf a buffer which is used for returning non string values as strings, can be NULL
* @param buf_len allocated length in bytes of buf
*/
const char *av_get_string(void *obj, const char *name, AVOption **o_out, char *buf, int buf_len){
AVOption *o= find_opt(obj, name);
void *dst;
if(!o || o->offset<=0)
return NULL;
if(o->type != FF_OPT_TYPE_STRING) //FIXME convert to string? but what about free()?
if(o->type != FF_OPT_TYPE_STRING && (!buf || !buf_len))
return NULL;
return (const char*)(((uint8_t*)obj) + o->offset);
dst= ((uint8_t*)obj) + o->offset;
if(o_out) *o_out= o;
if(o->type == FF_OPT_TYPE_STRING)
return dst;
switch(o->type){
case FF_OPT_TYPE_INT: snprintf(buf, buf_len, "%d" , *(int *)dst);break;
case FF_OPT_TYPE_INT64: snprintf(buf, buf_len, "%Ld", *(int64_t*)dst);break;
case FF_OPT_TYPE_FLOAT: snprintf(buf, buf_len, "%f" , *(float *)dst);break;
case FF_OPT_TYPE_DOUBLE: snprintf(buf, buf_len, "%f" , *(double *)dst);break;
case FF_OPT_TYPE_RATIONAL: snprintf(buf, buf_len, "%d/%d", ((AVRational*)dst)->num, ((AVRational*)dst)->den);break;
default: return NULL;
}
return buf;
}
double av_get_double(void *obj, const char *name){
static int av_get_number(void *obj, const char *name, AVOption **o_out, double *num, int *den, int64_t *intnum){
AVOption *o= find_opt(obj, name);
void *dst;
if(!o || o->offset<=0)
return NAN;
goto error;
dst= ((uint8_t*)obj) + o->offset;
if(o_out) *o_out= o;
switch(o->type){
case FF_OPT_TYPE_INT: return *(int*)dst;
case FF_OPT_TYPE_INT64: return *(int64_t*)dst; //FIXME maybe write a av_get_int64() ?
case FF_OPT_TYPE_FLOAT: return *(float*)dst;
case FF_OPT_TYPE_DOUBLE: return *(double*)dst;
case FF_OPT_TYPE_RATIONAL: return av_q2d(*(AVRational*)dst); //FIXME maybe write a av_get_q() ?
default: return NAN;
case FF_OPT_TYPE_INT: *intnum= *(int *)dst;return 0;
case FF_OPT_TYPE_INT64: *intnum= *(int64_t*)dst;return 0;
case FF_OPT_TYPE_FLOAT: *num= *(float *)dst;return 0;
case FF_OPT_TYPE_DOUBLE: *num= *(double *)dst;return 0;
case FF_OPT_TYPE_RATIONAL: *intnum= ((AVRational*)dst)->num;
*den = ((AVRational*)dst)->den;
return 0;
}
error:
*den=*intnum=0;
return -1;
}
double av_get_double(void *obj, const char *name, AVOption **o_out){
int64_t intnum=1;
double num=1;
int den=1;
av_get_number(obj, name, o_out, &num, &den, &intnum);
return num*intnum/den;
}
AVRational av_get_q(void *obj, const char *name, AVOption **o_out){
int64_t intnum=1;
double num=1;
int den=1;
av_get_number(obj, name, o_out, &num, &den, &intnum);
if(num == 1.0 && (int)intnum == intnum)
return (AVRational){intnum, den};
else
return av_d2q(num*intnum/den, 1<<24);
}
int64_t av_get_int(void *obj, const char *name, AVOption **o_out){
int64_t intnum=1;
double num=1;
int den=1;
av_get_number(obj, name, o_out, &num, &den, &intnum);
return num*intnum/den;
}
int av_opt_show(void *obj, FILE *f){
AVOption *opt=NULL;
if(!obj)
return -1;
#undef fprintf
fprintf(f, "%s AVOptions:\n", (*(AVClass**)obj)->class_name);
while((opt= av_next_option(obj, opt))){
if(!(opt->flags & (AV_OPT_FLAG_ENCODING_PARAM|AV_OPT_FLAG_DECODING_PARAM)))
continue;
fprintf(f, "-%-17s ", opt->name);
fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.');
fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.');
fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.');
fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.');
fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.');
fprintf(f, " %s\n", opt->help);
}
return 0;
}
libavcodec/utils.c
View file @ 8bbf6db9
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment