* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <strings.h>
+#include "avformat.h"
#include "metadata.h"
AVMetadataTag *
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(flags & AV_METADATA_MATCH_CASE) for(j=0; s[j] == key[j] && key[j]; j++);
+ else for(j=0; toupper(s[j]) == toupper(key[j]) && key[j]; j++);
if(key[j])
continue;
if(s[j] && !(flags & AV_METADATA_IGNORE_SUFFIX))
return NULL;
}
-int av_metadata_set(AVMetadata **pm, AVMetadataTag elem)
+int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags)
{
AVMetadata *m= *pm;
- AVMetadataTag *tag= av_metadata_get(m, elem.key, NULL, 0);
+ AVMetadataTag *tag= av_metadata_get(m, key, NULL, AV_METADATA_MATCH_CASE);
if(!m)
m=*pm= av_mallocz(sizeof(*m));
}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(value){
+ if(flags & AV_METADATA_DONT_STRDUP_KEY){
+ m->elems[m->count].key = key;
+ }else
+ m->elems[m->count].key = av_strdup(key );
+ if(flags & AV_METADATA_DONT_STRDUP_VAL){
+ m->elems[m->count].value= value;
+ }else
+ 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;
}
+#if LIBAVFORMAT_VERSION_MAJOR == 52
+int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
+{
+ return av_metadata_set2(pm, key, value, 0);
+}
+#endif
+
void av_metadata_free(AVMetadata **pm)
{
AVMetadata *m= *pm;
av_freep(pm);
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-#define FILL_METADATA(s, key, value) { \
- if (value && *value && \
- !av_metadata_get(s->metadata, #key, NULL, AV_METADATA_IGNORE_CASE)) \
- av_metadata_set(&s->metadata, (const AVMetadataTag){#key, value}); \
+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);
}
-#define FILL_METADATA_STR(s, key) FILL_METADATA(s, key, s->key)
-#define FILL_METADATA_INT(s, key) { \
- char number[10]; \
- snprintf(number, sizeof(number), "%d", s->key); \
- if(s->key) FILL_METADATA(s, key, number) }
+ av_metadata_free(pm);
+ *pm = dst;
+}
-void ff_metadata_sync_compat(AVFormatContext *ctx)
+void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+ const AVMetadataConv *s_conv)
{
int i;
-
- FILL_METADATA_STR(ctx, title);
- FILL_METADATA_STR(ctx, author);
- FILL_METADATA_STR(ctx, copyright);
- FILL_METADATA_STR(ctx, comment);
- FILL_METADATA_STR(ctx, album);
- FILL_METADATA_INT(ctx, year);
- FILL_METADATA_INT(ctx, track);
- FILL_METADATA_STR(ctx, genre);
+ 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++)
- FILL_METADATA_STR(ctx->chapters[i], title);
- for (i=0; i<ctx->nb_programs; i++) {
- FILL_METADATA_STR(ctx->programs[i], name);
- FILL_METADATA_STR(ctx->programs[i], provider_name);
- }
- for (i=0; i<ctx->nb_streams; i++) {
- FILL_METADATA_STR(ctx->streams[i], language);
- FILL_METADATA_STR(ctx->streams[i], filename);
- }
+ 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);
}
-#endif