summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264pred_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/h264pred_internal.h
parentd268bed209828923b891aeab7979d7ef14a730b2 (diff)
downloadffmpeg-streaming-8dbe5856410ee10ac4a9368105149efdacfac994.zip
ffmpeg-streaming-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/h264pred_internal.h')
-rw-r--r--libavcodec/h264pred_internal.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/libavcodec/h264pred_internal.h b/libavcodec/h264pred_internal.h
index a433bce..a51be6c 100644
--- a/libavcodec/h264pred_internal.h
+++ b/libavcodec/h264pred_internal.h
@@ -26,21 +26,7 @@
*/
#include "mathops.h"
-#include "dsputil.h"
-
-#define BIT_DEPTH 8
-
-#define pixel uint8_t
-#define pixel4 uint32_t
-#define dctcoef DCTELEM
-
-#define INIT_CLIP uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
-#define CLIP(a) cm[a]
-#define FUNC(a) a
-#define FUNCC(a) a ## _c
-#define PIXEL_SPLAT_X4(x) ((x)*0x01010101U)
-#define AV_WN4P AV_WN32
-#define AV_WN4PA AV_WN32A
+#include "h264_high_depth.h"
static void FUNCC(pred4x4_vertical)(uint8_t *p_src, const uint8_t *topright, int p_stride){
pixel *src = (pixel*)p_src;
OpenPOWER on IntegriCloud