diff options
Diffstat (limited to 'apps/codecs/libwmapro/dsputil.c')
-rw-r--r-- | apps/codecs/libwmapro/dsputil.c | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/apps/codecs/libwmapro/dsputil.c b/apps/codecs/libwmapro/dsputil.c index bbfdb6ae8d..b09311925a 100644 --- a/apps/codecs/libwmapro/dsputil.c +++ b/apps/codecs/libwmapro/dsputil.c | |||
@@ -29,17 +29,18 @@ | |||
29 | 29 | ||
30 | #include "avcodec.h" | 30 | #include "avcodec.h" |
31 | #include "dsputil.h" | 31 | #include "dsputil.h" |
32 | #include "simple_idct.h" | 32 | //#include "simple_idct.h" |
33 | #include "faandct.h" | 33 | //#include "faandct.h" |
34 | #include "faanidct.h" | 34 | //#include "faanidct.h" |
35 | #include "mathops.h" | 35 | #include "mathops.h" |
36 | #include "mpegvideo.h" | 36 | //#include "mpegvideo.h" |
37 | #include "config.h" | 37 | //#include "config.h" |
38 | #include "lpc.h" | 38 | //#include "lpc.h" |
39 | #include "ac3dec.h" | 39 | //#include "ac3dec.h" |
40 | #include "vorbis.h" | 40 | //#include "vorbis.h" |
41 | #include "png.h" | 41 | //#include "png.h" |
42 | 42 | ||
43 | #if 0 | ||
43 | uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP] = {0, }; | 44 | uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP] = {0, }; |
44 | uint32_t ff_squareTbl[512] = {0, }; | 45 | uint32_t ff_squareTbl[512] = {0, }; |
45 | 46 | ||
@@ -3797,6 +3798,8 @@ WRAPPER8_16_SQ(quant_psnr8x8_c, quant_psnr16_c) | |||
3797 | WRAPPER8_16_SQ(rd8x8_c, rd16_c) | 3798 | WRAPPER8_16_SQ(rd8x8_c, rd16_c) |
3798 | WRAPPER8_16_SQ(bit8x8_c, bit16_c) | 3799 | WRAPPER8_16_SQ(bit8x8_c, bit16_c) |
3799 | 3800 | ||
3801 | #endif /* 0 */ | ||
3802 | |||
3800 | static void vector_fmul_c(float *dst, const float *src, int len){ | 3803 | static void vector_fmul_c(float *dst, const float *src, int len){ |
3801 | int i; | 3804 | int i; |
3802 | for(i=0; i<len; i++) | 3805 | for(i=0; i<len; i++) |
@@ -3838,7 +3841,7 @@ static void vector_fmul_scalar_c(float *dst, const float *src, float mul, | |||
3838 | for (i = 0; i < len; i++) | 3841 | for (i = 0; i < len; i++) |
3839 | dst[i] = src[i] * mul; | 3842 | dst[i] = src[i] * mul; |
3840 | } | 3843 | } |
3841 | 3844 | #if 0 | |
3842 | static void vector_fmul_sv_scalar_2_c(float *dst, const float *src, | 3845 | static void vector_fmul_sv_scalar_2_c(float *dst, const float *src, |
3843 | const float **sv, float mul, int len) | 3846 | const float **sv, float mul, int len) |
3844 | { | 3847 | { |
@@ -3911,6 +3914,7 @@ static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, | |||
3911 | dst[i] = src[i] * mul; | 3914 | dst[i] = src[i] * mul; |
3912 | } | 3915 | } |
3913 | 3916 | ||
3917 | |||
3914 | static inline uint32_t clipf_c_one(uint32_t a, uint32_t mini, | 3918 | static inline uint32_t clipf_c_one(uint32_t a, uint32_t mini, |
3915 | uint32_t maxi, uint32_t maxisign) | 3919 | uint32_t maxi, uint32_t maxisign) |
3916 | { | 3920 | { |
@@ -4176,9 +4180,10 @@ int ff_check_alignment(void){ | |||
4176 | } | 4180 | } |
4177 | return 0; | 4181 | return 0; |
4178 | } | 4182 | } |
4179 | 4183 | #endif | |
4180 | av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) | 4184 | av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) |
4181 | { | 4185 | { |
4186 | #if 0 | ||
4182 | int i; | 4187 | int i; |
4183 | 4188 | ||
4184 | ff_check_alignment(); | 4189 | ff_check_alignment(); |
@@ -4486,20 +4491,22 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) | |||
4486 | #if CONFIG_LPC | 4491 | #if CONFIG_LPC |
4487 | c->lpc_compute_autocorr = ff_lpc_compute_autocorr; | 4492 | c->lpc_compute_autocorr = ff_lpc_compute_autocorr; |
4488 | #endif | 4493 | #endif |
4494 | |||
4495 | #endif /* 0 */ | ||
4489 | c->vector_fmul = vector_fmul_c; | 4496 | c->vector_fmul = vector_fmul_c; |
4490 | c->vector_fmul_reverse = vector_fmul_reverse_c; | 4497 | c->vector_fmul_reverse = vector_fmul_reverse_c; |
4491 | c->vector_fmul_add = vector_fmul_add_c; | 4498 | c->vector_fmul_add = vector_fmul_add_c; |
4492 | c->vector_fmul_window = ff_vector_fmul_window_c; | 4499 | c->vector_fmul_window = ff_vector_fmul_window_c; |
4493 | c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c; | 4500 | //c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c; |
4494 | c->vector_clipf = vector_clipf_c; | 4501 | //c->vector_clipf = vector_clipf_c; |
4495 | c->float_to_int16 = ff_float_to_int16_c; | 4502 | //c->float_to_int16 = ff_float_to_int16_c; |
4496 | c->float_to_int16_interleave = ff_float_to_int16_interleave_c; | 4503 | //c->float_to_int16_interleave = ff_float_to_int16_interleave_c; |
4497 | c->scalarproduct_int16 = scalarproduct_int16_c; | 4504 | //c->scalarproduct_int16 = scalarproduct_int16_c; |
4498 | c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c; | 4505 | //c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c; |
4499 | c->scalarproduct_float = scalarproduct_float_c; | 4506 | //c->scalarproduct_float = scalarproduct_float_c; |
4500 | c->butterflies_float = butterflies_float_c; | 4507 | //c->butterflies_float = butterflies_float_c; |
4501 | c->vector_fmul_scalar = vector_fmul_scalar_c; | 4508 | c->vector_fmul_scalar = vector_fmul_scalar_c; |
4502 | 4509 | #if 0 | |
4503 | c->vector_fmul_sv_scalar[0] = vector_fmul_sv_scalar_2_c; | 4510 | c->vector_fmul_sv_scalar[0] = vector_fmul_sv_scalar_2_c; |
4504 | c->vector_fmul_sv_scalar[1] = vector_fmul_sv_scalar_4_c; | 4511 | c->vector_fmul_sv_scalar[1] = vector_fmul_sv_scalar_4_c; |
4505 | 4512 | ||
@@ -4561,5 +4568,5 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) | |||
4561 | default: | 4568 | default: |
4562 | av_log(avctx, AV_LOG_ERROR, "Internal error, IDCT permutation not set\n"); | 4569 | av_log(avctx, AV_LOG_ERROR, "Internal error, IDCT permutation not set\n"); |
4563 | } | 4570 | } |
4571 | #endif /* 0 */ | ||
4564 | } | 4572 | } |
4565 | |||