Used by the VC-2 encoder. Signed-off-by: Rostislav Pehlivanov <atomnu...@gmail.com> --- libavcodec/dirac.h | 11 +++++++++++ libavcodec/diracdec.c | 12 +----------- 2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h index cb80fdc..e6d9d34 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 0312dde..de7daf3 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 -- 2.7.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
