Add a @todo with a comment from Kostya so we don't forget to optimize that at

[ffmpeg] / libavformat / metadata.c

diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index 6744f22db7f9f62389b3394b2f918e74d218761a..54c66c9d88bc815d8b4ca40939e90afc782d623a 100644 (file)
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <strings.h>
+#include "avformat.h"
 #include "metadata.h"
 
 AVMetadataTag *
@@ -68,8 +70,10 @@ int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
         m->elems[m->count].value= av_strdup(value);
         m->count++;
     }
-    if(!m->count)
+    if(!m->count) {
+        av_free(m->elems);
         av_freep(pm);
+    }
 
     return 0;
 }
@@ -87,3 +91,48 @@ void av_metadata_free(AVMetadata **pm)
     }
     av_freep(pm);
 }
+
+static void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+                                           const AVMetadataConv *s_conv)
+{
+    /* 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;
+    AVMetadataTag *mtag = NULL;
+    AVMetadata *dst = NULL;
+    const char *key;
+
+    while((mtag=av_metadata_get(*pm, "", mtag, AV_METADATA_IGNORE_SUFFIX))) {
+        key = mtag->key;
+        if (s_conv != d_conv) {
+            if (s_conv)
+                for (sc=s_conv; sc->native; sc++)
+                if (!strcasecmp(key, sc->native)) {
+                    key = sc->generic;
+                    break;
+                }
+            if (d_conv)
+                for (dc=d_conv; dc->native; dc++)
+                    if (!strcasecmp(key, dc->generic)) {
+                    key = dc->native;
+                    break;
+                }
+        }
+        av_metadata_set(&dst, key, mtag->value);
+    }
+    av_metadata_free(pm);
+    *pm = dst;
+}
+
+void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                            const AVMetadataConv *s_conv)
+{
+    int i;
+    metadata_conv(&ctx->metadata, d_conv, s_conv);
+    for (i=0; i<ctx->nb_streams ; i++)
+        metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
+    for (i=0; i<ctx->nb_chapters; i++)
+        metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
+    for (i=0; i<ctx->nb_programs; i++)
+        metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
+}