aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-01 10:26:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-01 10:26:49 +0100
commitfc5fe4804fd2ee9a29de502e9431b12d027c0c89 (patch)
treed7f4d448e386af2964019cfc0eb5efa3698c21cf
parentffe33500983983946048def3a6047920d97d957b (diff)
parented1a11ed52bbd1f15bb9b0416d69b7924bee3191 (diff)
downloadffmpeg-fc5fe4804fd2ee9a29de502e9431b12d027c0c89.tar.gz
Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'
* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191': gradfun: x86: Factor out common code for some gradfun_filter_line() variants Conflicts: libavfilter/x86/vf_gradfun_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/x86/vf_gradfun_init.c31
1 files changed, 14 insertions, 17 deletions
diff --git a/libavfilter/x86/vf_gradfun_init.c b/libavfilter/x86/vf_gradfun_init.c
index c638a05e87..3f5b842fb9 100644
--- a/libavfilter/x86/vf_gradfun_init.c
+++ b/libavfilter/x86/vf_gradfun_init.c
@@ -41,14 +41,13 @@ void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf,
const uint8_t *src1, const uint8_t *src2);
#if HAVE_YASM
-static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src,
- const uint16_t *dc,
- int width, int thresh,
- const uint16_t *dithers)
+static void gradfun_filter_line(uint8_t *dst, uint8_t *src, uint16_t *dc,
+ int width, int thresh, const uint16_t *dithers,
+ int alignment)
{
intptr_t x;
- if (width & 3) {
- x = width & ~3;
+ if (width & alignment) {
+ x = width & ~alignment;
ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2,
width - x, thresh, dithers);
width = x;
@@ -58,21 +57,19 @@ static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src,
thresh, dithers);
}
+static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src,
+ const uint16_t *dc,
+ int width, int thresh,
+ const uint16_t *dithers)
+{
+ gradfun_filter_line(dst, src, dc, width, thresh, dithers, 3);
+}
+
static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const uint16_t *dc,
int width, int thresh,
const uint16_t *dithers)
{
- intptr_t x;
- if (width & 7) {
- // could be 10% faster if I somehow eliminated this
- x = width & ~7;
- ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2,
- width - x, thresh, dithers);
- width = x;
- }
- x = -width;
- ff_gradfun_filter_line_ssse3(x, dst + width, src + width, dc + width / 2,
- thresh, dithers);
+ gradfun_filter_line(dst, src, dc, width, thresh, dithers, 7);
}
static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1,