Ticket #3836: fflag_nometaconv.patch

File fflag_nometaconv.patch, 6.1 KB (added by Mohammad AlSaleh, 12 years ago)
  • libavformat/asfdec.c

     libavformat/asfdec.c         |  3 ++-
     libavformat/avformat.h       |  1 +
     libavformat/id3v2.c          | 16 +++++++++++-----
     libavformat/matroskadec.c    |  4 +++-
     libavformat/metadata.c       |  4 ++++
     libavformat/oggparsevorbis.c |  3 ++-
     libavformat/options_table.h  |  1 +
     libavformat/wtvdec.c         |  3 ++-
     8 files changed, 26 insertions(+), 9 deletions(-)
    
    diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
    index 978b956..e80e1d3 100644
    a b static int asf_read_header(AVFormatContext *s)  
    862862        }
    863863    }
    864864
    865     ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
     865    if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) )
     866        ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
    866867
    867868    return 0;
    868869}
  • libavformat/avformat.h

    diff --git a/libavformat/avformat.h b/libavformat/avformat.h
    index 7551f7b..5b908e4 100644
    a b typedef struct AVFormatContext {  
    12941294#define AVFMT_FLAG_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
    12951295#define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
    12961296#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
     1297#define AVFMT_FLAG_NO_META_CONV 0x80000 ///< Don't convert metadata field names.
    12971298
    12981299    /**
    12991300     * @deprecated deprecated in favor of probesize2
  • libavformat/id3v2.c

    diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
    index fb89e83..5a3aab7 100644
    a b static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *tta  
    574574        len -= taglen;
    575575    }
    576576
    577     ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_34_metadata_conv);
    578     ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_4_metadata_conv);
     577    if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) ) {
     578        ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_34_metadata_conv);
     579        ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_4_metadata_conv);
     580    }
    579581end:
    580582    av_free(dst);
    581583}
    … … static void id3v2_read_internal(AVIOContext *pb, AVDictionary **metadata,  
    916918            avio_seek(pb, off, SEEK_SET);
    917919        }
    918920    } while (found_header);
    919     ff_metadata_conv(metadata, NULL, ff_id3v2_34_metadata_conv);
    920     ff_metadata_conv(metadata, NULL, id3v2_2_metadata_conv);
    921     ff_metadata_conv(metadata, NULL, ff_id3v2_4_metadata_conv);
     921
     922    if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) ) {
     923        ff_metadata_conv(metadata, NULL, ff_id3v2_34_metadata_conv);
     924        ff_metadata_conv(metadata, NULL, id3v2_2_metadata_conv);
     925        ff_metadata_conv(metadata, NULL, ff_id3v2_4_metadata_conv);
     926    }
     927
    922928    merge_date(metadata);
    923929}
    924930
  • libavformat/matroskadec.c

    diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
    index 50b75e7..72655f0 100644
    a b static void matroska_convert_tag(AVFormatContext *s, EbmlList *list,  
    13771377                matroska_convert_tag(s, &tags[i].sub, metadata, key);
    13781378        }
    13791379    }
    1380     ff_metadata_conv(metadata, NULL, ff_mkv_metadata_conv);
     1380
     1381    if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) )
     1382        ff_metadata_conv(metadata, NULL, ff_mkv_metadata_conv);
    13811383}
    13821384
    13831385static void matroska_convert_tags(AVFormatContext *s)
  • libavformat/metadata.c

    diff --git a/libavformat/metadata.c b/libavformat/metadata.c
    index b9b6de7..a9f68cd 100644
    a b void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,  
    6060                                                const AVMetadataConv *s_conv)
    6161{
    6262    int i;
     63
     64    if ( !(ctx->flags & AVFMT_FLAG_NO_META_CONV) )
     65        return;
     66
    6367    ff_metadata_conv(&ctx->metadata, d_conv, s_conv);
    6468    for (i=0; i<ctx->nb_streams ; i++)
    6569        ff_metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
  • libavformat/oggparsevorbis.c

    diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
    index 8103d9d..1ad23b0 100644
    a b int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,  
    176176        av_log(as, AV_LOG_INFO,
    177177               "truncated comment header, %i comments not found\n", n);
    178178
    179     ff_metadata_conv(m, NULL, ff_vorbiscomment_metadata_conv);
     179    if ( !(as->flags & AVFMT_FLAG_NO_META_CONV) )
     180        ff_metadata_conv(m, NULL, ff_vorbiscomment_metadata_conv);
    180181
    181182    return 0;
    182183}
  • libavformat/options_table.h

    diff --git a/libavformat/options_table.h b/libavformat/options_table.h
    index 94cd65c..2b44fee 100644
    a b static const AVOption avformat_options[] = {  
    4646{"nofillin", "do not fill in missing values that can be exactly calculated", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOFILLIN }, INT_MIN, INT_MAX, D, "fflags"},
    4747{"noparse", "disable AVParsers, this needs nofillin too", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOPARSE }, INT_MIN, INT_MAX, D, "fflags"},
    4848{"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"},
     49{"nometaconv", "skip conversion of metadata field names", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NO_META_CONV }, INT_MIN, INT_MAX, D, "fflags"},
    4950{"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"},
    5051{"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"},
    5152{"keepside", "don't merge side data", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"},
  • libavformat/wtvdec.c

    diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
    index cfdc555..1ceecd5 100644
    a b static void parse_legacy_attrib(AVFormatContext *s, AVIOContext *pb)  
    549549        get_tag(s, pb, key, type, length);
    550550    }
    551551
    552     ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
     552    if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) )
     553        ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
    553554}
    554555
    555556/**