virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00
Code Issues Releases Activity

blockdsp: drop the high_bit_depth parameter

Browse Source 
It has no effect, since the code is supposed to operate the same way for
any bit depth.
This commit is contained in:
Anton Khirnov 2016-08-08 21:47:20 +02:00
parent 340f12f712
commit eea9857bfd
7 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/blockdsp_arm.h
View File

@ -21,6 +21,6 @@
#include "libavcodec/blockdsp.h" #include "libavcodec/blockdsp.h"
void ff_blockdsp_init_neon(BlockDSPContext *c, unsigned high_bit_depth); void ff_blockdsp_init_neon(BlockDSPContext *c);
#endif /* AVCODEC_ARM_BLOCKDSP_ARM_H */ #endif /* AVCODEC_ARM_BLOCKDSP_ARM_H */

4
libavcodec/arm/blockdsp_init_arm.c
View File

@ -24,10 +24,10 @@
#include "libavcodec/blockdsp.h" #include "libavcodec/blockdsp.h"
#include "blockdsp_arm.h" #include "blockdsp_arm.h"
av_cold void ff_blockdsp_init_arm(BlockDSPContext *c, unsigned high_bit_depth) av_cold void ff_blockdsp_init_arm(BlockDSPContext *c)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (have_neon(cpu_flags)) if (have_neon(cpu_flags))
ff_blockdsp_init_neon(c, high_bit_depth); ff_blockdsp_init_neon(c);
} }

8
libavcodec/arm/blockdsp_init_neon.c
View File

@ -28,10 +28,8 @@
void ff_clear_block_neon(int16_t *block); void ff_clear_block_neon(int16_t *block);
void ff_clear_blocks_neon(int16_t *blocks); void ff_clear_blocks_neon(int16_t *blocks);
av_cold void ff_blockdsp_init_neon(BlockDSPContext *c, unsigned high_bit_depth) av_cold void ff_blockdsp_init_neon(BlockDSPContext *c)
{ {
if (!high_bit_depth) { c->clear_block = ff_clear_block_neon;
c->clear_block = ff_clear_block_neon; c->clear_blocks = ff_clear_blocks_neon;
c->clear_blocks = ff_clear_blocks_neon;
}
} }

10
libavcodec/blockdsp.c
View File

@ -57,8 +57,6 @@ 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) 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_block = clear_block_8_c;
c->clear_blocks = clear_blocks_8_c; c->clear_blocks = clear_blocks_8_c;
@ -66,13 +64,13 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx)
c->fill_block_tab[1] = fill_block8_c; c->fill_block_tab[1] = fill_block8_c;
if (ARCH_ARM) if (ARCH_ARM)
ff_blockdsp_init_arm(c, high_bit_depth); ff_blockdsp_init_arm(c);
if (ARCH_PPC) if (ARCH_PPC)
ff_blockdsp_init_ppc(c, high_bit_depth); ff_blockdsp_init_ppc(c);
if (ARCH_X86) if (ARCH_X86)
#if FF_API_XVMC #if FF_API_XVMC
ff_blockdsp_init_x86(c, high_bit_depth, avctx); ff_blockdsp_init_x86(c, avctx);
#else #else
ff_blockdsp_init_x86(c, high_bit_depth); ff_blockdsp_init_x86(c);
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
} }

8
libavcodec/blockdsp.h
View File

@ -40,13 +40,13 @@ typedef struct BlockDSPContext {
void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx); void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx);
void ff_blockdsp_init_arm(BlockDSPContext *c, unsigned high_bit_depth); void ff_blockdsp_init_arm(BlockDSPContext *c);
void ff_blockdsp_init_ppc(BlockDSPContext *c, unsigned high_bit_depth); void ff_blockdsp_init_ppc(BlockDSPContext *c);
#if FF_API_XVMC #if FF_API_XVMC
void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth, void ff_blockdsp_init_x86(BlockDSPContext *c,
AVCodecContext *avctx); AVCodecContext *avctx);
#else #else
void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth); void ff_blockdsp_init_x86(BlockDSPContext *c);
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
#endif /* AVCODEC_BLOCKDSP_H */ #endif /* AVCODEC_BLOCKDSP_H */

25
libavcodec/ppc/blockdsp.c
View File

@ -143,27 +143,24 @@ static void clear_block_altivec(int16_t *block)
} }
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
av_cold void ff_blockdsp_init_ppc(BlockDSPContext *c, unsigned high_bit_depth) av_cold void ff_blockdsp_init_ppc(BlockDSPContext *c)
{ {
// common optimizations whether AltiVec is available or not // common optimizations whether AltiVec is available or not
if (!high_bit_depth) { switch (check_dcbzl_effect()) {
switch (check_dcbzl_effect()) { case 32:
case 32: c->clear_blocks = clear_blocks_dcbz32_ppc;
c->clear_blocks = clear_blocks_dcbz32_ppc; break;
break; case 128:
case 128: c->clear_blocks = clear_blocks_dcbz128_ppc;
c->clear_blocks = clear_blocks_dcbz128_ppc; break;
break; default:
default: break;
break;
}
} }
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
if (!PPC_ALTIVEC(av_get_cpu_flags())) if (!PPC_ALTIVEC(av_get_cpu_flags()))
return; return;
if (!high_bit_depth) c->clear_block = clear_block_altivec;
c->clear_block = clear_block_altivec;
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
} }

20
libavcodec/x86/blockdsp.c
View File

@ -88,20 +88,19 @@ static void clear_blocks_sse(int16_t *blocks)
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
#if FF_API_XVMC #if FF_API_XVMC
av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth, av_cold void ff_blockdsp_init_x86(BlockDSPContext *c,
AVCodecContext *avctx) AVCodecContext *avctx)
#else #else
av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth) av_cold void ff_blockdsp_init_x86(BlockDSPContext *c)
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
{ {
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (!high_bit_depth) { if (INLINE_MMX(cpu_flags)) {
if (INLINE_MMX(cpu_flags)) { c->clear_block = clear_block_mmx;
c->clear_block = clear_block_mmx; c->clear_blocks = clear_blocks_mmx;
c->clear_blocks = clear_blocks_mmx; }
}
#if FF_API_XVMC #if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
@ -111,10 +110,9 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
if (INLINE_SSE(cpu_flags)) { if (INLINE_SSE(cpu_flags)) {
c->clear_block = clear_block_sse; c->clear_block = clear_block_sse;
c->clear_blocks = clear_blocks_sse; c->clear_blocks = clear_blocks_sse;
}
} }
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
} }