Set channel layout for 4 and 5.1 channel cdata audio files

[ffmpeg] / libavformat / id3v2.h

diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h
index 70030d297f820c2ee814c0efded1df0e0076ac28..e429001385c3caaefe447b0694fde7b370ec17d1 100644 (file)
--- a/libavformat/id3v2.h
+++ b/libavformat/id3v2.h
@@ -29,35 +29,61 @@
 #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"
+
+#define ID3v2_FLAG_DATALEN     0x0001
+#define ID3v2_FLAG_UNSYNCH     0x0002
+#define ID3v2_FLAG_ENCRYPTION  0x0004
+#define ID3v2_FLAG_COMPRESSION 0x0008
+
+enum ID3v2Encoding {
+    ID3v2_ENCODING_ISO8859  = 0,
+    ID3v2_ENCODING_UTF16BOM = 1,
+    ID3v2_ENCODING_UTF16BE  = 2,
+    ID3v2_ENCODING_UTF8     = 3,
+};
 
 /**
- * Gets the length of an ID3v2 tag.
- * @buf must be ID3v2_HEADER_SIZE bytes long and point to the start of an
- * already detected ID3v2 tag
+ * 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_tag_len(const uint8_t *buf);
+int ff_id3v2_match(const uint8_t *buf, const char *magic);
 
 /**
- * ID3v2 parser
- * Handles ID3v2.2, 2.3 and 2.4.
+ * 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
  */
-void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags);
+int ff_id3v2_tag_len(const uint8_t *buf);
 
 /**
  * Read an ID3v2 tag
  */
-void ff_id3v2_read(AVFormatContext *s);
+void ff_id3v2_read(AVFormatContext *s, const char *magic);
 
-extern const AVMetadataConv ff_id3v2_metadata_conv[];
+extern const AVMetadataConv ff_id3v2_34_metadata_conv[];
+extern const AVMetadataConv ff_id3v2_4_metadata_conv[];
+extern const AVMetadataConv ff_id3v2_2_metadata_conv[];
 
 /**
- * A list of ID3v2.4 text information frames.
+ * A list of text information frames allowed in both ID3 v2.3 and v2.4
  * http://www.id3.org/id3v2.4.0-frames
+ * http://www.id3.org/id3v2.4.0-changes
  */
 extern const char ff_id3v2_tags[][4];
 
+/**
+ * ID3v2.4-only text information frames.
+ */
+extern const char ff_id3v2_4_tags[][4];
+
+/**
+ * ID3v2.3-only text information frames.
+ */
+extern const char ff_id3v2_3_tags[][4];
+
 #endif /* AVFORMAT_ID3V2_H */