avcodec/h264_slice: Fix dequant table init with field pictures

[ffmpeg] / libavcodec / dirac.h

diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h
index 8d7953d9b4c58ea59858d03212f403ded793e542..e6d9d346d9cc13c23092f5e1f4501d20157e1def 100644 (file)
--- a/libavcodec/dirac.h
+++ b/libavcodec/dirac.h
@@ -33,6 +33,17 @@
 
 #include "avcodec.h"
 
+/**
+ * The spec limits the number of wavelet decompositions to 4 for both
+ * level 1 (VC-2) and 128 (long-gop default).
+ * 5 decompositions is the maximum before >16-bit buffers are needed.
+ * Schroedinger allows this for DD 9,7 and 13,7 wavelets only, limiting
+ * the others to 4 decompositions (or 3 for the fidelity filter).
+ *
+ * We use this instead of MAX_DECOMPOSITIONS to save some memory.
+ */
+#define MAX_DWT_LEVELS 5
+
 /**
  * Parse code values:
  *
@@ -52,6 +63,13 @@ enum DiracParseCodes {
     DIRAC_PCODE_PICTURE_RAW     = 0x48,
     DIRAC_PCODE_PICTURE_LOW_DEL = 0xC8,
     DIRAC_PCODE_PICTURE_HQ      = 0xE8,
+    DIRAC_PCODE_INTER_NOREF_CO1 = 0x0A,
+    DIRAC_PCODE_INTER_NOREF_CO2 = 0x09,
+    DIRAC_PCODE_INTER_REF_CO1   = 0x0D,
+    DIRAC_PCODE_INTER_REF_CO2   = 0x0E,
+    DIRAC_PCODE_INTRA_REF_CO    = 0x0C,
+    DIRAC_PCODE_INTRA_REF_RAW   = 0x4C,
+    DIRAC_PCODE_INTRA_REF_PICT  = 0xCC,
     DIRAC_PCODE_MAGIC           = 0x42424344,
 };