generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement the av_set_number2() internal function, which makes possible

Browse Source 
to distinguish between a not found option failure and a not valid
value failure.

Originally committed as revision 16156 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2008-12-15 22:48:10 +00:00
parent a59d44fdf4
commit 301cc4f370
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/opt.c
View File

@ -47,15 +47,17 @@ const AVOption *av_next_option(void *obj, const AVOption *last){
else return (*(AVClass**)obj)->option; 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); const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
void *dst; void *dst;
if(o_out)
*o_out= o;
if(!o || o->offset<=0) if(!o || o->offset<=0)
return NULL; return AVERROR(ENOENT);
if(o->max*den < num*intnum || o->min*den > num*intnum) { 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); av_log(NULL, AV_LOG_ERROR, "Value %lf for parameter '%s' out of range\n", num, name);
return NULL; return AVERROR(ERANGE);
} }
dst= ((uint8_t*)obj) + o->offset; dst= ((uint8_t*)obj) + o->offset;
@ -71,9 +73,17 @@ static const AVOption *av_set_number(void *obj, const char *name, double num, in
else *(AVRational*)dst= av_d2q(num*intnum/den, 1<<24); else *(AVRational*)dst= av_d2q(num*intnum/den, 1<<24);
break; break;
default: default:
return NULL; return AVERROR(EINVAL);
} }
return o; return 0;
}
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 const double const_values[]={ static const double const_values[]={