vorbiscomment: convert metadata before computing the header's length

[ffmpeg] / libavformat / id3v2.h

diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h
index 6d62f11f3be8a2ecb7c29de39994343d24a7a2ca..48373bb3f90e5cc2a1703108751406dbf33c60b8 100644 (file)
--- a/libavformat/id3v2.h
+++ b/libavformat/id3v2.h
@@ -23,20 +23,48 @@
 #define AVFORMAT_ID3V2_H
 
 #include <stdint.h>
+#include "avformat.h"
+#include "metadata.h"
 
 #define ID3v2_HEADER_SIZE 10
 
 /**
- * Detects ID3v2 Header.
- * @buf must be ID3v2_HEADER_SIZE byte long
+ * Default magic bytes for ID3v2 header: "ID3"
  */
-int ff_id3v2_match(const uint8_t *buf);
+#define ID3v2_DEFAULT_MAGIC "ID3"
 
 /**
- * Gets the length of an ID3v2 tag.
- * @buf must be ID3v2_HEADER_SIZE bytes long and point to the start of an
+ * Detect ID3v2 Header.
+ * @param buf   must be ID3v2_HEADER_SIZE byte long
+ * @param magic magic bytes to identify the header, machine byte order.
+ * If in doubt, use ID3v2_DEFAULT_MAGIC.
+ */
+int ff_id3v2_match(const uint8_t *buf, const char *magic);
+
+/**
+ * Get the length of an ID3v2 tag.
+ * @param buf must be ID3v2_HEADER_SIZE bytes long and point to the start of an
  * already detected ID3v2 tag
  */
 int ff_id3v2_tag_len(const uint8_t *buf);
 
+/**
+ * ID3v2 parser
+ * Handles ID3v2.2, 2.3 and 2.4.
+ */
+void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags);
+
+/**
+ * Read an ID3v2 tag
+ */
+void ff_id3v2_read(AVFormatContext *s, const char *magic);
+
+extern const AVMetadataConv ff_id3v2_metadata_conv[];
+
+/**
+ * A list of ID3v2.4 text information frames.
+ * http://www.id3.org/id3v2.4.0-frames
+ */
+extern const char ff_id3v2_tags[][4];
+
 #endif /* AVFORMAT_ID3V2_H */