Mercurial > mplayer.hg
view libvo/vo_ggi.c @ 34266:a6a1c973de4e
vo direct3d: fix crash in osd drawing code
The crash occurred when the video window was minimized and
the OSD should be drawn. This caused the OSD textures creation
to fail and later the OSD drawing code would assume they exist
and cause the crash.
When the video window is minimized a size change event with
the new size 0x0 is reported. This is now handled by deferring
the textures recreation. If the OSD should be drawn in the
meantime it will be checked if the OSD textures have been
allocated.
This commit is done with the permission of the vo direct3d
maintainer.
This is based on patches from Roger Pack (rogerdpack2 (gmail))
and Patrick Dinh (patrickdinh33 (yahoo)).
author | al |
---|---|
date | Sat, 19 Nov 2011 14:04:11 +0000 |
parents | ddb45e9443ec |
children |
line wrap: on
line source
/* * General Graphics Interface (GGI) vo driver * * copyright (C) 2001 Alex Beregszaszi * * Uses libGGI - http://www.ggi-project.org/ * * TODO: * * implement gamma handling (VAA isn't obsoleted?) * * Thanks to Andreas Beck for his patches. * * Many thanks to Atmosfear, he hacked this driver to work with planar * formats, and he fixed the RGB handling. * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <errno.h> #include "mp_msg.h" #include "config.h" #include "video_out.h" #include "video_out_internal.h" #include "mp_fifo.h" #include <ggi/ggi.h> #ifdef CONFIG_GGIWMH #include <ggi/wmh.h> #endif /* maximum buffers */ #undef GGI_FLIP static const vo_info_t info = { "General Graphics Interface (GGI) output", "ggi", "Alex Beregszaszi", "major" }; const LIBVO_EXTERN(ggi) static struct ggi_conf_s { char *driver; ggi_visual_t vis; ggi_visual_t drawvis; /* source image format */ int srcwidth; int srcheight; int srcformat; int srcdepth; int srcbpp; /* dirty region */ struct { int x1, y1; int x2, y2; } flushregion; int voflags; } ggi_conf; #ifdef CONFIG_GGIWMH static void window_ontop(void) { mp_msg(MSGT_VO, MSGL_V, "[ggi] debug: window_ontop() called\n"); ggiWmhZOrder(ggi_conf.vis, ZO_TOP); return; } #endif static void set_graphtype(uint32_t format, ggi_mode *mode) { switch (format) { case IMGFMT_RGB4: mode->graphtype = GT_4BIT; break; case IMGFMT_BGR4: mode->graphtype = GT_4BIT; GT_SETSUBSCHEME(mode->graphtype, GT_SUB_HIGHBIT_RIGHT); break; case IMGFMT_RGB8: case IMGFMT_BGR8: mode->graphtype = GT_8BIT; break; case IMGFMT_RGB15: case IMGFMT_BGR15: mode->graphtype = GT_15BIT; break; case IMGFMT_RGB16: case IMGFMT_BGR16: mode->graphtype = GT_16BIT; break; case IMGFMT_RGB24: case IMGFMT_BGR24: mode->graphtype = GT_24BIT; break; case IMGFMT_RGB32: case IMGFMT_BGR32: mode->graphtype = GT_32BIT; break; } return; } static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { ggi_mode mode = { 1, /* frames */ {width, height}, /* visible */ {GGI_AUTO, GGI_AUTO}, /* virt */ {GGI_AUTO, GGI_AUTO}, /* size */ GT_AUTO, /* graphtype */ {GGI_AUTO, GGI_AUTO} /* dots per pixel */ }; set_graphtype(format, &mode); #if 0 printf("[ggi] mode: "); ggiPrintMode(&mode); printf("\n"); #endif ggiCheckMode(ggi_conf.vis, &mode); if (ggiSetMode(ggi_conf.vis, &mode) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to set display mode\n"); return -1; } if (ggiGetMode(ggi_conf.vis, &mode) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to get display mode\n"); return -1; } if ((mode.graphtype == GT_INVALID) || (mode.graphtype == GT_AUTO)) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] not supported depth/bpp\n"); return -1; } #if 0 printf("[ggi] mode: "); ggiPrintMode(&mode); printf("\n"); #endif #ifdef CONFIG_GGIWMH ggiWmhSetTitle(ggi_conf.vis, title); if (vo_ontop) window_ontop(); #endif ggiSetFlags(ggi_conf.vis, GGIFLAG_ASYNC); if (GT_SCHEME(mode.graphtype) == GT_PALETTE) ggiSetColorfulPalette(ggi_conf.vis); if (GT_SCHEME(mode.graphtype) != GT_TRUECOLOR) { ggi_mode drawmode; ggi_conf.drawvis = ggiOpen("display-memory", NULL); if (ggi_conf.drawvis == NULL) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to get backbuffer for conversion\n"); return -1; } memcpy(&drawmode, &mode, sizeof(ggi_mode)); drawmode.graphtype = GT_32BIT; drawmode.size.x = GGI_AUTO; drawmode.size.y = GGI_AUTO; ggiCheckMode(ggi_conf.drawvis, &drawmode); if (ggiSetMode(ggi_conf.drawvis, &drawmode) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to set backbuffer mode\n"); return -1; } mode.graphtype = drawmode.graphtype; ggiSetFlags(ggi_conf.drawvis, GGIFLAG_ASYNC); } vo_depthonscreen = GT_DEPTH(mode.graphtype); vo_screenwidth = mode.virt.x; vo_screenheight = mode.virt.y; vo_dwidth = width; vo_dheight = height; vo_dbpp = GT_SIZE(mode.graphtype); /* calculate top, left corner */ vo_dx = (vo_screenwidth - vo_dwidth) / 2; vo_dy = (vo_screenheight - vo_dheight) / 2; ggi_conf.srcwidth = width; ggi_conf.srcheight = height; ggi_conf.srcformat = format; ggi_conf.voflags = flags; if (IMGFMT_IS_RGB(ggi_conf.srcformat)) { ggi_conf.srcdepth = IMGFMT_RGB_DEPTH(ggi_conf.srcformat); } else if (IMGFMT_IS_BGR(ggi_conf.srcformat)) { ggi_conf.srcdepth = IMGFMT_BGR_DEPTH(ggi_conf.srcformat); } else { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] Unknown image format: %s\n", vo_format_name(ggi_conf.srcformat)); return -1; } mp_msg(MSGT_VO, MSGL_INFO, "[ggi] input: %dx%dx%d, output: %dx%dx%d\n", ggi_conf.srcwidth, ggi_conf.srcheight, ggi_conf.srcdepth, mode.virt.x, mode.virt.y, vo_dbpp); ggi_conf.srcbpp = (ggi_conf.srcdepth + 7) / 8; ggi_conf.flushregion.x1 = vo_dx; ggi_conf.flushregion.y1 = vo_dy; ggi_conf.flushregion.x2 = vo_dwidth; ggi_conf.flushregion.y2 = vo_dheight; return 0; } static uint32_t get_image(mp_image_t *mpi) { /* GGI DirectRendering supports (yet) only BGR/RGB modes */ if (!((IMGFMT_IS_BGR(mpi->imgfmt)) && (IMGFMT_BGR_DEPTH(mpi->imgfmt) == vo_dbpp))) { return VO_FALSE; } if (!((IMGFMT_IS_RGB(mpi->imgfmt)) && (IMGFMT_RGB_DEPTH(mpi->imgfmt) == vo_dbpp))) { return VO_FALSE; } if (!((mpi->width == ggi_conf.srcwidth) && (mpi->height == ggi_conf.srcheight))) { return VO_FALSE; } mpi->planes[1] = mpi->planes[2] = NULL; mpi->stride[1] = mpi->stride[2] = 0; mpi->planes[0] = NULL; mpi->stride[0] = ggi_conf.srcwidth * ggi_conf.srcbpp; mpi->flags |= MP_IMGFLAG_DIRECT; #ifdef GGI_FLIP if (ggi_conf.voflags & VOFLAG_FLIPPING) { mpi->stride[0] = -mpi->stride[0]; } #endif return VO_TRUE; } static int draw_frame(uint8_t *src[]) { ggiPutBox(ggi_conf.drawvis, vo_dx, vo_dy, vo_dwidth, vo_dheight, src[0]); ggi_conf.flushregion.x1 = vo_dx; ggi_conf.flushregion.y1 = vo_dy; ggi_conf.flushregion.x2 = vo_dwidth; ggi_conf.flushregion.y2 = vo_dheight; return 0; } static void draw_osd(void) { return; } static void flip_page(void) { if (ggi_conf.drawvis != ggi_conf.vis) { #if 0 ggiFlushRegion(ggi_conf.drawvis, ggi_conf.flushregion.x1, ggi_conf.flushregion.y1, ggi_conf.flushregion.x2 - ggi_conf.flushregion.x1, ggi_conf.flushregion.y2 - ggi_conf.flushregion.y1); #endif ggiCrossBlit(ggi_conf.drawvis, ggi_conf.flushregion.x1, ggi_conf.flushregion.y1, ggi_conf.flushregion.x2 - ggi_conf.flushregion.x1, ggi_conf.flushregion.y2 - ggi_conf.flushregion.y1, ggi_conf.vis, ggi_conf.flushregion.x1, ggi_conf.flushregion.y1); } ggiFlushRegion(ggi_conf.vis, ggi_conf.flushregion.x1, ggi_conf.flushregion.y1, ggi_conf.flushregion.x2 - ggi_conf.flushregion.x1, ggi_conf.flushregion.y2 - ggi_conf.flushregion.y1); ggi_conf.flushregion.x1 = ggi_conf.flushregion.x2 = -1; ggi_conf.flushregion.y1 = ggi_conf.flushregion.y2 = -1; } static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { ggiPutBox(ggi_conf.drawvis, vo_dx + x, vo_dy + y, w, h, src[0]); if ((ggi_conf.flushregion.x1 == -1) || ((vo_dx + x) < ggi_conf.flushregion.x1)) { ggi_conf.flushregion.x1 = vo_dx + x; } if ((ggi_conf.flushregion.y1 == -1) || ((vo_dy + y) < ggi_conf.flushregion.y1)) { ggi_conf.flushregion.y1 = vo_dy + y; } if ((ggi_conf.flushregion.x2 == -1) || ((vo_dx + x + w) > ggi_conf.flushregion.x2)) { ggi_conf.flushregion.x2 = vo_dx + x + w; } if ((ggi_conf.flushregion.y2 == -1) || ((vo_dy + y + h) > ggi_conf.flushregion.y2)) { ggi_conf.flushregion.y2 = vo_dy + y + h; } return 1; } static int query_format(uint32_t format) { ggi_mode mode; uint32_t vfcap; vfcap = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_ACCEPT_STRIDE; if ((!vo_depthonscreen || !vo_dbpp) && ggi_conf.vis) { if (ggiGetMode(ggi_conf.vis, &mode) == 0) { vo_depthonscreen = GT_DEPTH(mode.graphtype); vo_dbpp = GT_SIZE(mode.graphtype); } if (GT_SCHEME(mode.graphtype) == GT_AUTO) { ggiCheckMode(ggi_conf.vis, &mode); } if (GT_SCHEME(mode.graphtype) != GT_TRUECOLOR) { mode.graphtype = GT_32BIT; vo_depthonscreen = GT_DEPTH(mode.graphtype); vo_dbpp = GT_SIZE(mode.graphtype); } } if ((IMGFMT_IS_BGR(format) && (IMGFMT_BGR_DEPTH(format) == vo_dbpp)) || (IMGFMT_IS_RGB(format) && (IMGFMT_RGB_DEPTH(format) == vo_dbpp))) { return vfcap; } if (IMGFMT_IS_BGR(format) || IMGFMT_IS_RGB(format)) { set_graphtype(format, &mode); if (ggiCheckMode(ggi_conf.drawvis, &mode) < 0) { return 0; } else { return vfcap; } } return 0; } static int preinit(const char *arg) { if (ggiInit() != 0) { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize GGI\n"); return -1; } #ifdef CONFIG_GGIWMH if (ggiWmhInit() < 0) { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n"); return -1; } #endif if (arg) { int i = 0; ggi_conf.driver = strdup(arg); while (ggi_conf.driver[i] != '\0') { if (ggi_conf.driver[i] == '.') ggi_conf.driver[i] = ','; i++; } } else { ggi_conf.driver = NULL; } ggi_conf.vis = ggiOpen(ggi_conf.driver); if (ggi_conf.vis == NULL) { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to open '%s' output\n", (ggi_conf.driver == NULL) ? "default" : ggi_conf.driver); ggiExit(); return -1; } ggi_conf.drawvis = ggi_conf.vis; #ifdef CONFIG_GGIWMH ggiWmhAttach(ggi_conf.vis); #endif mp_msg(MSGT_VO, MSGL_V, "[ggi] using '%s' output\n", (ggi_conf.driver == NULL) ? "default" : ggi_conf.driver); return 0; } static void uninit(void) { free(ggi_conf.driver); #ifdef CONFIG_GGIWMH ggiWmhDetach(ggi_conf.vis); ggiWmhExit(); #endif if (ggi_conf.drawvis != NULL && ggi_conf.drawvis != ggi_conf.vis) ggiClose(ggi_conf.drawvis); ggiClose(ggi_conf.vis); ggiExit(); } static int control(uint32_t request, void *data) { switch (request) { case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t *) data)); case VOCTRL_GET_IMAGE: return get_image(data); #ifdef CONFIG_GGIWMH case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); window_ontop(); return VO_TRUE; #endif } return VO_NOTIMPL; } /* EVENT handling */ #include "osdep/keycodes.h" static void check_events(void) { struct timeval tv = {0, 0}; ggi_event event; ggi_event_mask mask; if ((mask = ggiEventPoll(ggi_conf.vis, emAll, &tv))) { if (ggiEventRead(ggi_conf.vis, &event, emAll) != 0) { mp_dbg(MSGT_VO, MSGL_DBG3, "type: %4x, origin: %4x, " "sym: %4x, label: %4x, button=%4x\n", event.any.origin, event.any.type, event.key.sym, event.key.label, event.key.button); switch (event.any.type) { case evKeyPress: switch (event.key.sym) { case GIIK_PAsterisk: /* PStar */ case GIIUC_Asterisk: mplayer_put_key('*'); break; case GIIK_PSlash: case GIIUC_Slash: mplayer_put_key('/'); break; case GIIK_PPlus: case GIIUC_Plus: mplayer_put_key('+'); break; case GIIK_PMinus: case GIIUC_Minus: mplayer_put_key('-'); break; case GIIUC_o: case GIIUC_O: mplayer_put_key('o'); break; case GIIUC_g: case GIIUC_G: mplayer_put_key('g'); break; case GIIUC_z: case GIIUC_Z: mplayer_put_key('z'); break; case GIIUC_x: case GIIUC_X: mplayer_put_key('x'); break; case GIIUC_m: case GIIUC_M: mplayer_put_key('m'); break; case GIIUC_d: case GIIUC_D: mplayer_put_key('d'); break; case GIIUC_q: case GIIUC_Q: mplayer_put_key('q'); break; case GIIUC_h: case GIIUC_H: mplayer_put_key('h'); break; case GIIUC_l: case GIIUC_L: mplayer_put_key('l'); break; case GIIUC_Space: case GIIUC_p: case GIIUC_P: mplayer_put_key('p'); break; case GIIK_Up: mplayer_put_key(KEY_UP); break; case GIIK_Down: mplayer_put_key(KEY_DOWN); break; case GIIK_Left: mplayer_put_key(KEY_LEFT); break; case GIIK_Right: mplayer_put_key(KEY_RIGHT); break; case GIIK_PageUp: mplayer_put_key(KEY_PAGE_UP); break; case GIIK_PageDown: mplayer_put_key(KEY_PAGE_DOWN); break; default: break; } /* switch */ break; } /* switch */ } /* if */ } /* if */ return; }