# HG changeset patch # User michael # Date 1231094917 0 # Node ID a0164882aa38019aa6f7a512799f81ffa3278e12 # Parent cc64e134339712862e1de1d4554c50319028e7cc Generic metadata API. avi is updated as example. No version bump, the API still might change slightly ... No update to ffmpeg.c as requested by aurel. diff -r cc64e1343397 -r a0164882aa38 Makefile --- a/Makefile Sun Jan 04 01:36:11 2009 +0000 +++ b/Makefile Sun Jan 04 18:48:37 2009 +0000 @@ -14,6 +14,7 @@ faanidct.o \ imgconvert.o \ jrevdct.o \ + metadata.o \ opt.o \ parser.o \ raw.o \ diff -r cc64e1343397 -r a0164882aa38 avcodec.h --- a/avcodec.h Sun Jan 04 01:36:11 2009 +0000 +++ b/avcodec.h Sun Jan 04 18:48:37 2009 +0000 @@ -400,6 +400,51 @@ */ #define FF_MIN_BUFFER_SIZE 16384 + +/* + * public Metadata API. + * Important concepts, to keep in mind + * 1. keys are unique, there are never 2 tags with equal keys, this is also + * meant semantically that is a demuxer should not knowingly produce + * several keys that are litterally different but semantically identical, + * like key=Author5, key=Author6. + * All authors have to be placed in the same tag for the case of Authors. + * 2. Metadata is flat, there are no subtags, if you for whatever obscene + * reason want to store the email address of the child of producer alice + * and actor bob, that could have key=alice_and_bobs_childs_email_address. + * 3. A tag whichs value is translated has the ISO 639 3-letter language code + * with a '-' between appended. So for example Author-ger=Michael, Author-eng=Mike + * the original/default language is in the unqualified "Author" + * A demuxer should set a default if it sets any translated tag. + */ + +#define AV_METADATA_IGNORE_CASE 1 +#define AV_METADATA_IGNORE_SUFFIX 2 + +typedef struct { + char *key; + char *value; +}AVMetaDataTag; + +struct AVMetaData; + +/** + * gets a metadata element with matching key. + * @param prev set to the previous matching element to find the next. + * @param flags allows case as well as suffix insensitive comparissions. + * @return found tag or NULL, changing key or value leads to undefined behavior. + */ +AVMetaDataTag * +av_metadata_get(struct AVMetaData *m, const char *key, const AVMetaDataTag *prev, int flags); + +/** + * sets the given tag in m, overwriting an existing tag. + * @param tag tag to add to m, key and value will be av_strduped. + * @return >= 0 if success otherwise error code that is <0. + */ +int av_metadata_set(struct AVMetaData **m, AVMetaDataTag tag); + + /** * motion estimation type. */ diff -r cc64e1343397 -r a0164882aa38 metadata.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.c Sun Jan 04 18:48:37 2009 +0000 @@ -0,0 +1,75 @@ +/* + * copyright (c) 2009 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "metadata.h" + +AVMetaDataTag * +av_metadata_get(struct AVMetaData *m, const char *key, const AVMetaDataTag *prev, int flags) +{ + unsigned int i, j; + + if(!m) + return NULL; + + if(prev) i= prev - m->elems + 1; + else i= 0; + + for(; icount; i++){ + const char *s= m->elems[i].key; + if(flags & AV_METADATA_IGNORE_CASE) for(j=0; toupper(s[j]) == toupper(key[j]) && key[j]; j++); + else for(j=0; s[j] == key[j] && key[j]; j++); + if(key[j]) + continue; + if(s[j] && !(flags & AV_METADATA_IGNORE_SUFFIX)) + continue; + return &m->elems[i]; + } + return NULL; +} + +int av_metadata_set(struct AVMetaData **pm, AVMetaDataTag elem) +{ + struct AVMetaData *m= *pm; + AVMetaDataTag *tag= av_metadata_get(m, elem.key, NULL, 0); + + if(!m) + m=*pm= av_mallocz(sizeof(*m)); + + if(tag){ + av_free(tag->value); + av_free(tag->key); + *tag= m->elems[--m->count]; + }else{ + AVMetaDataTag *tmp= av_realloc(m->elems, (m->count+1) * sizeof(*m->elems)); + if(tmp){ + m->elems= tmp; + }else + return AVERROR(ENOMEM); + } + if(elem.value){ + elem.key = av_strdup(elem.key ); + elem.value= av_strdup(elem.value); + m->elems[m->count++]= elem; + } + if(!m->count) + av_freep(pm); + + return 0; +} diff -r cc64e1343397 -r a0164882aa38 metadata.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.h Sun Jan 04 18:48:37 2009 +0000 @@ -0,0 +1,38 @@ +/* + * copyright (c) 2009 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_METADATA_H +#define AVCODEC_METADATA_H + +/** + * @file metadata.h + * internal metadata API header + * see avcodec.h or the public API! + */ + + +#include "avcodec.h" + +struct AVMetaData{ + int count; + AVMetaDataTag *elems; +}; + +#endif /* AVCODEC_METADATA_H */