diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-21 18:02:30 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-22 18:41:36 -0800 |
| commit | 32ff6432284f713e9f837ee5b36fc8e9f1902836 (patch) | |
| tree | 612a73740e0ed4da651107523ddd2f5f63909efc /libavcodec/x86 | |
| parent | 88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f (diff) | |
| download | ffmpeg-32ff6432284f713e9f837ee5b36fc8e9f1902836.tar.gz | |
dsputil: remove avg_no_rnd_pixels8.
This is never used.
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 3 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_rnd_template.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 8866813a5b..e4686212d1 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -160,6 +160,7 @@ DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 }; /***********************************/ /* MMX no rounding */ +#define NO_RND 1 #define DEF(x, y) x ## _no_rnd_ ## y ## _mmx #define SET_RND MOVQ_WONE #define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX_NO_RND(a, b, c, d, e, f) @@ -172,6 +173,7 @@ DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 }; #undef SET_RND #undef PAVGBP #undef PAVGB +#undef NO_RND /***********************************/ /* MMX rounding */ @@ -1917,7 +1919,6 @@ static void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, int mm_flags) SET_HPEL_FUNCS(put, 1, 8, mmx); SET_HPEL_FUNCS(put_no_rnd, 1, 8, mmx); SET_HPEL_FUNCS(avg, 1, 8, mmx); - SET_HPEL_FUNCS(avg_no_rnd, 1, 8, mmx); switch (avctx->idct_algo) { case FF_IDCT_AUTO: diff --git a/libavcodec/x86/dsputil_rnd_template.c b/libavcodec/x86/dsputil_rnd_template.c index 34a2c0bca8..7fcc6b7533 100644 --- a/libavcodec/x86/dsputil_rnd_template.c +++ b/libavcodec/x86/dsputil_rnd_template.c @@ -317,6 +317,7 @@ static void av_unused DEF(avg, pixels4)(uint8_t *block, const uint8_t *pixels, i while (--h); } +#ifndef NO_RND // in case more speed is needed - unroling would certainly help static void DEF(avg, pixels8)(uint8_t *block, const uint8_t *pixels, int line_size, int h) { @@ -336,6 +337,7 @@ static void DEF(avg, pixels8)(uint8_t *block, const uint8_t *pixels, int line_si } while (--h); } +#endif // NO_RND static void DEF(avg, pixels16)(uint8_t *block, const uint8_t *pixels, int line_size, int h) { @@ -360,6 +362,7 @@ static void DEF(avg, pixels16)(uint8_t *block, const uint8_t *pixels, int line_s while (--h); } +#ifndef NO_RND static void DEF(avg, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h) { MOVQ_BFE(mm6); @@ -379,6 +382,7 @@ static void DEF(avg, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line block += line_size; } while (--h); } +#endif // NO_RND static av_unused void DEF(avg, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h) { |