summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2016-02-02 12:35:28 +0000
committerRostislav Pehlivanov <atomnuker@gmail.com>2016-02-03 17:19:30 +0000
commit3bbe7862ec8136b7325d0929882aa2fffd53044b (patch)
tree8595ddfe36c24836d42599d4c5dc3b4c5601ed0f
parent06278265239fe1aa6ef0f70d5e7db72ea5af844a (diff)
diracdec: move the MAX_DWT_LEVELS macro to dirac.h
Used by the VC-2 encoder. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
-rw-r--r--libavcodec/dirac.h11
-rw-r--r--libavcodec/diracdec.c12
2 files changed, 12 insertions, 11 deletions
diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h
index cb80fdc1bf..e6d9d346d9 100644
--- a/libavcodec/dirac.h
+++ b/libavcodec/dirac.h
@@ -34,6 +34,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:
*
* Dirac Specification ->
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index ca44e7be11..50a35e1543 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -37,21 +37,11 @@
#include "mpegvideoencdsp.h"
#include "dirac_dwt.h"
#include "dirac.h"
+#include "diractab.h"
#include "diracdsp.h"
#include "videodsp.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
-
-/**
* The spec limits this to 3 for frame coding, but in practice can be as high as 6
*/
#define MAX_REFERENCE_FRAMES 8