summaryrefslogtreecommitdiff
path: root/libavcodec/blockdsp.c
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2015-09-28 13:59:23 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-10-02 04:38:40 +0200
commit562ba4a827ceb9ed5b7d056484a9c2312a5458c5 (patch)
tree756de8e3459acfdf786f1f5343b5346757c8c491 /libavcodec/blockdsp.c
parentacdd6725065b4b71723a2c40c0fca9d69b8780cf (diff)
downloadffmpeg-562ba4a827ceb9ed5b7d056484a9c2312a5458c5.tar.gz
blockdsp: remove high bitdepth parameter
It is only (mis-)used to set the dsp fucntions clear_block(s). But these functions always work on 16bits-wide elements, which make the parameter useless and actually harmful, as it causes all content on more than 8-bits to not use accelerated functions. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/blockdsp.c')
-rw-r--r--libavcodec/blockdsp.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c
index 42e177bae6..a5c527a4da 100644
--- a/libavcodec/blockdsp.c
+++ b/libavcodec/blockdsp.c
@@ -25,12 +25,12 @@
#include "blockdsp.h"
#include "version.h"
-static void clear_block_8_c(int16_t *block)
+static void clear_block_c(int16_t *block)
{
memset(block, 0, sizeof(int16_t) * 64);
}
-static void clear_blocks_8_c(int16_t *blocks)
+static void clear_blocks_c(int16_t *blocks)
{
memset(blocks, 0, sizeof(int16_t) * 6 * 64);
}
@@ -57,22 +57,20 @@ static void fill_block8_c(uint8_t *block, uint8_t value, int line_size, int h)
av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx)
{
- const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
-
- c->clear_block = clear_block_8_c;
- c->clear_blocks = clear_blocks_8_c;
+ c->clear_block = clear_block_c;
+ c->clear_blocks = clear_blocks_c;
c->fill_block_tab[0] = fill_block16_c;
c->fill_block_tab[1] = fill_block8_c;
if (ARCH_ALPHA)
- ff_blockdsp_init_alpha(c, high_bit_depth);
+ ff_blockdsp_init_alpha(c);
if (ARCH_ARM)
- ff_blockdsp_init_arm(c, high_bit_depth);
+ ff_blockdsp_init_arm(c);
if (ARCH_PPC)
- ff_blockdsp_init_ppc(c, high_bit_depth);
+ ff_blockdsp_init_ppc(c);
if (ARCH_X86)
- ff_blockdsp_init_x86(c, high_bit_depth, avctx);
+ ff_blockdsp_init_x86(c, avctx);
if (ARCH_MIPS)
- ff_blockdsp_init_mips(c, high_bit_depth);
+ ff_blockdsp_init_mips(c);
}