summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-07-06 18:38:37 +0200
committerVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-07-06 18:38:37 +0200
commit6970dc127764129a6bcb06fcceb600e057346796 (patch)
treeeb9e2a1d8b1ba0e36ca047e58e97a3b073b4e61f
parentf7ea48597e586877ac216869303ceddb72fafbf3 (diff)
test: elements: remove spurious linkage
Element tests only need to link against gstreamer libraries.
-rw-r--r--tests/elements/Makefile.am52
-rw-r--r--tests/elements/test-vaapisink.c5
2 files changed, 3 insertions, 54 deletions
diff --git a/tests/elements/Makefile.am b/tests/elements/Makefile.am
index 73e39ed4..f940a5d0 100644
--- a/tests/elements/Makefile.am
+++ b/tests/elements/Makefile.am
@@ -4,65 +4,17 @@ noinst_PROGRAMS = \
TEST_CFLAGS = \
-DGST_USE_UNSTABLE_API \
- -I$(top_srcdir)/gst-libs \
- -I$(top_builddir)/gst-libs \
- $(LIBVA_CFLAGS) \
$(GST_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(NULL)
-GST_VAAPI_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la
TEST_LIBS = \
- $(LIBVA_LIBS) \
- $(GST_LIBS) \
- $(NULL)
-
-if USE_DRM
-GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm.la
-TEST_CFLAGS += $(LIBVA_DRM_CFLAGS)
-TEST_LIBS += $(LIBVA_DRM_LIBS)
-endif
-
-if USE_X11
-GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11.la
-TEST_CFLAGS += $(X11_CFLAGS)
-TEST_LIBS += \
- $(LIBVA_X11_LIBS) \
- $(X11_LIBS) \
- $(NULL)
-endif
-
-if USE_GLX
-GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la
-TEST_CFLAGS += $(X11_CFLAGS) $(GL_CFLAGS)
-TEST_LIBS += \
- $(LIBVA_GLX_LIBS) \
- $(X11_LIBS) \
- $(GL_LIBS) \
- $(NULL)
-endif
-
-if USE_EGL
-GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la
-TEST_CFLAGS += $(EGL_CFLAGS)
-TEST_LIBS += \
- $(LIBVA_EGL_LIBS) \
- $(EGL_LIBS) \
- $(NULL)
-endif
-
-if USE_WAYLAND
-GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland.la
-TEST_CFLAGS += $(WAYLAND_CFLAGS)
-TEST_LIBS += \
- $(LIBVA_WAYLAND_LIBS) \
- $(WAYLAND_LIBS) \
+ $(GST_LIBS) \
+ $(GST_VIDEO_CFLAGS) \
$(NULL)
-endif
test_vaapisink_SOURCES = test-vaapisink.c
test_vaapisink_CFLAGS = $(TEST_CFLAGS)
-test_vaapisink_LDFLAGS = $(GST_VAAPI_LIBS)
test_vaapisink_LDADD = $(TEST_LIBS)
-include $(top_srcdir)/git.mk
diff --git a/tests/elements/test-vaapisink.c b/tests/elements/test-vaapisink.c
index 441a991e..50057557 100644
--- a/tests/elements/test-vaapisink.c
+++ b/tests/elements/test-vaapisink.c
@@ -2,8 +2,6 @@
#include <string.h>
#include <gst/gst.h>
-#include <gst/vaapi/gstvaapitypes.h>
-
typedef struct _CustomData
{
GstElement *pipeline;
@@ -48,8 +46,7 @@ handle_keyboard (GIOChannel * source, GIOCondition cond, AppData * data)
send_rotate_event (data);
break;
case 's':{
- g_object_set (G_OBJECT (data->video_sink), "rotation",
- GST_VAAPI_ROTATION_AUTOMATIC, NULL);
+ g_object_set (G_OBJECT (data->video_sink), "rotation", 360, NULL);
break;
}
case 'q':