From 762a52bd55dfa7c5e57f5f741544038932c18444 Mon Sep 17 00:00:00 2001 From: Ramprasad N Date: Fri, 25 Nov 2016 17:02:17 +0530 Subject: [PATCH] viddec3test:fd is initialized in display-wayland Signed-off-by: Ramprasad N --- util/display-wayland.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/util/display-wayland.c b/util/display-wayland.c index c0d6175..35103a8 100644 --- a/util/display-wayland.c +++ b/util/display-wayland.c @@ -95,7 +95,7 @@ alloc_buffer(struct display *disp, uint32_t fourcc, uint32_t w, uint32_t h) buf->fourcc = fourcc; buf->width = w; buf->height = h; - buf->multiplanar = true; + buf->multiplanar = false; buf->nbo = 1; @@ -109,6 +109,7 @@ alloc_buffer(struct display *disp, uint32_t fourcc, uint32_t w, uint32_t h) buf->bo[0] = alloc_bo(disp, 32, buf->width, buf->height, &bo_handles[0], &buf->pitches[0]); omap_bo_get_name(buf->bo[0], &buf_wl->name); + buf->fd[0] = omap_bo_dmabuf(buf->bo[0]); /* ARGB: stride is four times width */ buf_wl->wl_buf = wl_drm_create_buffer(disp_wl->drm, @@ -123,6 +124,7 @@ alloc_buffer(struct display *disp, uint32_t fourcc, uint32_t w, uint32_t h) &bo_handles[0], &buf->pitches[0]); omap_bo_get_name(buf->bo[0], &buf_wl->name); + buf->fd[0] = omap_bo_dmabuf(buf->bo[0]); /* YUYV; stride is double width */ buf_wl->wl_buf = wl_drm_create_buffer(disp_wl->drm, buf_wl->name, buf->width, buf->height, @@ -135,6 +137,7 @@ alloc_buffer(struct display *disp, uint32_t fourcc, uint32_t w, uint32_t h) &bo_handles[0], &buf->pitches[0]); omap_bo_get_name(buf->bo[0], &buf_wl->name); + buf->fd[0] = omap_bo_dmabuf(buf->bo[0]); /* NV12: Create a planar buffer */ buf_wl->wl_buf = wl_drm_create_planar_buffer(disp_wl->drm, buf_wl->name, buf->width, buf->height, wl_fmt, @@ -307,9 +310,7 @@ disp_wayland_open(int argc, char **argv) if (!argv[i]) { continue; } - if (!strcmp("-1", argv[i])) { - disp->multiplanar = false; - } else if (!strcmp("-w", argv[i])) { + if (!strcmp("-w", argv[i])) { argv[i++] = NULL; if (sscanf(argv[i], "%dx%d", &width, &height) != 2) { ERROR("invalid arg: -w %s", argv[i]); @@ -364,7 +365,7 @@ disp_wayland_open(int argc, char **argv) disp->close = close_kms; disp->disp_free_buf = free_buffers; - disp->multiplanar = true; + disp->multiplanar = false; disp->width = width; disp->height = height; -- 2.26.2