marfrit/libva-v4l2-request-fourier
1
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove X11 support with vaPutSurface

Browse Source 
Using VAAPI as a video output (through vaPutSurface) is deprecated and
definitely not recommended for any use case. Since we're starting to
support non-X11 pipelines, remove X11 support altogether.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
This commit is contained in:
Paul Kocialkowski
2018-06-20 17:44:57 +02:00
parent 5bedd8d898
commit c0a3cd8fcd
5 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+2 -2
View File
@@ -1,8 +1,8 @@
AM_CPPFLAGS = -DPTHREADS $(X11_DEPS_CFLAGS) $(DRM_CFLAGS) $(LIBVA_DEPS_CFLAGS)
AM_CPPFLAGS = -DPTHREADS $(DRM_CFLAGS) $(LIBVA_DEPS_CFLAGS)
backend_cflags = -Wall -fvisibility=hidden
backend_ldflags = -module -avoid-version -no-undefined -Wl,--no-undefined
backend_libs = -lpthread -ldl $(DRM_LIBS) $(X11_DEPS_LIBS) $(LIBVA_DEPS_LIBS)
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 \
mpeg2.c picture.c subpicture.c image.c v4l2.c media.c utils.c
src/sunxi_cedrus.c
-1
View File
@@ -99,7 +99,6 @@ VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context)
vtable->vaEndPicture = SunxiCedrusEndPicture;
vtable->vaSyncSurface = SunxiCedrusSyncSurface;
vtable->vaQuerySurfaceStatus = SunxiCedrusQuerySurfaceStatus;
vtable->vaPutSurface = SunxiCedrusPutSurface;
vtable->vaQueryImageFormats = SunxiCedrusQueryImageFormats;
vtable->vaCreateImage = SunxiCedrusCreateImage;
vtable->vaDeriveImage = SunxiCedrusDeriveImage;
src/surface.c
-54
View File
@@ -37,8 +37,6 @@
#include <linux/videodev2.h>
#include <X11/Xlib.h>
#include "v4l2.h"
#include "media.h"
#include "utils.h"
@@ -225,58 +223,6 @@ VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
void *draw, short src_x, short src_y, unsigned short src_width,
unsigned short src_height, short dst_x, short dst_y,
unsigned short dst_width, unsigned short dst_height,
VARectangle *cliprects, unsigned int cliprects_count,
unsigned int flags)
{
struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) context->pDriverData;
GC gc;
Display *display;
const XID xid = (XID)(uintptr_t)draw;
XColor xcolor;
int screen;
Colormap cm;
int colorratio = 65535 / 255;
int x, y;
struct object_surface *surface_object;
/* WARNING: This is for development purpose only!!! */
surface_object = SURFACE(surface_id);
display = XOpenDisplay(getenv("DISPLAY"));
if (display == NULL) {
sunxi_cedrus_log("Cannot connect to X server\n");
exit(1);
}
sunxi_cedrus_log("warning: using vaPutSurface with sunxi-cedrus is not recommended\n");
screen = DefaultScreen(display);
gc = XCreateGC(display, RootWindow(display, screen), 0, NULL);
XSync(display, False);
cm = DefaultColormap(display, screen);
xcolor.flags = DoRed | DoGreen | DoBlue;
for(x=dst_x; x < dst_x+dst_width; x++) {
for(y=dst_y; y < dst_y+dst_height; y++) {
char lum = ((char *) surface_object->destination_data[0])[x+src_width*y];
xcolor.red = xcolor.green = xcolor.blue = lum*colorratio;
XAllocColor(display, cm, &xcolor);
XSetForeground(display, gc, xcolor.pixel);
XDrawPoint(display, xid, gc, x, y);
}
}
XFlush(display);
XCloseDisplay(display);
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusLockSurface(VADriverContextP context,
VASurfaceID surface_id, unsigned int *fourcc, unsigned int *luma_stride,
unsigned int *chroma_u_stride, unsigned int *chroma_v_stride,
src/surface.h
-6
View File
@@ -62,12 +62,6 @@ VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
VASurfaceID surface_id);
VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
VASurfaceID surface_id, VASurfaceStatus *status);
VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
void *draw, short src_x, short src_y, unsigned short src_width,
unsigned short src_height, short dst_x, short dst_y,
unsigned short dst_width, unsigned short dst_height,
VARectangle *cliprects, unsigned int cliprects_count,
unsigned int flags);
VAStatus SunxiCedrusLockSurface(VADriverContextP context,
VASurfaceID surface_id, unsigned int *fourcc, unsigned int *luma_stride,
unsigned int *chroma_u_stride, unsigned int *chroma_v_stride,