else return (*(AVClass**)obj)->option;
}
-static const AVOption *av_set_number(void *obj, const char *name, double num, int den, int64_t intnum){
+static int av_set_number2(void *obj, const char *name, double num, int den, int64_t intnum, const AVOption **o_out){
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
void *dst;
+ if(o_out)
+ *o_out= o;
if(!o || o->offset<=0)
- return NULL;
+ return AVERROR(ENOENT);
if(o->max*den < num*intnum || o->min*den > num*intnum) {
- av_log(NULL, AV_LOG_ERROR, "Value %lf for parameter '%s' out of range.\n", num, name);
- return NULL;
+ av_log(NULL, AV_LOG_ERROR, "Value %lf for parameter '%s' out of range\n", num, name);
+ return AVERROR(ERANGE);
}
dst= ((uint8_t*)obj) + o->offset;
switch(o->type){
case FF_OPT_TYPE_FLAGS:
- 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_INT: *(int *)dst= llrint(num/den)*intnum; break;
+ case FF_OPT_TYPE_INT64: *(int64_t *)dst= llrint(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);
+ break;
default:
- return NULL;
+ return AVERROR(EINVAL);
}
- return o;
+ return 0;
}
-static const AVOption *set_all_opt(void *v, const char *unit, double d){
- AVClass *c= *(AVClass**)v; //FIXME silly way of storing AVClass
- const AVOption *o= c->option;
- const AVOption *ret=NULL;
-
- for(;o && o->name; o++){
- if(o->type != FF_OPT_TYPE_CONST && o->unit && !strcmp(o->unit, unit)){
- double tmp= d;
- if(o->type == FF_OPT_TYPE_FLAGS)
- tmp= av_get_int(v, o->name, NULL) | (int64_t)d;
-
- av_set_number(v, o->name, tmp, 1, 1);
- ret= o;
- }
- }
- return ret;
+static const AVOption *av_set_number(void *obj, const char *name, double num, int den, int64_t intnum){
+ const AVOption *o = NULL;
+ if (av_set_number2(obj, name, num, den, intnum, &o) < 0)
+ return NULL;
+ else
+ return o;
}
-static double const_values[]={
+static const double const_values[]={
M_PI,
M_E,
FF_QP2LAMBDA,
0
};
-static const char *const_names[]={
+static const char * const const_names[]={
"PI",
"E",
"QP2LAMBDA",
0
};
-const AVOption *av_set_string(void *obj, const char *name, const char *val){
+static int hexchar2int(char c) {
+ if (c >= '0' && c <= '9') return c - '0';
+ if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+ if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+ return -1;
+}
+
+int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out){
+ int ret;
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
- if(o && o->offset==0 && o->type == FF_OPT_TYPE_CONST && o->unit){
- return set_all_opt(obj, o->unit, o->default_val);
+ if (o_out)
+ *o_out = o;
+ if(!o)
+ return AVERROR(ENOENT);
+ if(!val || o->offset<=0)
+ return AVERROR(EINVAL);
+
+ if(o->type == FF_OPT_TYPE_BINARY){
+ uint8_t **dst = (uint8_t **)(((uint8_t*)obj) + o->offset);
+ int *lendst = (int *)(dst + 1);
+ uint8_t *bin, *ptr;
+ int len = strlen(val);
+ av_freep(dst);
+ *lendst = 0;
+ if (len & 1) return AVERROR(EINVAL);
+ len /= 2;
+ ptr = bin = av_malloc(len);
+ while (*val) {
+ int a = hexchar2int(*val++);
+ int b = hexchar2int(*val++);
+ if (a < 0 || b < 0) {
+ av_free(bin);
+ return AVERROR(EINVAL);
+ }
+ *ptr++ = (a << 4) | b;
+ }
+ *dst = bin;
+ *lendst = len;
+ return 0;
}
- if(!o || !val || o->offset<=0)
- return NULL;
if(o->type != FF_OPT_TYPE_STRING){
+ int notfirst=0;
for(;;){
int i;
char buf[256];
int cmd=0;
double d;
- char *error = NULL;
+ const char *error = NULL;
if(*val == '+' || *val == '-')
cmd= *(val++);
for(i=0; i<sizeof(buf)-1 && val[i] && val[i]!='+' && val[i]!='-'; i++)
buf[i]= val[i];
buf[i]=0;
- val+= i;
d = ff_eval2(buf, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error);
if(isnan(d)) {
else if(!strcmp(buf, "none" )) d= 0;
else if(!strcmp(buf, "all" )) d= ~0;
else {
- if (!error)
+ if (error)
av_log(NULL, AV_LOG_ERROR, "Unable to parse option value \"%s\": %s\n", val, error);
- return NULL;
+ return AVERROR(EINVAL);
}
}
if(o->type == FF_OPT_TYPE_FLAGS){
if (cmd=='+') d= av_get_int(obj, name, NULL) | (int64_t)d;
else if(cmd=='-') d= av_get_int(obj, name, NULL) &~(int64_t)d;
- }else if(cmd=='-')
- d= -d;
+ }else{
+ if (cmd=='+') d= notfirst*av_get_double(obj, name, NULL) + d;
+ else if(cmd=='-') d= notfirst*av_get_double(obj, name, NULL) - d;
+ }
- av_set_number(obj, name, d, 1, 1);
+ if ((ret = av_set_number2(obj, name, d, 1, 1, o_out)) < 0)
+ return ret;
+ val+= i;
if(!*val)
- return o;
+ return 0;
+ notfirst=1;
}
- return NULL;
+ return AVERROR(EINVAL);
+ }
+
+ if(alloc){
+ av_free(*(void**)(((uint8_t*)obj) + o->offset));
+ val= av_strdup(val);
}
memcpy(((uint8_t*)obj) + o->offset, &val, sizeof(val));
+ return 0;
+}
+
+#if LIBAVCODEC_VERSION_MAJOR < 53
+const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
+ const AVOption *o;
+ if (av_set_string3(obj, name, val, alloc, &o) < 0)
+ return NULL;
return o;
}
+const AVOption *av_set_string(void *obj, const char *name, const char *val){
+ const AVOption *o;
+ if (av_set_string3(obj, name, val, 0, &o) < 0)
+ return NULL;
+ return o;
+}
+#endif
+
const AVOption *av_set_double(void *obj, const char *name, double n){
return av_set_number(obj, name, n, 1, 1);
}
const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len){
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
void *dst;
+ uint8_t *bin;
+ int len, i;
if(!o || o->offset<=0)
return NULL;
if(o->type != FF_OPT_TYPE_STRING && (!buf || !buf_len))
dst= ((uint8_t*)obj) + o->offset;
if(o_out) *o_out= o;
- if(o->type == FF_OPT_TYPE_STRING)
- return *(void**)dst;
-
switch(o->type){
case FF_OPT_TYPE_FLAGS: snprintf(buf, buf_len, "0x%08X",*(int *)dst);break;
case FF_OPT_TYPE_INT: snprintf(buf, buf_len, "%d" , *(int *)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;
+ case FF_OPT_TYPE_STRING: return *(void**)dst;
+ case FF_OPT_TYPE_BINARY:
+ len = *(int*)(((uint8_t *)dst) + sizeof(uint8_t *));
+ if(len >= (buf_len + 1)/2) return NULL;
+ bin = *(uint8_t**)dst;
+ for(i = 0; i < len; i++) snprintf(buf + i*2, 3, "%02X", bin[i]);
+ break;
default: return NULL;
}
return buf;
if(o_out) *o_out= o;
switch(o->type){
- case FF_OPT_TYPE_FLAGS:
+ case FF_OPT_TYPE_FLAGS: *intnum= *(unsigned int*)dst;return 0;
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_RATIONAL:
av_log( av_log_obj, AV_LOG_INFO, "%-7s ", "<rational>" );
break;
+ case FF_OPT_TYPE_BINARY:
+ av_log( av_log_obj, AV_LOG_INFO, "%-7s ", "<binary>" );
+ break;
case FF_OPT_TYPE_CONST:
default:
av_log( av_log_obj, AV_LOG_INFO, "%-7s ", "" );
av_set_int(s, opt->name, val);
}
break;
+ case FF_OPT_TYPE_INT64:
+ if((double)(opt->default_val+0.6) == opt->default_val)
+ av_log(s, AV_LOG_DEBUG, "loss of precission in default of %s\n", opt->name);
+ av_set_int(s, opt->name, opt->default_val);
+ break;
case FF_OPT_TYPE_FLOAT: {
double val;
val = opt->default_val;
}
break;
case FF_OPT_TYPE_STRING:
+ case FF_OPT_TYPE_BINARY:
/* Cannot set default for string as default_val is of type * double */
break;
default:
projects / ffmpeg / blobdiff