mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 09:40:37 +00:00
[MOVED FROM BAD 10/56] gst/deinterlace2/Makefile.am: Move the assembly includes to noinst_HEADERS where they belong.
Original commit message from CVS: * gst/deinterlace2/Makefile.am: Move the assembly includes to noinst_HEADERS where they belong. * gst/deinterlace2/tvtime/vfir.c: (deinterlace_line_c), (deinterlace_line_mmx): Fix C and MMX implementations a bit more.
This commit is contained in:
parent
1916a3b075
commit
bd35b53558
2 changed files with 21 additions and 22 deletions
|
@ -3,12 +3,29 @@ plugin_LTLIBRARIES = libgstdeinterlace2.la
|
|||
libgstdeinterlace2_la_SOURCES = \
|
||||
gstdeinterlace2.c \
|
||||
tvtime/greedy.c \
|
||||
tvtime/greedyh.asm \
|
||||
tvtime/greedyh.c \
|
||||
tvtime/speedy.c \
|
||||
tvtime/vfir.c \
|
||||
tvtime/tomsmocomp.c
|
||||
|
||||
libgstdeinterlace2_la_CFLAGS = $(GST_CFLAGS) \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS) -DHAVE_MMX -DHAVE_SSE
|
||||
libgstdeinterlace2_la_LIBADD = $(GST_LIBS) \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
|
||||
libgstdeinterlace2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
||||
noinst_HEADERS = \
|
||||
gstdeinterlace2.h \
|
||||
tvtime/mmx.h \
|
||||
tvtime/sse.h \
|
||||
tvtime/greedyh.h \
|
||||
tvtime/greedyh.asm \
|
||||
tvtime/greedyhmacros.h \
|
||||
tvtime/plugins.h \
|
||||
tvtime/speedtools.h \
|
||||
tvtime/speedy.h \
|
||||
tvtime/x86-64_macros.inc \
|
||||
tvtime/tomsmocomp.c \
|
||||
tvtime/tomsmocomp.h \
|
||||
tvtime/tomsmocomp/SearchLoop0A.inc \
|
||||
tvtime/tomsmocomp/SearchLoopBottom.inc \
|
||||
tvtime/tomsmocomp/SearchLoopEdgeA8.inc \
|
||||
|
@ -27,20 +44,3 @@ libgstdeinterlace2_la_SOURCES = \
|
|||
tvtime/tomsmocomp/tomsmocompmacros.h \
|
||||
tvtime/tomsmocomp/WierdBob.inc
|
||||
|
||||
libgstdeinterlace2_la_CFLAGS = $(GST_CFLAGS) \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS) -DHAVE_MMX -DHAVE_SSE
|
||||
libgstdeinterlace2_la_LIBADD = $(GST_LIBS) \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
|
||||
libgstdeinterlace2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
||||
noinst_HEADERS = \
|
||||
gstdeinterlace2.h \
|
||||
tvtime/mmx.h \
|
||||
tvtime/sse.h \
|
||||
tvtime/greedyh.h \
|
||||
tvtime/greedyhmacros.h \
|
||||
tvtime/plugins.h \
|
||||
tvtime/speedtools.h \
|
||||
tvtime/speedy.h \
|
||||
tvtime/tomsmocomp.h
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ deinterlace_line_c (uint8_t * dst, uint8_t * lum_m4,
|
|||
{
|
||||
int sum;
|
||||
|
||||
for (; size > 0; size--) {
|
||||
for (; size >= 0; size--) {
|
||||
sum = -lum_m4[0];
|
||||
sum += lum_m3[0] << 2;
|
||||
sum += lum_m2[0] << 1;
|
||||
|
@ -89,8 +89,7 @@ deinterlace_line_mmx (uint8_t * dst, uint8_t * lum_m4,
|
|||
rounder.uw[2] = 4;
|
||||
rounder.uw[3] = 4;
|
||||
pxor_r2r (mm7, mm7);
|
||||
movd_m2r (rounder, mm6);
|
||||
punpcklbw_r2r (mm7, mm6);
|
||||
movq_m2r (rounder, mm6);
|
||||
|
||||
for (; size > 3; size -= 4) {
|
||||
movd_m2r (*lum_m4, mm0);
|
||||
|
|
Loading…
Reference in a new issue