virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avfilter: x86: K&R formatting cosmetics

Browse Source
This commit is contained in:
Diego Biurrun 2013-10-23 14:51:23 +02:00
parent c7f25d4c7f
commit ee80cf741a
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libavfilter/x86/vf_gradfun_init.c
View File

@ -26,10 +26,22 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavfilter/gradfun.h" #include "libavfilter/gradfun.h"
#if HAVE_YASM
void ff_gradfun_filter_line_mmxext(intptr_t x, uint8_t *dst, uint8_t *src, void ff_gradfun_filter_line_mmxext(intptr_t x, uint8_t *dst, uint8_t *src,
uint16_t *dc, int thresh, uint16_t *dc, int thresh,
const uint16_t *dithers); const uint16_t *dithers);
void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, uint8_t *src,
uint16_t *dc, int thresh,
const uint16_t *dithers);
void ff_gradfun_blur_line_movdqa_sse2(intptr_t x, uint16_t *buf,
uint16_t *buf1, uint16_t *dc,
uint8_t *src1, uint8_t *src2);
void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf,
uint16_t *buf1, uint16_t *dc,
uint8_t *src1, uint8_t *src2);
#if HAVE_YASM
static void gradfun_filter_line_mmxext(uint8_t *dst, uint8_t *src, uint16_t *dc, static void gradfun_filter_line_mmxext(uint8_t *dst, uint8_t *src, uint16_t *dc,
int width, int thresh, int width, int thresh,
const uint16_t *dithers) const uint16_t *dithers)
@ -37,45 +49,44 @@ static void gradfun_filter_line_mmxext(uint8_t *dst, uint8_t *src, uint16_t *dc,
intptr_t x; intptr_t x;
if (width & 3) { if (width & 3) {
x = width & ~3; x = width & ~3;
ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2, width - x, thresh, dithers); ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2,
width - x, thresh, dithers);
width = x; width = x;
} }
x = -width; x = -width;
ff_gradfun_filter_line_mmxext(x, dst + width, src + width, dc + width/2, ff_gradfun_filter_line_mmxext(x, dst + width, src + width, dc + width / 2,
thresh, dithers); thresh, dithers);
} }
void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, uint8_t *src, static void gradfun_filter_line_ssse3(uint8_t *dst, uint8_t *src, uint16_t *dc,
uint16_t *dc, int thresh, int width, int thresh,
const uint16_t *dithers); const uint16_t *dithers)
static void gradfun_filter_line_ssse3(uint8_t *dst, uint8_t *src, uint16_t *dc, int width, int thresh, const uint16_t *dithers)
{ {
intptr_t x; intptr_t x;
if (width & 7) { if (width & 7) {
// could be 10% faster if I somehow eliminated this // could be 10% faster if I somehow eliminated this
x = width & ~7; x = width & ~7;
ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2, width - x, thresh, dithers); ff_gradfun_filter_line_c(dst + x, src + x, dc + x / 2,
width - x, thresh, dithers);
width = x; width = x;
} }
x = -width; x = -width;
ff_gradfun_filter_line_ssse3(x, dst + width, src + width, dc + width/2, ff_gradfun_filter_line_ssse3(x, dst + width, src + width, dc + width / 2,
thresh, dithers); thresh, dithers);
} }
void ff_gradfun_blur_line_movdqa_sse2(intptr_t x, uint16_t *buf, uint16_t *buf1, uint16_t *dc, uint8_t *src1, uint8_t *src2); static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1,
void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf, uint16_t *buf1, uint16_t *dc, uint8_t *src1, uint8_t *src2); uint8_t *src, int src_linesize, int width)
static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1, uint8_t *src, int src_linesize, int width)
{ {
intptr_t x = -2*width; intptr_t x = -2 * width;
if (((intptr_t) src | src_linesize) & 15) { if (((intptr_t) src | src_linesize) & 15)
ff_gradfun_blur_line_movdqu_sse2(x, buf + width, buf1 + width, ff_gradfun_blur_line_movdqu_sse2(x, buf + width, buf1 + width,
dc + width, src + width * 2, dc + width, src + width * 2,
src + width * 2 + src_linesize); src + width * 2 + src_linesize);
} else { else
ff_gradfun_blur_line_movdqa_sse2(x, buf + width, buf1 + width, ff_gradfun_blur_line_movdqa_sse2(x, buf + width, buf1 + width,
dc + width, src + width * 2, dc + width, src + width * 2,
src + width * 2 + src_linesize); src + width * 2 + src_linesize);
}
} }
#endif /* HAVE_YASM */ #endif /* HAVE_YASM */

22
libavfilter/x86/vf_hqdn3d_init.c
View File

@ -23,17 +23,25 @@
#include "libavfilter/vf_hqdn3d.h" #include "libavfilter/vf_hqdn3d.h"
#include "config.h" #include "config.h"
void ff_hqdn3d_row_8_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal); void ff_hqdn3d_row_8_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
void ff_hqdn3d_row_9_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal); uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
void ff_hqdn3d_row_10_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal); int16_t *temporal);
void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal); void ff_hqdn3d_row_9_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
int16_t *temporal);
void ff_hqdn3d_row_10_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
int16_t *temporal);
void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial,
int16_t *temporal);
av_cold void ff_hqdn3d_init_x86(HQDN3DContext *hqdn3d) av_cold void ff_hqdn3d_init_x86(HQDN3DContext *hqdn3d)
{ {
#if HAVE_YASM #if HAVE_YASM
hqdn3d->denoise_row[ 8] = ff_hqdn3d_row_8_x86; hqdn3d->denoise_row[8] = ff_hqdn3d_row_8_x86;
hqdn3d->denoise_row[ 9] = ff_hqdn3d_row_9_x86; hqdn3d->denoise_row[9] = ff_hqdn3d_row_9_x86;
hqdn3d->denoise_row[10] = ff_hqdn3d_row_10_x86; hqdn3d->denoise_row[10] = ff_hqdn3d_row_10_x86;
hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86; hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86;
#endif #endif /* HAVE_YASM */
} }