Merge commit '0cef06df073934ca08d0357fcbbbcf2bc9b2a0cd'

[ffmpeg] / libavcodec / dirac.h

diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h
index b0f955bf466e5b9b39f8fc28698589006b959a39..b4982f89ce521acb85f8aa3d451f88b9dfeaafa7 100644 (file)
--- a/libavcodec/dirac.h
+++ b/libavcodec/dirac.h
@@ -34,6 +34,33 @@
 #include "avcodec.h"
 #include "get_bits.h"
 
+/**
+ * Parse code values:
+ *
+ * Dirac Specification ->
+ * 9.6.1  Table 9.1
+ *
+ * VC-2 Specification  ->
+ * 10.4.1 Table 10.1
+ */
+
+enum DiracParseCodes {
+    DIRAC_PCODE_SEQ_HEADER      = 0x00,
+    DIRAC_PCODE_END_SEQ         = 0x10,
+    DIRAC_PCODE_AUX             = 0x20,
+    DIRAC_PCODE_PAD             = 0x30,
+    DIRAC_PCODE_PICTURE_CODED   = 0x08,
+    DIRAC_PCODE_PICTURE_RAW     = 0x48,
+    DIRAC_PCODE_PICTURE_LOW_DEL = 0xC8,
+    DIRAC_PCODE_PICTURE_HQ      = 0xE8,
+    DIRAC_PCODE_MAGIC           = 0x42424344,
+};
+
+typedef struct DiracVersionInfo {
+    int major;
+    int minor;
+} DiracVersionInfo;
+
 typedef struct dirac_source_params {
     unsigned width;
     unsigned height;
@@ -55,6 +82,8 @@ typedef struct dirac_source_params {
 } dirac_source_params;
 
 int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
-                                       dirac_source_params *source);
+                                       dirac_source_params *source,
+                                       DiracVersionInfo *version,
+                                       int *bit_depth);
 
 #endif /* AVCODEC_DIRAC_H */