[FFmpeg-devel] [RFC] cryptokey options
Reimar Döffinger
Reimar.Doeffinger
Thu Dec 13 12:14:20 CET 2007
Hello,
On Mon, Dec 03, 2007 at 01:03:24AM +0100, Michael Niedermayer wrote:
[...]
> > Index: libavcodec/opt.c
> > ===================================================================
> > --- libavcodec/opt.c (revision 11089)
> > +++ libavcodec/opt.c (working copy)
> > @@ -69,6 +69,7 @@
> > 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;
> > }
>
> unrelated?
Removed.
> [...]
> > @@ -114,6 +122,25 @@
> > }
> > if(!o || !val || o->offset<=0)
> > return NULL;
> > + if(o->type == FF_OPT_TYPE_BINARY){
> > + uint8_t *bin, *ptr;
> > + int len = strlen(val);
> > + if (len & 1) return NULL;
> > + len /= 2;
> > + ptr = bin = av_malloc(len);
>
> where is this freed() ? it seems nowhere ...
> a series of av_set_string() would leak ...
Hopefully fixed and generally less ugly.
> [...]
> > @@ -67,6 +68,7 @@
> > #define AV_OPT_FLAG_SUBTITLE_PARAM 32
> > //FIXME think about enc-audio, ... style flags
> > const char *unit;
> > + int offset2;
> > } AVOption;
>
> actually, this is unneeded
> offset + sizeof(void*) should do
Changed, though I do not like such implicit "assumptions" too much.
Greetings,
Reimar D?ffinger
-------------- next part --------------
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index c11dcd3..b481910 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -107,6 +108,13 @@ static const char *const_names[]={
0
};
+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;
+}
+
const AVOption *av_set_string(void *obj, const char *name, const char *val){
const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
if(o && o->offset==0 && o->type == FF_OPT_TYPE_CONST && o->unit){
@@ -114,6 +122,29 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
}
if(!o || !val || o->offset<=0)
return NULL;
+ 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 NULL;
+ 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 NULL;
+ }
+ *ptr++ = (a << 4) | b;
+ }
+ *dst = bin;
+ *lendst = len;
+ return o;
+ }
if(o->type != FF_OPT_TYPE_STRING){
for(;;){
int i;
@@ -183,6 +214,8 @@ const AVOption *av_set_int(void *obj, const char *name, int64_t n){
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))
@@ -199,6 +232,12 @@ const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c
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;
@@ -305,6 +344,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit)
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 ", "" );
@@ -372,6 +414,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags)
}
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:
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index 0860d16..c34eb07 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -37,6 +37,7 @@ enum AVOptionType{
FF_OPT_TYPE_FLOAT,
FF_OPT_TYPE_STRING,
FF_OPT_TYPE_RATIONAL,
+ FF_OPT_TYPE_BINARY,
FF_OPT_TYPE_CONST=128,
};
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3cd0755..a389b77 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -323,6 +323,7 @@ static const AVOption options[]={
{"track", " set the track number", OFFSET(track), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
{"year", "set the year", OFFSET(year), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, E},
{"analyzeduration", "how many microseconds are analyzed to estimate duration", OFFSET(max_analyze_duration), FF_OPT_TYPE_INT, 3*AV_TIME_BASE, 0, INT_MAX, D},
+{"cryptokey", "decryption key", OFFSET(key), FF_OPT_TYPE_BINARY, 0, 0, 0, D},
{NULL},
};
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20071213/ec150a03/attachment.pgp>
More information about the ffmpeg-devel
mailing list