RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-11-01 10:26:49 +01:00
parent ffe3350098 ed1a11ed52
commit fc5fe4804f
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavfilter/x86/vf_gradfun_init.c
View File

@ -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); const uint8_t *src1, const uint8_t *src2);
#if HAVE_YASM #if HAVE_YASM
static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src, static void gradfun_filter_line(uint8_t *dst, uint8_t *src, uint16_t *dc,
const uint16_t *dc, int width, int thresh, const uint16_t *dithers,
int width, int thresh, int alignment)
const uint16_t *dithers)
{ {
intptr_t x; intptr_t x;
if (width & 3) { if (width & alignment) {
x = width & ~3; x = width & ~alignment;
ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2, ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2,
width - x, thresh, dithers); width - x, thresh, dithers);
width = x; width = x;
@ -58,21 +57,19 @@ static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src,
thresh, dithers); 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, static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const uint16_t *dc,
int width, int thresh, int width, int thresh,
const uint16_t *dithers) const uint16_t *dithers)
{ {
intptr_t x; gradfun_filter_line(dst, src, dc, width, thresh, dithers, 7);
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);
} }
static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1, static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1,