mirror of https://git.ffmpeg.org/ffmpeg.git
make av_find_opt() available to the public and add a mask+flags parameter to search for specific AVOptions
Originally committed as revision 8279 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3caa0d9343
commit
bc2a1c340a
|
@ -31,12 +31,12 @@
|
||||||
#include "eval.h"
|
#include "eval.h"
|
||||||
|
|
||||||
//FIXME order them and do a bin search
|
//FIXME order them and do a bin search
|
||||||
static const AVOption *find_opt(void *v, const char *name, const char *unit){
|
const AVOption *av_find_opt(void *v, const char *name, const char *unit, int mask, int flags){
|
||||||
AVClass *c= *(AVClass**)v; //FIXME silly way of storing AVClass
|
AVClass *c= *(AVClass**)v; //FIXME silly way of storing AVClass
|
||||||
const AVOption *o= c->option;
|
const AVOption *o= c->option;
|
||||||
|
|
||||||
for(;o && o->name; o++){
|
for(;o && o->name; o++){
|
||||||
if(!strcmp(o->name, name) && (!unit || !strcmp(o->unit, unit)) )
|
if(!strcmp(o->name, name) && (!unit || !strcmp(o->unit, unit)) && (o->flags & mask) == flags )
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -49,7 +49,7 @@ const AVOption *av_next_option(void *obj, const AVOption *last){
|
||||||
}
|
}
|
||||||
|
|
||||||
static const AVOption *av_set_number(void *obj, const char *name, double num, int den, int64_t intnum){
|
static const AVOption *av_set_number(void *obj, const char *name, double num, int den, int64_t intnum){
|
||||||
const AVOption *o= find_opt(obj, name, NULL);
|
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
|
||||||
void *dst;
|
void *dst;
|
||||||
if(!o || o->offset<=0)
|
if(!o || o->offset<=0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -109,7 +109,7 @@ static const char *const_names[]={
|
||||||
};
|
};
|
||||||
|
|
||||||
const AVOption *av_set_string(void *obj, const char *name, const char *val){
|
const AVOption *av_set_string(void *obj, const char *name, const char *val){
|
||||||
const AVOption *o= find_opt(obj, name, NULL);
|
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
|
||||||
if(o && o->offset==0 && o->type == FF_OPT_TYPE_CONST && o->unit){
|
if(o && o->offset==0 && o->type == FF_OPT_TYPE_CONST && o->unit){
|
||||||
return set_all_opt(obj, o->unit, o->default_val);
|
return set_all_opt(obj, o->unit, o->default_val);
|
||||||
}
|
}
|
||||||
|
@ -133,7 +133,7 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
|
||||||
|
|
||||||
d = ff_eval2(buf, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error);
|
d = ff_eval2(buf, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error);
|
||||||
if(isnan(d)) {
|
if(isnan(d)) {
|
||||||
const AVOption *o_named= find_opt(obj, buf, o->unit);
|
const AVOption *o_named= av_find_opt(obj, buf, o->unit, 0, 0);
|
||||||
if(o_named && o_named->type == FF_OPT_TYPE_CONST)
|
if(o_named && o_named->type == FF_OPT_TYPE_CONST)
|
||||||
d= o_named->default_val;
|
d= o_named->default_val;
|
||||||
else if(!strcmp(buf, "default")) d= o->default_val;
|
else if(!strcmp(buf, "default")) d= o->default_val;
|
||||||
|
@ -180,7 +180,7 @@ const AVOption *av_set_int(void *obj, const char *name, int64_t n){
|
||||||
* @param buf_len allocated length in bytes of buf
|
* @param buf_len allocated length in bytes of buf
|
||||||
*/
|
*/
|
||||||
const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len){
|
const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len){
|
||||||
const AVOption *o= find_opt(obj, name, NULL);
|
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
|
||||||
void *dst;
|
void *dst;
|
||||||
if(!o || o->offset<=0)
|
if(!o || o->offset<=0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -206,7 +206,7 @@ const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c
|
||||||
}
|
}
|
||||||
|
|
||||||
static int av_get_number(void *obj, const char *name, const AVOption **o_out, double *num, int *den, int64_t *intnum){
|
static int av_get_number(void *obj, const char *name, const AVOption **o_out, double *num, int *den, int64_t *intnum){
|
||||||
const AVOption *o= find_opt(obj, name, NULL);
|
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
|
||||||
void *dst;
|
void *dst;
|
||||||
if(!o || o->offset<=0)
|
if(!o || o->offset<=0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
|
@ -68,6 +68,7 @@ typedef struct AVOption {
|
||||||
} AVOption;
|
} AVOption;
|
||||||
|
|
||||||
|
|
||||||
|
const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
|
||||||
const AVOption *av_set_string(void *obj, const char *name, const char *val);
|
const AVOption *av_set_string(void *obj, const char *name, const char *val);
|
||||||
const AVOption *av_set_double(void *obj, const char *name, double n);
|
const AVOption *av_set_double(void *obj, const char *name, double n);
|
||||||
const AVOption *av_set_q(void *obj, const char *name, AVRational n);
|
const AVOption *av_set_q(void *obj, const char *name, AVRational n);
|
||||||
|
|
Loading…
Reference in New Issue