From: Michael Niedermayer <[email protected]>
This includes documentation and other modifications by
Lukasz Marek.
---
doc/APIchanges | 3 +++
libavutil/opt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
libavutil/opt.h | 13 ++++++++++++
libavutil/version.h | 2 +-
4 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 20fecb9..aa6f004 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2015-08-28
API changes, most recent first:
+2016-xx-xx - xxxxxxx - lavu 55.7.0 - opt.h
+ Add av_opt_copy().
+
2016-02-23 - 9200514 - lavf 57.5.0 - avformat.h
Add AVStream.codecpar, deprecate AVStream.codec.
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 5825a72..75e8970 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -757,6 +757,64 @@ const AVClass *av_opt_child_class_next(const AVClass
*parent, const AVClass *pre
return NULL;
}
+static int opt_size(enum AVOptionType type)
+{
+ switch(type) {
+ case AV_OPT_TYPE_INT:
+ case AV_OPT_TYPE_FLAGS: return sizeof(int);
+ case AV_OPT_TYPE_INT64: return sizeof(int64_t);
+ case AV_OPT_TYPE_DOUBLE: return sizeof(double);
+ case AV_OPT_TYPE_FLOAT: return sizeof(float);
+ case AV_OPT_TYPE_STRING: return sizeof(uint8_t*);
+ case AV_OPT_TYPE_RATIONAL: return sizeof(AVRational);
+ case AV_OPT_TYPE_BINARY: return sizeof(uint8_t*) + sizeof(int);
+ }
+ return 0;
+}
+
+int av_opt_copy(void *dst, const void *src)
+{
+ const AVOption *o = NULL;
+ const AVClass *c;
+ int ret = 0;
+
+ if (!src)
+ return 0;
+
+ c = *(AVClass**)src;
+ if (*(AVClass**)dst && c != *(AVClass**)dst)
+ return AVERROR(EINVAL);
+
+ while ((o = av_opt_next(src, o))) {
+ void *field_dst = ((uint8_t*)dst) + o->offset;
+ void *field_src = ((uint8_t*)src) + o->offset;
+ uint8_t **field_dst8 = (uint8_t**)field_dst;
+ uint8_t **field_src8 = (uint8_t**)field_src;
+
+ if (o->type == AV_OPT_TYPE_STRING) {
+ set_string(dst, o, *field_src8, field_dst8);
+ if (*field_src8 && !*field_dst8)
+ ret = AVERROR(ENOMEM);
+ } else if (o->type == AV_OPT_TYPE_BINARY) {
+ int len = *(int*)(field_src8 + 1);
+ if (*field_dst8 != *field_src8)
+ av_freep(field_dst8);
+ *field_dst8 = av_malloc(len);
+ if (len && !*field_dst8) {
+ ret = AVERROR(ENOMEM);
+ len = 0;
+ }
+ memcpy(*field_dst8, *field_src8, len);
+ *(int*)(field_dst8 + 1) = len;
+ } else if (o->type == AV_OPT_TYPE_CONST) {
+ // do nothing
+ } else {
+ memcpy(field_dst, field_src, opt_size(o->type));
+ }
+ }
+ return ret;
+}
+
#ifdef TEST
typedef struct TestContext
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 6750753..9315a86 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -531,6 +531,19 @@ int av_opt_get_q (void *obj, const char *name, int
search_flags, AVRationa
* be freed with av_dict_free() by the caller
*/
int av_opt_get_dict_val(void *obj, const char *name, int search_flags,
AVDictionary **out_val);
+
+/**
+ * Copy options from src object into dest object.
+ *
+ * Options that require memory allocation (e.g. string or binary) are
malloc'ed in dest object.
+ * Original memory allocated for such options is freed unless both src and
dest options points to the same memory.
+ *
+ * @param dest Object to copy from
+ * @param src Object to copy into
+ * @return 0 on success, negative on error
+ */
+int av_opt_copy(void *dest, const void *src);
+
/**
* @}
* @}
diff --git a/libavutil/version.h b/libavutil/version.h
index 15be994..7c8e71a 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 6
+#define LIBAVUTIL_VERSION_MINOR 7
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
--
2.5.4 (Apple Git-61)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
