Browse Source

Add id3v2 metadata conversion table and use it in mp3 muxer.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20073 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Anton Khirnov Carl Eugen Hoyos 16 years ago
parent
commit
6378b06208
3 changed files with 23 additions and 0 deletions
  1. +19
    -0
      libavformat/id3v2.c
  2. +3
    -0
      libavformat/id3v2.h
  3. +1
    -0
      libavformat/mp3.c

+ 19
- 0
libavformat/id3v2.c View File

@@ -242,3 +242,22 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
url_fskip(s->pb, len);
}

const AVMetadataConv ff_id3v2_metadata_conv[] = {
{ "TALB", "album"},
{ "TCOM", "composer"},
{ "TCON", "genre"},
{ "TCOP", "copyright"},
{ "TDRL", "date"},
{ "TENC", "encoder"},
{ "TIT2", "title"},
{ "TLAN", "language"},
{ "TPE1", "author"},
{ "TPOS", "disc"},
{ "TPUB", "publisher"},
{ "TRCK", "track"},
{ "TSOA", "albumsort"},
{ "TSOP", "authorsort"},
{ "TSOT", "titlesort"},
{ 0 }
};

+ 3
- 0
libavformat/id3v2.h View File

@@ -24,6 +24,7 @@

#include <stdint.h>
#include "avformat.h"
#include "metadata.h"

#define ID3v2_HEADER_SIZE 10

@@ -51,4 +52,6 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
*/
void ff_id3v2_read(AVFormatContext *s);

extern const AVMetadataConv ff_id3v2_metadata_conv[];

#endif /* AVFORMAT_ID3V2_H */

+ 1
- 0
libavformat/mp3.c View File

@@ -341,5 +341,6 @@ AVOutputFormat mp3_muxer = {
mp3_write_header,
mp3_write_packet,
mp3_write_trailer,
.metadata_conv = ff_id3v2_metadata_conv,
};
#endif

Loading…
Cancel
Save