diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 00:10:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 01:19:37 +0200 |
commit | ae57e82469c99538dd14adbe73df663709d71758 (patch) | |
tree | e95a9b84dd242e4ab7cd14350955ba06f5425870 /libavcodec/simple_idct_template.c | |
parent | d2e237338db280ffcdc6ea6f290c58a3b055ba35 (diff) | |
download | ffmpeg-ae57e82469c99538dd14adbe73df663709d71758.tar.gz |
avcodec/dsputil: add 12bit simple idct
Will be needed for jpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/simple_idct_template.c')
-rw-r--r-- | libavcodec/simple_idct_template.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c index dabfbda8a0..ffd75780a8 100644 --- a/libavcodec/simple_idct_template.c +++ b/libavcodec/simple_idct_template.c @@ -62,7 +62,7 @@ #define MUL(a, b) MUL16(a, b) #define MAC(a, b, c) MAC16(a, b, c) -#elif BIT_DEPTH == 10 +#elif BIT_DEPTH == 10 || BIT_DEPTH == 12 #define W1 90901 #define W2 85627 @@ -72,9 +72,15 @@ #define W6 35468 #define W7 18081 +#if BIT_DEPTH == 10 #define ROW_SHIFT 15 #define COL_SHIFT 20 #define DC_SHIFT 1 +#else +#define ROW_SHIFT 17 +#define COL_SHIFT 18 +#define DC_SHIFT -1 +#endif #define MUL(a, b) ((a) * (b)) #define MAC(a, b, c) ((a) += (b) * (c)) |