diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | configure.ac | 38 | ||||
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/request.c (renamed from src/sunxi_cedrus.c) | 0 |
4 files changed, 28 insertions, 28 deletions
@@ -11,10 +11,10 @@ The Sunxi-Cedrus libVA backend currently only supports MPEG2 video decoding. ## Instructions -In order to use the Sunxi-Cedrus libVA backend, the `sunxi_cedrus` driver has to +In order to use the Sunxi-Cedrus libVA backend, the `v4l2_request` driver has to be specified through the `LIBVA_DRIVER_NAME` environment variable, as such: - export LIBVA_DRIVER_NAME=sunxi_cedrus + export LIBVA_DRIVER_NAME=v4l2_request A media player that supports VAAPI (such as VLC) can then be used to decode a video in a supported format: diff --git a/configure.ac b/configure.ac index a523d1f..aeb7dde 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ # intel-driver package version number -m4_define([sunxi_cedrus_major_version], [1]) -m4_define([sunxi_cedrus_minor_version], [0]) -m4_define([sunxi_cedrus_micro_version], [0]) -m4_define([sunxi_cedrus_pre_version], [0]) -m4_define([sunxi_cedrus_version], - [sunxi_cedrus_major_version.sunxi_cedrus_minor_version.sunxi_cedrus_micro_version]) -m4_if(sunxi_cedrus_pre_version, [0], [], [ -m4_append([sunxi_cedrus_version], sunxi_cedrus_pre_version, [.pre]) +m4_define([v4l2_request_major_version], [1]) +m4_define([v4l2_request_minor_version], [0]) +m4_define([v4l2_request_micro_version], [0]) +m4_define([v4l2_request_pre_version], [0]) +m4_define([v4l2_request_version], + [v4l2_request_major_version.v4l2_request_minor_version.v4l2_request_micro_version]) +m4_if(v4l2_request_pre_version, [0], [], [ +m4_append([v4l2_request_version], v4l2_request_pre_version, [.pre]) ]) # libva minimum version requirement @@ -17,23 +17,23 @@ m4_define([va_api_version], [0.34.0]) m4_define([libdrm_version], [2.4.45]) AC_PREREQ([2.60]) -AC_INIT([liva_wrapper], [sunxi_cedrus_version], - [florent.revest@free-electrons.com], [sunxi_cedrus]) +AC_INIT([liva_wrapper], [v4l2_request_version], + [florent.revest@free-electrons.com], [v4l2_request]) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AC_CONFIG_HEADERS([src/autoconfig.h]) -SUNXI_CEDRUS_MAJOR_VERSION=sunxi_cedrus_major_version -SUNXI_CEDRUS_MINOR_VERSION=sunxi_cedrus_minor_version -SUNXI_CEDRUS_MICRO_VERSION=sunxi_cedrus_micro_version -AC_DEFINE([SUNXI_CEDRUS_MAJOR_VERSION], [sunxi_cedrus_major_version], [Major version of the driver]) -AC_DEFINE([SUNXI_CEDRUS_MINOR_VERSION], [sunxi_cedrus_minor_version], [Minor version of the driver]) -AC_DEFINE([SUNXI_CEDRUS_MICRO_VERSION], [sunxi_cedrus_micro_version], [Micro version of the driver]) -AC_DEFINE([SUNXI_CEDRUS_PRE_VERSION], [sunxi_cedrus_pre_version], [Preversion of the driver]) +V4L2_REQUEST_MAJOR_VERSION=v4l2_request_major_version +V4L2_REQUEST_MINOR_VERSION=v4l2_request_minor_version +V4L2_REQUEST_MICRO_VERSION=v4l2_request_micro_version +AC_DEFINE([V4L2_REQUEST_MAJOR_VERSION], [v4l2_request_major_version], [Major version of the driver]) +AC_DEFINE([V4L2_REQUEST_MINOR_VERSION], [v4l2_request_minor_version], [Minor version of the driver]) +AC_DEFINE([V4L2_REQUEST_MICRO_VERSION], [v4l2_request_micro_version], [Micro version of the driver]) +AC_DEFINE([V4L2_REQUEST_PRE_VERSION], [v4l2_request_pre_version], [Preversion of the driver]) -SUNXI_CEDRUS_LT_LDFLAGS="-avoid-version" -AC_SUBST(SUNXI_CEDRUS_LT_LDFLAGS) +V4L2_REQUEST_LT_LDFLAGS="-avoid-version" +AC_SUBST(V4L2_REQUEST_LT_LDFLAGS) dnl Use pretty build output with automake >= 1.11 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [ diff --git a/src/Makefile.am b/src/Makefile.am index 2741cff..0d3c33f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ backend_cflags = -Wall -fvisibility=hidden backend_ldflags = -module -avoid-version -no-undefined -Wl,--no-undefined backend_libs = -lpthread -ldl $(DRM_LIBS) $(LIBVA_DEPS_LIBS) -backend_c = sunxi_cedrus.c object_heap.c config.c surface.c context.c buffer.c \ +backend_c = request.c object_heap.c config.c surface.c context.c buffer.c \ mpeg2.c picture.c subpicture.c image.c v4l2.c video.c media.c utils.c \ h264.c @@ -14,12 +14,12 @@ backend_h = request.h object_heap.h config.h surface.h context.h buffer.h \ mpeg2.h picture.h subpicture.h image.h v4l2.h video.h media.h utils.h \ tiled_yuv.h h264.h -sunxi_cedrus_drv_video_la_LTLIBRARIES = sunxi_cedrus_drv_video.la -sunxi_cedrus_drv_video_ladir = $(LIBVA_DRIVERS_PATH) -sunxi_cedrus_drv_video_la_CFLAGS = $(backend_cflags) -sunxi_cedrus_drv_video_la_LDFLAGS = $(backend_ldflags) -sunxi_cedrus_drv_video_la_LIBADD = $(backend_libs) -sunxi_cedrus_drv_video_la_SOURCES = $(backend_c) $(backend_s) +v4l2_request_drv_video_la_LTLIBRARIES = v4l2_request_drv_video.la +v4l2_request_drv_video_ladir = $(LIBVA_DRIVERS_PATH) +v4l2_request_drv_video_la_CFLAGS = $(backend_cflags) +v4l2_request_drv_video_la_LDFLAGS = $(backend_ldflags) +v4l2_request_drv_video_la_LIBADD = $(backend_libs) +v4l2_request_drv_video_la_SOURCES = $(backend_c) $(backend_s) noinst_HEADERS = $(backend_h) MAINTAINERCLEANFILES = Makefile.in autoconfig.h.in diff --git a/src/sunxi_cedrus.c b/src/request.c index 19f39b1..19f39b1 100644 --- a/src/sunxi_cedrus.c +++ b/src/request.c |