[FFmpeg-devel] [PATCH 3/4] lavf: simplify setting the encoder ident tag.

[Aurelien Jacobs]

On Sun, Oct 17, 2010 at 10:28:05AM +0200, Michael Niedermayer wrote:
> On Sat, Oct 16, 2010 at 06:19:43PM +0200, Anton Khirnov wrote:
> > On Sat, Oct 16, 2010 at 03:08:39PM +0200, Aurelien Jacobs wrote:
> > > On Sat, Oct 16, 2010 at 06:41:47AM +0200, Anton Khirnov wrote:
> > > > On Fri, Oct 15, 2010 at 10:24:15PM +0200, Aurelien Jacobs wrote:
> > > > > On Fri, Oct 15, 2010 at 09:21:00PM +0200, Anton Khirnov wrote:
> > > > > > ---
> > > > > >  libavformat/utils.c |   13 +++++--------
> > > > > >  1 files changed, 5 insertions(+), 8 deletions(-)
> > > > > > 
> > > > > > diff --git a/libavformat/utils.c b/libavformat/utils.c
> > > > > > index 289b91c..6fe3793 100644
> > > > > > --- a/libavformat/utils.c
> > > > > > +++ b/libavformat/utils.c
> > > > > > @@ -2755,16 +2755,13 @@ int av_write_header(AVFormatContext *s)
> > > > > >  
> > > > > >      /* set muxer identification string */
> > > > > >      if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
> > > > > > -        AVMetadata *m;
> > > > > >          AVMetadataTag *t;
> > > > > > +        while ((t = av_metadata_get(s->metadata, "encoder", NULL, 0))) {
> > > > > > +            char *key = av_strdup(t->key);
> > > > > > +            av_metadata_set2(&s->metadata, key, NULL, AV_METADATA_DONT_STRDUP_KEY);
> > > > > > +        }
> > > > > 
> > > > > Is this really useful ?
> > > > yes, when we're remuxing from e.g. matroska or ogg there might be an
> > > > all-uppercase ENCODER tag, which we don't want in the output.
> > > 
> > > Hum... It would probably be cleaner to just export generic tags from the
> > > matroska and ogg demuxers. You could provide a conversion table
> > > converting ENCODER to encoder (and same for other generic tag), or maybe
> > > all tags could be converted to lowercase in those demuxers....
> > > But in all cases, it looks wrong to try to workaround demuxers which
> > > export encoder name in a tag which is not named "encoder".
> > Metadata conversion (and most other metadata-related code) is currently
> > case-insensitive. I'd like for it to stay that way.
> > 
> > Maybe we should instead make av_metadata_set2 case insensitive by
> > default? Patch for that attached.
> > 
> 
> >  metadata.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 7548640756a675eb409a9592f05d63517f5101e1  0001-metadata-make-av_metadata_set2-case-insensitive-by-d.patch
> > From 9e88c3bee722c813e0313895e1c962d5c2c9bb7d Mon Sep 17 00:00:00 2001
> > From: Anton Khirnov <anton at khirnov.net>
> > Date: Sat, 16 Oct 2010 18:12:46 +0200
> > Subject: [PATCH] metadata: make av_metadata_set2 case insensitive by default.
> 
> maybe this is a good idea ...

I like it too.
And I think it not even useful to filter out flags different from
AV_METADATA_MATCH_CASE, so I applied a simplified version.

Aurel