dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation

[ffmpeg] / libavformat / metadata.c

diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index fec80d98222b5ff5c9d4c2d7c655c8fe1485190a..77fb29821713f308e5456e319d2c36dcd17c52cd 100644 (file)
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -1,75 +1,70 @@
 /*
  * copyright (c) 2009 Michael Niedermayer
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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,
+ * Libav 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
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "avformat.h"
 #include "metadata.h"
+#include "libavutil/dict.h"
+#include "libavutil/avstring.h"
 
-AVMetadataTag *
-av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags)
+void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
+                                       const AVMetadataConv *s_conv)
 {
-    unsigned int i, j;
+    /* TODO: use binary search to look up the two conversion tables
+       if the tables are getting big enough that it would matter speed wise */
+    const AVMetadataConv *sc, *dc;
+    AVDictionaryEntry *mtag = NULL;
+    AVDictionary *dst = NULL;
+    const char *key;
 
-    if(!m)
-        return NULL;
+    if (d_conv == s_conv)
+        return;
 
-    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];
+    while ((mtag = av_dict_get(*pm, "", mtag, AV_DICT_IGNORE_SUFFIX))) {
+        key = mtag->key;
+        if (s_conv)
+            for (sc=s_conv; sc->native; sc++)
+                if (!av_strcasecmp(key, sc->native)) {
+                    key = sc->generic;
+                    break;
+                }
+        if (d_conv)
+            for (dc=d_conv; dc->native; dc++)
+                if (!av_strcasecmp(key, dc->generic)) {
+                    key = dc->native;
+                    break;
+                }
+        av_dict_set(&dst, key, mtag->value, 0);
     }
-    return NULL;
+    av_dict_free(pm);
+    *pm = dst;
 }
 
-int av_metadata_set(AVMetadata **pm, AVMetadataTag elem)
+void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                                const AVMetadataConv *s_conv)
 {
-    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;
+    int i;
+    ff_metadata_conv(&ctx->metadata, d_conv, s_conv);
+    for (i=0; i<ctx->nb_streams ; i++)
+        ff_metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
+    for (i=0; i<ctx->nb_chapters; i++)
+        ff_metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
+    for (i=0; i<ctx->nb_programs; i++)
+        ff_metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
 }