aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264dsp_internal.h
diff options
context:
space:
mode:
authorOskar Arvidsson <oskar@irock.se>2011-03-29 17:48:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-10 22:33:42 +0200
commit8dbe5856410ee10ac4a9368105149efdacfac994 (patch)
tree6f332567746e6ef0bf33be492911263192153984 /libavcodec/h264dsp_internal.h
parentd268bed209828923b891aeab7979d7ef14a730b2 (diff)
downloadffmpeg-8dbe5856410ee10ac4a9368105149efdacfac994.tar.gz
Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
This patch lets e.g. dsputil_init chose dsp functions with respect to the bit depth to decode. The naming scheme of bit depth dependent functions is <base name>_<bit depth>[_<prefix>] (i.e. the old clear_blocks_c is now named clear_blocks_8_c). Note: Some of the functions for high bit depth is not dependent on the bit depth, but only on the pixel size. This leaves some room for optimizing binary size. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264dsp_internal.h')
-rw-r--r--libavcodec/h264dsp_internal.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/h264dsp_internal.h b/libavcodec/h264dsp_internal.h
index 554ba62ee9..f9a717b8c4 100644
--- a/libavcodec/h264dsp_internal.h
+++ b/libavcodec/h264dsp_internal.h
@@ -25,12 +25,7 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
-#include "dsputil.h"
-
-#define BIT_DEPTH 8
-#define pixel uint8_t
-#define av_clip_pixel av_clip_uint8
-#define FUNCC(a) a ## _c
+#include "h264_high_depth.h"
#define op_scale1(x) block[x] = av_clip_pixel( (block[x]*weight + offset) >> log2_denom )
#define op_scale2(x) dst[x] = av_clip_pixel( (src[x]*weights + dst[x]*weightd + offset) >> (log2_denom+1))