[FFmpeg-cvslog] r16425 - in trunk: libavcodec/Makefile libavcodec/avcodec.h libavcodec/metadata.c libavcodec/metadata.h libavformat/Makefile libavformat/avformat.h libavformat/metadata.c libavformat/metadata.h
michael
subversion
Sun Jan 4 19:58:49 CET 2009
Author: michael
Date: Sun Jan 4 19:58:49 2009
New Revision: 16425
Log:
Move metadata API from avcodec to avformat.
Added:
trunk/libavformat/metadata.c (props changed)
- copied unchanged from r16424, trunk/libavcodec/metadata.c
trunk/libavformat/metadata.h (contents, props changed)
- copied, changed from r16424, trunk/libavcodec/metadata.h
Deleted:
trunk/libavcodec/metadata.c
trunk/libavcodec/metadata.h
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/avcodec.h
trunk/libavformat/Makefile
trunk/libavformat/avformat.h
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Sun Jan 4 19:48:37 2009 (r16424)
+++ trunk/libavcodec/Makefile Sun Jan 4 19:58:49 2009 (r16425)
@@ -14,7 +14,6 @@ OBJS = allcodecs.o
faanidct.o \
imgconvert.o \
jrevdct.o \
- metadata.o \
opt.o \
parser.o \
raw.o \
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h Sun Jan 4 19:48:37 2009 (r16424)
+++ trunk/libavcodec/avcodec.h Sun Jan 4 19:58:49 2009 (r16425)
@@ -401,50 +401,6 @@ enum SampleFormat {
#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.
*/
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile Sun Jan 4 19:48:37 2009 (r16424)
+++ trunk/libavformat/Makefile Sun Jan 4 19:58:49 2009 (r16425)
@@ -5,7 +5,7 @@ FFLIBS = avcodec avutil
HEADERS = avformat.h avio.h rtsp.h rtspcodes.h
-OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
+OBJS = allformats.o cutils.o metadata.o os_support.o sdp.o utils.o
# muxers/demuxers
OBJS-$(CONFIG_AAC_DEMUXER) += raw.o
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h Sun Jan 4 19:48:37 2009 (r16424)
+++ trunk/libavformat/avformat.h Sun Jan 4 19:58:49 2009 (r16425)
@@ -46,6 +46,51 @@ unsigned avformat_version(void);
#include "avio.h"
+
+/*
+ * 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);
+
+
/* packet functions */
typedef struct AVPacket {
Copied: trunk/libavformat/metadata.c (from r16424, trunk/libavcodec/metadata.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavformat/metadata.c Sun Jan 4 19:58:49 2009 (r16425, copy of r16424, trunk/libavcodec/metadata.c)
@@ -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(; i<m->count; 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;
+}
Copied and modified: trunk/libavformat/metadata.h (from r16424, trunk/libavcodec/metadata.h)
==============================================================================
--- trunk/libavcodec/metadata.h Sun Jan 4 19:48:37 2009 (r16424, copy source)
+++ trunk/libavformat/metadata.h Sun Jan 4 19:58:49 2009 (r16425)
@@ -18,21 +18,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_METADATA_H
-#define AVCODEC_METADATA_H
+#ifndef AVFORMAT_METADATA_H
+#define AVFORMAT_METADATA_H
/**
* @file metadata.h
* internal metadata API header
- * see avcodec.h or the public API!
+ * see avformat.h or the public API!
*/
-#include "avcodec.h"
+#include "avformat.h"
struct AVMetaData{
int count;
AVMetaDataTag *elems;
};
-#endif /* AVCODEC_METADATA_H */
+#endif /* AVFORMAT_METADATA_H */
More information about the ffmpeg-cvslog
mailing list