diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst index 5f501f0348..342230fbaf 100644 --- a/DOCS/man/en/vo.rst +++ b/DOCS/man/en/vo.rst @@ -224,14 +224,6 @@ direct3d (Windows only) Same as ``direct3d_shaders``, but with the options ``disable-textures`` and ``disable-shaders`` forced. -directx (Windows only) - Video output driver that uses the DirectX interface. Deprecated, always - prefer direct3d* by default. - - noaccel - Turns off hardware acceleration. Try this option if you have display - problems. - corevideo (Mac OS X 10.6 and later) Mac OS X CoreVideo video output driver. Uses the CoreVideo APIs to fill PixelBuffers and generate OpenGL textures from them (useful as a fallback @@ -652,28 +644,6 @@ null caca Color ASCII art video output driver that works on a text console. -directfb - Play video using the DirectFB library. - - (no-)input - Use the DirectFB instead of the MPlayer keyboard code (default: - enabled). - buffermode=single|double|triple - Double and triple buffering give best results if you want to avoid - tearing issues. Triple buffering is more efficient than double - buffering as it does not block MPlayer while waiting for the vertical - retrace. Single buffering should be avoided (default: single). - fieldparity=top|bottom - Control the output order for interlaced frames (default: disabled). - Valid values are top = top fields first, bottom = bottom fields first. - This option does not have any effect on progressive film material like - most MPEG movies are. You need to enable this option if you have - tearing issues or unsmooth motions watching interlaced film material. - layer=N - Will force layer with ID N for playback (default: -1 - auto). - dfbopts= - Specify a parameter list for DirectFB. - image Output each frame into an image file in the current directory. Each file takes the frame number padded with leading zeros as name. diff --git a/Makefile b/Makefile index 567f22114d..628e2df5bc 100644 --- a/Makefile +++ b/Makefile @@ -307,8 +307,6 @@ SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c -SRCS_MPLAYER-$(DIRECTFB) += libvo/vo_directfb2.c -SRCS_MPLAYER-$(DIRECTX) += libao2/ao_dsound.c libvo/vo_directx.c SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl3.c \ pnm_loader.c SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c diff --git a/configure b/configure index 9946ca8234..79a965083e 100755 --- a/configure +++ b/configure @@ -362,7 +362,6 @@ Video output: --enable-gl enable OpenGL video output [autodetect] --enable-caca enable CACA video output [autodetect] --enable-direct3d enable Direct3D video output [autodetect] - --enable-directx enable DirectX video output [autodetect] --enable-xv enable Xv video output [autodetect] --enable-vdpau enable VDPAU acceleration [autodetect] --enable-vm enable XF86VidMode support [autodetect] @@ -370,7 +369,6 @@ Video output: --enable-x11 enable X11 video output [autodetect] --enable-xshape enable XShape support [autodetect] --disable-xss disable screensaver support via xss [autodetect] - --enable-directfb enable DirectFB video output [autodetect] --disable-corevideo disable CoreVideo video output [autodetect] --disable-cocoa disable Cocoa OpenGL backend [autodetect] @@ -451,7 +449,6 @@ _xss=auto _xv=auto _vdpau=auto _direct3d=auto -_directx=auto _nas=auto _png=auto _mng=auto @@ -507,7 +504,6 @@ _apple_remote=auto _apple_ir=auto _termcap=auto _termios=auto -_directfb=auto #language=en _shm=auto _translation=no @@ -652,8 +648,6 @@ for ac_option do --disable-vdpau) _vdpau=no ;; --enable-direct3d) _direct3d=yes ;; --disable-direct3d) _direct3d=no ;; - --enable-directx) _directx=yes ;; - --disable-directx) _directx=no ;; --enable-png) _png=yes ;; --disable-png) _png=no ;; --enable-mng) _mng=yes ;; @@ -762,8 +756,6 @@ for ac_option do --disable-termcap) _termcap=no ;; --enable-termios) _termios=yes ;; --disable-termios) _termios=no ;; - --enable-directfb) _directfb=yes ;; - --disable-directfb) _directfb=no ;; --enable-shm) _shm=yes ;; --disable-shm) _shm=no ;; --enable-select) _select=yes ;; @@ -1997,33 +1989,6 @@ echores "$_libquvi" ######### -echocheck "DirectFB" -if test "$_directfb" = auto ; then - _directfb=no - cat > $TMPC << EOF -#include -#include -#if (DIRECTFB_MAJOR_VERSION << 16 | DIRECTFB_MINOR_VERSION << 8 | DIRECTFB_MICRO_VERSION) < (0 << 16 | 9 << 8 | 22) -#error "DirectFB version too old." -#endif -int main(void) { DirectFBInit(0, 0); return 0; } -EOF - for _inc_tmp in "" -I/usr/local/include/directfb -I/usr/include/directfb -I/usr/local/include; do - cc_check $_inc_tmp -ldirectfb && - _directfb=yes && extra_cflags="$extra_cflags $_inc_tmp" && break - done -fi -if test "$_directfb" = yes ; then - def_directfb='#define CONFIG_DIRECTFB 1' - vomodules="directfb $vomodules" - libs_mplayer="$libs_mplayer -ldirectfb" -else - def_directfb='#undef CONFIG_DIRECTFB' - novomodules="directfb $novomodules" -fi -echores "$_directfb" - - if darwin; then echocheck "Cocoa" @@ -2556,29 +2521,6 @@ else fi echores "$_direct3d" -echocheck "Directx" -if test "$_directx" = auto ; then - cat > $TMPC << EOF -#include -#include -#include -int main(void) { return 0; } -EOF - _directx=no - cc_check -lgdi32 && _directx=yes -fi -if test "$_directx" = yes ; then - def_directx='#define CONFIG_DIRECTX 1' - libs_mplayer="$libs_mplayer -lgdi32" - vomodules="directx $vomodules" - aomodules="dsound $aomodules" -else - def_directx='#undef CONFIG_DIRECTX' - novomodules="directx $novomodules" - noaomodules="dsound $noaomodules" -fi -echores "$_directx" - fi #if win32; then @@ -3586,8 +3528,6 @@ COCOA = $_cocoa COREAUDIO = $_coreaudio COREVIDEO = $_corevideo DIRECT3D = $_direct3d -DIRECTFB = $_directfb -DIRECTX = $_directx DVBIN = $_dvbin DVDREAD = $_dvdread DXR3 = $_dxr3 @@ -3872,8 +3812,6 @@ $def_caca $def_corevideo $def_cocoa $def_direct3d -$def_directfb -$def_directx $def_gif $def_gif_4 $def_gif_tvt_hack diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index 621ae874dd..5d05d37043 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -30,8 +30,6 @@ #define memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 0) #define my_memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 1) -#define mem2agpcpy_pic memcpy_pic - /** * \param limit2width always skip data between end of line and start of next * instead of copying the full block when strides are the same diff --git a/libvo/video_out.c b/libvo/video_out.c index 9e65be8aab..c685cecddd 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -84,8 +84,6 @@ extern struct vo_driver video_out_image; extern struct vo_driver video_out_caca; extern struct vo_driver video_out_direct3d; extern struct vo_driver video_out_direct3d_shaders; -extern struct vo_driver video_out_directx; -extern struct vo_driver video_out_directfb; extern struct vo_driver video_out_corevideo; const struct vo_driver *video_out_drivers[] = @@ -94,9 +92,6 @@ const struct vo_driver *video_out_drivers[] = &video_out_direct3d_shaders, &video_out_direct3d, #endif -#ifdef CONFIG_DIRECTX - &video_out_directx, -#endif #ifdef CONFIG_GL_COCOA &video_out_gl, #endif @@ -123,10 +118,6 @@ const struct vo_driver *video_out_drivers[] = #endif &video_out_null, // should not be auto-selected -#ifdef CONFIG_DIRECTFB - // vo directfb can call exit() if initialization fails - &video_out_directfb, -#endif &video_out_image, #ifdef CONFIG_X11 #ifdef CONFIG_GL diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c deleted file mode 100644 index c83bdccbae..0000000000 --- a/libvo/vo_directfb2.c +++ /dev/null @@ -1,1537 +0,0 @@ -/* - * MPlayer video driver for DirectFramebuffer device - * - * copyright (C) 2002 Jiri Svoboda - * - * based on vo_directfb2.c - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 -#include -#include -#include -#include -#include - -#include "config.h" -#include "video_out.h" -#include "fastmemcpy.h" -#include "sub/sub.h" -#include "mp_msg.h" -#include "aspect.h" -#include "subopt-helper.h" -#include "mp_fifo.h" -#include "input/keycodes.h" -#include "libmpcodecs/mp_image.h" -#include "libmpcodecs/vfcap.h" -#include "osd.h" - -// triple buffering -#define TRIPLE 1 - -/****************************** -* vo_directfb globals * -******************************/ - -#define DFBCHECK(x ...) \ - do { \ - DFBResult err = x; \ - \ - if (err != DFB_OK) \ - { \ - fprintf(stderr, "%s <%d>:\n\t", __FILE__, __LINE__); \ - DirectFBErrorFatal(# x, err); \ - } \ - } while (0) - -/* - * filled by preinit - */ - -// main DirectFB handle -static IDirectFB *dfb = NULL; -// keyboard handle -static IDirectFBInputDevice *keyboard = NULL; -// A buffer for input events. -static IDirectFBEventBuffer *buffer = NULL; - -/* - * filled during config - */ - -// handle of used layer -static IDirectFBDisplayLayer *layer = NULL; -// surface of used layer -static IDirectFBSurface *primary = NULL; -static int primarylocked = 0; -// handle of temporary surface (if used) -static IDirectFBSurface *frame = NULL; -static int framelocked = 0; -// flipping mode flag (layer/surface) -static int flipping = 0; -// scaling flag -static int stretch = 0; -// picture position -static int xoffset = 0, yoffset = 0; -// picture size -static int out_width = 0, out_height = 0; -// frame/primary size -static int width = 0, height = 0; -// frame primary format -DFBSurfacePixelFormat pixel_format; -/* - static void (*draw_alpha_p)(int w, int h, unsigned char *src, - unsigned char *srca, int stride, unsigned char *dst, - int dstride); - */ - -/****************************** -* cmd line parameteres * -******************************/ - -/* command line/config file options */ -static int layer_id = -1; -static int buffer_mode = 1; -static int use_input = 1; -static int field_parity = -1; - -/****************************** -* implementation * -******************************/ - -static void unlock(void) -{ - if (frame && framelocked) - frame->Unlock(frame); - if (primary && primarylocked) - primary->Unlock(primary); -} - -static int get_parity(strarg_t *arg) -{ - if (strargcmp(arg, "top") == 0) - return 0; - if (strargcmp(arg, "bottom") == 0) - return 1; - return -1; -} - -static int check_parity(void *arg) -{ - return get_parity(arg) != -1; -} - -static int get_mode(strarg_t *arg) -{ - if (strargcmp(arg, "single") == 0) - return 1; - if (strargcmp(arg, "double") == 0) - return 2; - if (strargcmp(arg, "triple") == 0) - return 3; - return 0; -} - -static int check_mode(void *arg) -{ - return get_mode(arg) != 0; -} - -static int preinit(struct vo *vo, const char *arg) -{ - DFBResult ret; - strarg_t mode_str = { - 0, NULL - }; - strarg_t par_str = { - 0, NULL - }; - strarg_t dfb_params = { - 0, NULL - }; - const opt_t subopts[] = { - {"input", OPT_ARG_BOOL, &use_input, NULL}, - {"buffermode", OPT_ARG_STR, &mode_str, check_mode}, - {"fieldparity", OPT_ARG_STR, &par_str, check_parity}, - {"layer", OPT_ARG_INT, &layer_id, NULL}, - {"dfbopts", OPT_ARG_STR, &dfb_params, NULL}, - {NULL} - }; - - //mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Preinit entered\n"); - - if (dfb) - return 0; // we are already initialized! - - // set defaults - buffer_mode = 1 + vo_doublebuffering; // honor -double switch - layer_id = -1; - use_input = 1; - field_parity = -1; - if (subopt_parse(arg, subopts) != 0) { - mp_msg(MSGT_VO, MSGL_ERR, - "\n-vo directfb command line help:\n" - "Example: mplayer -vo directfb:layer=1:buffermode=single\n" - "\nOptions (use 'no' prefix to disable):\n" - " input Use DirectFB for keyboard input\n" - "\nOther options:\n" - " layer=n\n" - " n=0..xx Use layer with id n for output (0=primary)\n" - " buffermode=(single|double|triple)\n" - " single Use single buffering\n" - " double Use double buffering\n" - " triple Use triple buffering\n" - " fieldparity=(top|bottom)\n" - " top Top field first\n" - " bottom Bottom field first\n" - " dfbopts=\n" - " Specify a parameter list for DirectFB\n" - "\n"); - return -1; - } - if (mode_str.len) - buffer_mode = get_mode(&mode_str); - if (par_str.len) - field_parity = get_parity(&par_str); - - - if (dfb_params.len > 0) { - int argc = 2; - char arg0[10] = "mplayer"; - char *arg1 = malloc(dfb_params.len + 7); - char *argv[3]; - char **a; - - a = &argv[0]; - - strcpy(arg1, "--dfb:"); - strncat(arg1, dfb_params.str, dfb_params.len); - - argv[0] = arg0; - argv[1] = arg1; - argv[2] = NULL; - - DFBCHECK(DirectFBInit(&argc, &a)); - - free(arg1); - } else { - - DFBCHECK(DirectFBInit(NULL, NULL)); - } - - if (((directfb_major_version <= 0) && - (directfb_minor_version <= 9) && - (directfb_micro_version < 15))) { - mp_msg(MSGT_VO, MSGL_ERR, "DirectFB: Unsupported DirectFB version\n"); - return 1; - } - - /* - * (set options) - */ - -// uncomment this if you do not wish to create a new VT for DirectFB -// DFBCHECK (DirectFBSetOption ("no-vt-switch","")); - -// uncomment this if you want to allow VT switching -// DFBCHECK (DirectFBSetOption ("vt-switching","")); - -// uncomment this if you want to hide gfx cursor (req dfb >=0.9.9) - DFBCHECK(DirectFBSetOption("no-cursor", "")); - -// bg color fix - DFBCHECK(DirectFBSetOption("bg-color", "00000000")); - - /* - * (Initialize) - */ - - DFBCHECK(DirectFBCreate(&dfb)); - - /* - * (Get keyboard) - */ - - if (use_input) { - ret = dfb->GetInputDevice(dfb, DIDID_KEYBOARD, &keyboard); - if (ret == DFB_OK) - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Keyboard init OK\n"); - else { - keyboard = NULL; - mp_msg(MSGT_VO, MSGL_ERR, "DirectFB: Keyboard init FAILED\n"); - } - } - - - /* - * Create an input buffer for the keyboard. - */ - if (keyboard) - DFBCHECK(keyboard->CreateEventBuffer(keyboard, &buffer)); - - // just to start clean ... - if (buffer) - buffer->Reset(buffer); - - //mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Preinit OK\n"); - - return 0; - -} - -static DFBSurfacePixelFormat convformat(uint32_t format) -{ -// add more formats !!! - switch (format) { - case IMGFMT_RGB32: return DSPF_RGB32; - break; - case IMGFMT_BGR32: return DSPF_RGB32; - break; - case IMGFMT_RGB24: return DSPF_RGB24; - break; - case IMGFMT_BGR24: return DSPF_RGB24; - break; - case IMGFMT_RGB16: return DSPF_RGB16; - break; - case IMGFMT_BGR16: return DSPF_RGB16; - break; - case IMGFMT_RGB15: return DSPF_ARGB1555; - break; - case IMGFMT_BGR15: return DSPF_ARGB1555; - break; - case IMGFMT_RGB12: return DSPF_ARGB4444; - break; - case IMGFMT_BGR12: return DSPF_ARGB4444; - break; - case IMGFMT_YUY2: return DSPF_YUY2; - break; - case IMGFMT_UYVY: return DSPF_UYVY; - break; - case IMGFMT_YV12: return DSPF_YV12; - break; - case IMGFMT_I420: return DSPF_I420; - break; -// case IMGFMT_IYUV: return DSPF_IYUV; break; - case IMGFMT_RGB8: return DSPF_RGB332; - break; - case IMGFMT_BGR8: return DSPF_RGB332; - break; - - default: return 0; - } - return 0; -} - -typedef struct enum1_s { - uint32_t format; - int scale; - int result; - unsigned int id; - unsigned int width; - unsigned int height; - int setsize; -} enum1_t; - -static DFBEnumerationResult test_format_callback( - unsigned int id, - DFBDisplayLayerDescription - desc, - void *data) -{ - enum1_t *params = (enum1_t *)data; - IDirectFBDisplayLayer *layer; - DFBResult ret; - - if ((layer_id == -1) || (layer_id == id)) { - - ret = dfb->GetDisplayLayer(dfb, id, &layer); - if (ret) { - DirectFBError("dfb->GetDisplayLayer failed", ret); - return DFENUM_OK; - } else { - DFBDisplayLayerConfig dlc; - - if (params->setsize) { - dlc.flags = DLCONF_WIDTH | DLCONF_HEIGHT; - dlc.width = params->width; - dlc.height = params->height; - layer->SetConfiguration(layer, &dlc); - } - - - dlc.flags = DLCONF_PIXELFORMAT; - dlc.pixelformat = convformat(params->format); - - layer->SetOpacity(layer, 0); - - ret = layer->TestConfiguration(layer, &dlc, NULL); - - layer->Release(layer); - - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: Test format - layer %i scale/pos %i\n", id, - (desc.caps & DLCAPS_SCREEN_LOCATION)); - - if (ret == DFB_OK) { -// printf("Test OK\n"); - if (params->result) { - if ((!params->scale) && - (desc.caps & DLCAPS_SCREEN_LOCATION)) { - params->scale = 1; - params->id = id; - mp_msg( - MSGT_VO, MSGL_DBG2, - "DirectFB: Test format - added layer %i scale/pos %i\n", - id, (desc.caps & DLCAPS_SCREEN_LOCATION)); - } - } else { - params->result = 1; - params->id = id; - if (desc.caps & DLCAPS_SCREEN_LOCATION) - params->scale = 1; - mp_msg( - MSGT_VO, MSGL_DBG2, - "DirectFB: Test format - added layer %i scale/pos %i\n", - id, - (desc.caps & DLCAPS_SCREEN_LOCATION)); - }; - } - ; - }; - - } - ; - - return DFENUM_OK; -} - -static int query_format(uint32_t format) -{ - int ret = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD; // osd should be removed the in future -> will be handled outside... - enum1_t params; - - - if (!convformat(format)) - return 0; -// temporarily disable YV12 -// if (format == IMGFMT_YV12) return 0; -// if (format == IMGFMT_I420) return 0; - if (format == IMGFMT_IYUV) - return 0; - - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Format query: %s\n", - vo_format_name(format)); - - params.format = format; - params.scale = 0; - params.result = 0; - params.setsize = 0; - - DFBCHECK(dfb->EnumDisplayLayers(dfb, test_format_callback, ¶ms)); - - if (params.result) { - if (params.scale) - ret |= VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; - return ret; - } - - return 0; -} - -typedef struct videomode_s { - int width; - int height; - int out_width; - int out_height; - int overx; - int overy; - int bpp; -} videomode_t; - - -static DFBEnumerationResult video_modes_callback(int width, int height, - int bpp, void *data) -{ - videomode_t *params = (videomode_t *)data; - - int overx = 0, overy = 0, closer = 0, over = 0; - int we_are_under = 0; - -//mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Validator entered %i %i %i\n",width,height,bpp); - - overx = width - params->out_width; - overy = height - params->out_height; - - if (!params->width) { - params->width = width; - params->height = height; - params->overx = overx; - params->overy = overy; - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Mode added %i %i %i\n", width, - height, - bpp); - } - - if ((params->overy < 0) || (params->overx < 0)) - we_are_under = 1; // stored mode is smaller than req mode - if (abs(overx * overy) < abs(params->overx * params->overy)) - closer = 1; // current mode is closer to desired res - if ((overx >= 0) && (overy >= 0)) - over = 1; // current mode is bigger or equaul to desired res - if ((closer && (over || we_are_under)) || (we_are_under && over)) { - params->width = width; - params->height = height; - params->overx = overx; - params->overy = overy; - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Better mode added %i %i %i\n", - width, height, - bpp); - } - ; - - return DFENUM_OK; -} - -#define CONFIG_ERROR -1 - -static int config(struct vo *vo, uint32_t s_width, uint32_t s_height, - uint32_t d_width, uint32_t d_height, uint32_t flags, - uint32_t format) -{ - /* - * (Locals) - */ - -// decode flags - - int fs = flags & VOFLAG_FULLSCREEN; - int vm = flags & VOFLAG_MODESWITCHING; - - DFBSurfaceDescription dsc; - DFBResult ret; - DFBDisplayLayerConfig dlc; - DFBSurfaceCapabilities caps; - - enum1_t params; - - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Config entered [%ix%i]\n", s_width, - s_height); - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: With requested format: %s\n", - vo_format_name( - format)); - -// initial cleanup - if (frame) { - frame->Release(frame); - frame = NULL; - } - - if (primary) { - primary->Release(primary); - primary = NULL; - } - - if (layer) { - layer->Release(layer); - layer = NULL; - } - - -// vm things - - if (vm) { - videomode_t params; - params.out_width = d_width; - params.out_height = d_height; - params.width = 0; - params.height = 0; - switch (format) { - case IMGFMT_RGB32: - case IMGFMT_BGR32: - params.bpp = 32; - break; - case IMGFMT_RGB24: - case IMGFMT_BGR24: - params.bpp = 24; - break; - case IMGFMT_RGB16: - case IMGFMT_BGR16: - case IMGFMT_RGB15: - case IMGFMT_BGR15: - case IMGFMT_RGB12: - case IMGFMT_BGR12: - params.bpp = 16; - break; - default: params.bpp = 0; - - } - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: Config - trying to change videomode\n"); - DFBCHECK(dfb->EnumVideoModes(dfb, video_modes_callback, ¶ms)); - ret = dfb->SetVideoMode(dfb, params.width, params.height, params.bpp); - if (ret) { - ret = dfb->SetVideoMode(dfb, params.width, params.height, 24); - if (ret) { - ret = dfb->SetVideoMode(dfb, params.width, params.height, 32); - if (ret) { - ret = dfb->SetVideoMode(dfb, params.width, params.height, - 16); - if (ret) - ret = - dfb->SetVideoMode(dfb, params.width, params.height, - 8); - } - } - } - } // vm end - -// just to be sure clear primary layer - ret = dfb->GetDisplayLayer(dfb, DLID_PRIMARY, &layer); - if (ret == DFB_OK) { - ret = layer->GetSurface(layer, &primary); - if (ret == DFB_OK) { - primary->Clear(primary, 0, 0, 0, 0xff); - ret = primary->Flip(primary, NULL, 0); - if (ret == DFB_OK) - primary->Clear(primary, 0, 0, 0, 0xff); - primary->Release(primary); - } - primary = NULL; - layer->Release(layer); - } - layer = NULL; - -// find best layer - - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: Config - looking for suitable layer\n"); - params.format = format; - params.scale = 0; - params.result = 0; - params.width = s_width; - params.height = s_height; - params.setsize = 1; - - DFBCHECK(dfb->EnumDisplayLayers(dfb, test_format_callback, ¶ms)); - - if (!params.result) { - mp_msg(MSGT_VO, MSGL_ERR, - "DirectFB: ConfigError - no suitable layer found\n"); - params.id = DLID_PRIMARY; - } - - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Config - layer %i\n", params.id); - - // setup layer - - DFBCHECK(dfb->GetDisplayLayer(dfb, params.id, &layer)); - - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: Config - switching layer to exclusive mode\n"); - ret = layer->SetCooperativeLevel(layer, DLSCL_EXCLUSIVE); - - if (DFB_OK != ret) { - mp_msg( - MSGT_VO, MSGL_WARN, - "DirectFB: Warning - cannot switch layer to exclusive mode. This could cause\nproblems. You may need to select correct pixel format manually!\n"); - DirectFBError("MPlayer - Switch layer to exlusive mode.", ret); - } - ; - if (params.scale) { - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: Config - changing layer configuration (size)\n"); - dlc.flags = DLCONF_WIDTH | DLCONF_HEIGHT; - dlc.width = s_width; - dlc.height = s_height; - - ret = layer->SetConfiguration(layer, &dlc); - - if (ret) { - mp_msg(MSGT_VO, MSGL_ERR, - "DirectFB: ConfigError in layer configuration (size)\n"); - DirectFBError("MPlayer - Layer size change.", ret); - } - ; - } - - // look if we need to change the pixel format of the layer - // and just to be sure also fetch all layer properties - dlc.flags = DLCONF_PIXELFORMAT | DLCONF_WIDTH | DLCONF_HEIGHT | - DLCONF_OPTIONS | DLCONF_BUFFERMODE; - - ret = layer->GetConfiguration(layer, &dlc); - - dlc.flags = DLCONF_PIXELFORMAT | DLCONF_WIDTH | DLCONF_HEIGHT; - - if (ret) - mp_msg(MSGT_VO, MSGL_WARN, - "DirectFB: Warning - could not get layer properties!\n"); - else - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Layer reports format:%x\n", - dlc.pixelformat); - - if ((dlc.pixelformat != convformat(params.format)) || (ret != DFB_OK)) { - - dlc.flags = DLCONF_PIXELFORMAT; - dlc.pixelformat = convformat(params.format); - - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Desired pixelformat: %x\n", - dlc.pixelformat); - - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: Config - changing layer configuration (format)\n"); - ret = layer->SetConfiguration(layer, &dlc); - - if (ret) { - unsigned int bpp; - mp_msg( - MSGT_VO, MSGL_ERR, - "DirectFB: ConfigError in layer configuration (format, flags=%x)\n", - dlc.flags); - DirectFBError("MPlayer - layer pixelformat change", ret); - - // ugly fbdev workaround - try to switch pixelformat via videomode change - switch (dlc.pixelformat) { - case DSPF_ARGB: - case DSPF_RGB32: bpp = 32; - break; - case DSPF_RGB24: bpp = 24; - break; - case DSPF_RGB16: bpp = 16; - break; - case DSPF_ARGB1555: bpp = 15; - break; - case DSPF_ARGB4444: bpp = 12; - break; - case DSPF_RGB332: bpp = 8; - break; - } - - switch (dlc.pixelformat) { - case DSPF_ARGB: - case DSPF_RGB32: - case DSPF_RGB24: - case DSPF_RGB16: - case DSPF_ARGB1555: - case DSPF_ARGB4444: - case DSPF_RGB332: - mp_msg( - MSGT_VO, MSGL_V, - "DirectFB: Trying to recover via videomode change (VM).\n"); - // get size - dlc.flags = DLCONF_WIDTH | DLCONF_HEIGHT; - if (DFB_OK == layer->GetConfiguration(layer, &dlc)) { - // try to set videomode - mp_msg(MSGT_VO, MSGL_V, - "DirectFB: Videomode %ix%i BPP %i\n", dlc.width, - dlc.height, - bpp); - ret = dfb->SetVideoMode(dfb, dlc.width, dlc.height, bpp); - if (ret) - DirectFBError("MPlayer - VM - pixelformat change", ret); - - } - ; - - //get current pixel format - dlc.flags = DLCONF_PIXELFORMAT; - ret = layer->GetConfiguration(layer, &dlc); - if (ret) - DirectFBError("MPlayer - VM - Layer->GetConfiguration", ret); - else - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: Layer now has pixelformat [%x]\n", - dlc.pixelformat); - ; - - // check if we were succesful - if ((dlc.pixelformat != convformat(params.format)) || - (ret != DFB_OK)) { - mp_msg(MSGT_VO, MSGL_INFO, "DirectFB: Recovery failed!.\n"); - return CONFIG_ERROR; - } - - break; - - default: return CONFIG_ERROR; - - } - ; - } - ; - } - ; - -// flipping of layer -// try triple, double... buffering - - dlc.flags = DLCONF_BUFFERMODE; -#ifdef TRIPLE - if (buffer_mode > 2) { - dlc.buffermode = DLBM_TRIPLE; - ret = layer->SetConfiguration(layer, &dlc); - } else - ret = !DFB_OK; - - if (ret != DFB_OK) { -#endif - if (buffer_mode > 1) { - dlc.buffermode = DLBM_BACKVIDEO; - ret = layer->SetConfiguration(layer, &dlc); - if (ret != DFB_OK) { - dlc.buffermode = DLBM_BACKSYSTEM; - ret = layer->SetConfiguration(layer, &dlc); - } - } - if (ret == DFB_OK) - mp_msg(MSGT_VO, MSGL_V, "DirectFB: Double buffering is active\n"); - -#ifdef TRIPLE -} else - mp_msg(MSGT_VO, MSGL_V, "DirectFB: Triple buffering is active\n"); - -#endif - - if (field_parity != -1) { - dlc.flags = DLCONF_OPTIONS; - ret = layer->GetConfiguration(layer, &dlc); - if (ret == DFB_OK) { - dlc.options |= DLOP_FIELD_PARITY; - ret = layer->SetConfiguration(layer, &dlc); - if (ret == DFB_OK) - layer->SetFieldParity(layer, field_parity); - } - } - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Requested field parity: "); - switch (field_parity) { - case -1: - mp_msg(MSGT_VO, MSGL_DBG2, "Don't care\n"); - break; - case 0: - mp_msg(MSGT_VO, MSGL_DBG2, "Top field first\n"); - break; - case 1: - mp_msg(MSGT_VO, MSGL_DBG2, "Bottom field first\n"); - break; - } - -// get layer surface - - ret = layer->GetSurface(layer, &primary); - - if (ret) { - mp_msg(MSGT_VO, MSGL_ERR, - "DirectFB: ConfigError - could not get surface\n"); - return CONFIG_ERROR; // what shall we report on failure? - } - -// test surface for flipping - DFBCHECK(primary->GetCapabilities(primary, &caps)); - primary->Clear(primary, 0, 0, 0, 0xff); - flipping = 0; - if (caps & (DSCAPS_FLIPPING -#ifdef TRIPLE - | DSCAPS_TRIPLE -#endif - )) { - ret = primary->Flip(primary, NULL, 0); - if (ret == DFB_OK) { - flipping = 1; - primary->Clear(primary, 0, 0, 0, 0xff); -#ifdef TRIPLE -// if we have 3 buffers clean once more - if (caps & DSCAPS_TRIPLE) { - primary->Flip(primary, NULL, 0); - primary->Clear(primary, 0, 0, 0, 0xff); - flipping = 2; - } -#endif - } - } - ; - - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Config - flipping = %i\n", flipping); - -// is scale needed ? Aspect ratio and layer pos/size - - - // get surface size - DFBCHECK(primary->GetSize(primary, &width, &height)); - - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Config - surface size = %ix%i\n", - width, - height); - - aspect_save_orig(vo, s_width, s_height); - aspect_save_prescale(vo, d_width, d_height); - if (params.scale) { - aspect_save_screenres(vo, 10000, 10000); - aspect(vo, &out_width, &out_height, A_ZOOM); - - ret = - layer->SetScreenLocation(layer, (1 - (float)out_width / 10000) / 2, - (1 - (float)out_height / 10000) / 2, - ((float)out_width / 10000), - ((float)out_height / 10000)); - - if (ret) - mp_msg(MSGT_VO, MSGL_ERR, - "DirectFB: ConfigError in layer configuration (position)\n"); - - xoffset = 0; - yoffset = 0; - - } else { - - aspect_save_screenres(vo, width, height); - - if (fs) /* -fs */ - aspect(vo, &out_width, &out_height, A_ZOOM); - else - aspect(vo, &out_width, &out_height, A_NOZOOM); - - - xoffset = (width - out_width) / 2; - yoffset = (height - out_height) / 2; - } - - if (((s_width == out_width) && (s_height == out_height)) || (params.scale)) - stretch = 0; - else - stretch = 1; - - -// temporary buffer in case of not flipping or scaling - if ((!flipping) || stretch) { - - DFBCHECK(primary->GetPixelFormat(primary, &dsc.pixelformat)); - - dsc.flags = DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_WIDTH; - - dsc.width = s_width; - dsc.height = s_height; - - DFBCHECK(dfb->CreateSurface(dfb, &dsc, &frame)); - DFBCHECK(frame->GetSize(frame, &width, &height)); - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Frame is active.\n"); - } - -// get format for draw_alpha - should be removed soon - osd will be rendered outside vo driver - if (frame) - DFBCHECK(frame->GetPixelFormat(frame, &pixel_format)); - else - DFBCHECK(primary->GetPixelFormat(primary, &pixel_format)); - - // finally turn on layer - layer->SetOpacity(layer, 255); - - //mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Config finished [%ix%i] - [%ix%i]\n",out_width,out_height,width,height); - - return 0; -} - -static int to_mp_key(int sym) -{ - switch (sym) { - case DIKS_ESCAPE: return KEY_ESC; - case DIKS_PAGE_UP: return KEY_PAGE_UP; - case DIKS_PAGE_DOWN: return KEY_PAGE_DOWN; - case DIKS_CURSOR_UP: return KEY_UP; - case DIKS_CURSOR_DOWN: return KEY_DOWN; - case DIKS_CURSOR_LEFT: return KEY_LEFT; - case DIKS_CURSOR_RIGHT: return KEY_RIGHT; - case DIKS_INSERT: return KEY_INSERT; - case DIKS_DELETE: return KEY_DELETE; - case DIKS_HOME: return KEY_HOME; - case DIKS_END: return KEY_END; - default: return sym; - } -} - -static void check_events(struct vo *vo) -{ - - if (buffer) { - - DFBInputEvent event; - -//if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf ("DirectFB: Check events entered\n"); - if (buffer->GetEvent(buffer, DFB_EVENT(&event)) == DFB_OK) { - - if (event.type == DIET_KEYPRESS) { - mplayer_put_key(vo->key_fifo, to_mp_key(event.key_symbol)); - } - } -// empty buffer, because of repeating (keyboard repeat is faster than key handling -// and this causes problems during seek) -// temporary workaround should be solved in the future - buffer->Reset(buffer); - - } -//if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf ("DirectFB: Check events finished\n"); -} - -static void flip_page(struct vo *vo) -{ - DFBSurfaceBlittingFlags flags = DSBLIT_NOFX; - - unlock(); // unlock frame & primary - -// if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Flip page entered"); - - DFBCHECK(primary->SetBlittingFlags(primary, flags)); - - if (frame) { - if (stretch) { - DFBRectangle rect; - rect.x = xoffset; - rect.y = yoffset; - rect.w = out_width; - rect.h = out_height; - - DFBCHECK(primary->StretchBlit(primary, frame, NULL, &rect)); - - } else { - - DFBCHECK(primary->Blit(primary, frame, NULL, xoffset, yoffset)); - - }; - } - ; - - -#ifdef TRIPLE - switch (flipping) { - case 1: DFBCHECK(primary->Flip(primary, NULL, DSFLIP_WAIT)); - break; - case 2: DFBCHECK(primary->Flip(primary, NULL, DSFLIP_ONSYNC)); - break; - default:; // should never be reached - } -#else - if (flipping) - DFBCHECK(primary->Flip(primary, NULL, DSFLIP_WAITFORSYNC)); - -#endif - -} - - - -static void uninit(struct vo *vo) -{ - - //mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Uninit entered\n"); - - unlock(); - - /* - * (Release) - */ -/* - mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Releasing buffer\n"); - if (buffer) buffer->Release (buffer); - mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Releasing keyboard\n"); - if (keyboard) keyboard->Release (keyboard); - */ - if (frame) { - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Releasing frame\n"); - frame->Release(frame); - frame = NULL; - } - ; - -// switch off BES -// if (layer) layer->SetOpacity(layer,0); - - if (layer) { - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Releasing layer\n"); - layer->Release(layer); - layer = NULL; - } - - if (primary) { - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: Releasing primary\n"); - primary->Release(primary); - primary = NULL; - } - - -/* mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Releasing DirectFB library\n"); - - dfb->Release (dfb); - */ -//mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Uninit done.\n"); -} - - -static uint32_t directfb_set_video_eq(const char *data, int value) //data==name -{ - - DFBColorAdjustment ca; - float factor = (float)0xffff / 200.0; - - DFBDisplayLayerDescription desc; - - unlock(); - - if (layer) { - - layer->GetDescription(layer, &desc); - - ca.flags = DCAF_NONE; - - if (!strcmp(data, "brightness")) { - if (desc.caps & DLCAPS_BRIGHTNESS) { - ca.brightness = value * factor + 0x8000; - ca.flags |= DCAF_BRIGHTNESS; - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: SetVEq Brightness 0x%X %i\n", ca.brightness, - value); - } else - return VO_FALSE; - } - - if (!strcmp(data, "contrast")) { - if ((desc.caps & DLCAPS_CONTRAST)) { - ca.contrast = value * factor + 0x8000; - ca.flags |= DCAF_CONTRAST; - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: SetVEq Contrast 0x%X %i\n", ca.contrast, - value); - } else - return VO_FALSE; - } - - if (!strcmp(data, "hue")) { - if ((desc.caps & DLCAPS_HUE)) { - ca.hue = value * factor + 0x8000; - ca.flags |= DCAF_HUE; - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: SetVEq Hue 0x%X %i\n", - ca.hue, - value); - } else - return VO_FALSE; - } - - if (!strcmp(data, "saturation")) { - if ((desc.caps & DLCAPS_SATURATION)) { - ca.saturation = value * factor + 0x8000; - ca.flags |= DCAF_SATURATION; - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: SetVEq Saturation 0x%X %i\n", ca.saturation, - value); - } else - return VO_FALSE; - } - - if (ca.flags != DCAF_NONE) { - layer->SetColorAdjustment(layer, &ca); - return VO_TRUE; - } - } - - return VO_FALSE; - -} - -static uint32_t directfb_get_video_eq(const char *data, int *value) // data==name -{ - - DFBColorAdjustment ca; - float factor = 200.0 / (float)0xffff; - - DFBDisplayLayerDescription desc; - - if (layer) { - - unlock(); - - layer->GetDescription(layer, &desc); - - layer->GetColorAdjustment(layer, &ca); - - if (!strcmp(data, "brightness")) { - if (desc.caps & DLCAPS_BRIGHTNESS) { - *value = (int) ((ca.brightness - 0x8000) * factor); - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: GetVEq Brightness 0x%X %i\n", ca.brightness, - *value); - return VO_TRUE; - } else - return VO_FALSE; - } - - if (!strcmp(data, "contrast")) { - if ((desc.caps & DLCAPS_CONTRAST)) { - *value = (int) ((ca.contrast - 0x8000) * factor); - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: GetVEq Contrast 0x%X %i\n", ca.contrast, - *value); - return VO_TRUE; - } else - return VO_FALSE; - } - - if (!strcmp(data, "hue")) { - if ((desc.caps & DLCAPS_HUE)) { - *value = (int) ((ca.hue - 0x8000) * factor); - mp_msg(MSGT_VO, MSGL_DBG2, "DirectFB: GetVEq Hue 0x%X %i\n", - ca.hue, - *value); - return VO_TRUE; - } else - return VO_FALSE; - } - - if (!strcmp(data, "saturation")) { - if ((desc.caps & DLCAPS_SATURATION)) { - *value = (int) ((ca.saturation - 0x8000) * factor); - mp_msg(MSGT_VO, MSGL_DBG2, - "DirectFB: GetVEq Saturation 0x%X %i\n", ca.saturation, - *value); - return VO_TRUE; - } else - return VO_FALSE; - } - } - return VO_FALSE; -} - -static int draw_slice(struct vo *vo, uint8_t *src[], int stride[], - int w, int h, int x, int y) -{ - int i; - unsigned int pitch; - uint8_t *dst; - uint8_t *dst2; - uint8_t *srcp; - unsigned int p; - -// if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: draw_slice entered\n"); - - unlock(); - - if (frame) { - DFBCHECK(frame->Lock(frame, DSLF_WRITE | DSLF_READ, (void *)&dst, - &pitch)); - framelocked = 1; - } else { - DFBCHECK(primary->Lock(primary, DSLF_WRITE, (void *)&dst, &pitch)); - primarylocked = 1; - }; - - p = FFMIN(w, pitch); - - dst += y * pitch + x; - dst2 = dst + pitch * height - y * pitch + y * pitch / 4 - x / 2; - srcp = src[0]; - - for (i = 0; i < h; i++) { - fast_memcpy(dst, srcp, p); - dst += pitch; - srcp += stride[0]; - } - - if (pixel_format == DSPF_YV12) { - - dst = dst2; - srcp = src[2]; - p = p / 2; - - for (i = 0; i < h / 2; i++) { - fast_memcpy(dst, srcp, p); - dst += pitch / 2; - srcp += stride[2]; - } - - dst = dst2 + pitch * height / 4; - srcp = src[1]; - - for (i = 0; i < h / 2; i++) { - fast_memcpy(dst, srcp, p); - dst += pitch / 2; - srcp += stride[1]; - } - - } else { - - dst = dst2; - srcp = src[1]; - p = p / 2; - - for (i = 0; i < h / 2; i++) { - fast_memcpy(dst, srcp, p); - dst += pitch / 2; - srcp += stride[1]; - } - - dst = dst2 + pitch * height / 4; - srcp = src[2]; - - for (i = 0; i < h / 2; i++) { - fast_memcpy(dst, srcp, p); - dst += pitch / 2; - srcp += stride[2]; - } - - } - - unlock(); - - return 0; -} - - -static uint32_t put_image(mp_image_t *mpi) -{ - - -// static IDirectFBSurface *tmp = NULL; -// DFBSurfaceDescription dsc; -// DFBRectangle rect; - -// if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image entered %i %i %i %i %i %i\n",mpi->x,mpi->y,mpi->w,mpi->h,mpi->width,mpi->height); - - unlock(); - - // already out? - if ((mpi->flags & (MP_IMGFLAG_DIRECT | MP_IMGFLAG_DRAW_CALLBACK))) { -// if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image - nothing to do\n"); - return VO_TRUE; - } - - if (mpi->flags & MP_IMGFLAG_PLANAR) { - // memcpy all planes - sad but necessary - int i; - unsigned int pitch; - uint8_t *dst; - uint8_t *src; - unsigned int p; - -// if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image - planar branch\n"); - if (frame) { - DFBCHECK(frame->Lock(frame, DSLF_WRITE | DSLF_READ, (void *)&dst, - &pitch)); - framelocked = 1; - } else { - DFBCHECK(primary->Lock(primary, DSLF_WRITE, (void *)&dst, &pitch)); - primarylocked = 1; - }; - - p = FFMIN(mpi->w, pitch); - - src = mpi->planes[0]; - - for (i = 0; i < mpi->h; i++) - fast_memcpy(dst + i * pitch, src + i * mpi->stride[0], p); - - - if (pixel_format == DSPF_YV12) { - - dst += pitch * height; - p = p / 2; - src = mpi->planes[2]; - - for (i = 0; i < mpi->h / 2; i++) - fast_memcpy(dst + i * pitch / 2, src + i * mpi->stride[2], p); - - dst += pitch * height / 4; - src = mpi->planes[1]; - - for (i = 0; i < mpi->h / 2; i++) - fast_memcpy(dst + i * pitch / 2, src + i * mpi->stride[1], p); - - } else { - - dst += pitch * height; - p = p / 2; - src = mpi->planes[1]; - - for (i = 0; i < mpi->h / 2; i++) - fast_memcpy(dst + i * pitch / 2, src + i * mpi->stride[1], p); - - dst += pitch * height / 4; - src = mpi->planes[2]; - - for (i = 0; i < mpi->h / 2; i++) - fast_memcpy(dst + i * pitch / 2, src + i * mpi->stride[2], p); - - } - unlock(); - - } else { -// I had to disable native directfb blit because it wasn't working under some conditions :-( - -/* - dsc.flags = DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_WIDTH | DSDESC_PREALLOCATED; - dsc.preallocated[0].data = mpi->planes[0]; - dsc.preallocated[0].pitch = mpi->stride[0]; - dsc.width = mpi->width; - dsc.height = mpi->height; - dsc.pixelformat = convformat(mpi->imgfmt); - - DFBCHECK (dfb->CreateSurface( dfb, &dsc, &tmp)); - - rect.x=mpi->x; - rect.y=mpi->y; - rect.w=mpi->w; - rect.h=mpi->h; - - if (frame) { - DFBCHECK (tmp->Blit(tmp,frame,&rect,0,0)); - } else { - DFBCHECK (tmp->Blit(tmp,primary,&rect,xoffset,yoffset)); - }; - tmp->Release(tmp); - */ - - unsigned int pitch; - uint8_t *dst; - -// if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image - non-planar branch\n"); - if (frame) { - DFBCHECK(frame->Lock(frame, DSLF_WRITE, (void *)&dst, &pitch)); - framelocked = 1; - mem2agpcpy_pic(dst, mpi->planes[0], mpi->w * (mpi->bpp >> 3), - mpi->h, pitch, - mpi->stride[0]); - } else { - DFBCHECK(primary->Lock(primary, DSLF_WRITE, (void *)&dst, &pitch)); - primarylocked = 1; - mem2agpcpy_pic(dst + yoffset * pitch + xoffset * (mpi->bpp >> 3), - mpi->planes[0], mpi->w * (mpi->bpp >> 3), mpi->h, - pitch, - mpi->stride[0]); - }; - unlock(); - - } - return VO_TRUE; -} - - - -static int control(struct vo *vo, uint32_t request, void *data) -{ - switch (request) { - case VOCTRL_QUERY_FORMAT: - return query_format(*((uint32_t *)data)); - case VOCTRL_DRAW_IMAGE: - return put_image(data); - case VOCTRL_SET_EQUALIZER: - { - struct voctrl_set_equalizer_args *args = data; - return directfb_set_video_eq(args->name, args->value); - } - case VOCTRL_GET_EQUALIZER: - { - struct voctrl_get_equalizer_args *args = data; - return directfb_get_video_eq(args->name, args->valueptr); - } - } - ; - return VO_NOTIMPL; -} - -// hopefully will be removed soon - -static void draw_osd_elem(void *ctx, int x0, int y0, int w, int h, - unsigned char *src, unsigned char *srca, int stride) -{ - void *dst; - int pitch; - - unlock(); // isn't it silly I have to unlock surface and then lock it again :-) - - if (frame) { - DFBCHECK(frame->Lock(frame, DSLF_WRITE | DSLF_READ, &dst, &pitch)); - framelocked = 1; - } else { - DFBCHECK(primary->Lock(primary, DSLF_WRITE, &dst, &pitch)); - primarylocked = 1; - }; - - switch (pixel_format) { - case DSPF_RGB32: - case DSPF_ARGB: - vo_draw_alpha_rgb32(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 4 * x0, pitch); - break; - - case DSPF_RGB24: - vo_draw_alpha_rgb24(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 3 * x0, pitch); - break; - - case DSPF_RGB16: - vo_draw_alpha_rgb16(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 2 * x0, pitch); - break; - case DSPF_ARGB1555: - vo_draw_alpha_rgb15(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 2 * x0, pitch); - break; - case DSPF_ARGB4444: - vo_draw_alpha_rgb12(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 2 * x0, pitch); - break; - - case DSPF_YUY2: - vo_draw_alpha_yuy2(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 2 * x0, pitch); - break; - - case DSPF_UYVY: - vo_draw_alpha_yuy2(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 2 * x0 + 1, pitch); - break; - - case DSPF_I420: - case DSPF_YV12: - vo_draw_alpha_yv12(w, h, src, srca, stride, - ((uint8_t *) dst) + pitch * y0 + 1 * x0, pitch); - break; - } - - unlock(); -} - -static void draw_osd(struct vo *vo, struct osd_state *osd) -{ - osd_draw_text(osd, width, height, draw_osd_elem, NULL); -} - -const struct vo_driver video_out_directfb = { - .is_new = false, - .info = &(const vo_info_t) { - "Direct Framebuffer Device", - "directfb", - "Jiri Svoboda Jiri.Svoboda@seznam.cz", - "v 2.0 (for DirectFB version >=0.9.22)" - }, - .preinit = preinit, - .config = config, - .control = control, - .draw_slice = draw_slice, - .draw_osd = draw_osd, - .flip_page = flip_page, - .check_events = check_events, - .uninit = uninit, -}; diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c deleted file mode 100644 index 198e64b39b..0000000000 --- a/libvo/vo_directx.c +++ /dev/null @@ -1,1143 +0,0 @@ -/* - * Directx v2 or later DirectDraw interface - * - * Copyright (c) 2002 - 2005 Sascha Sommer - * - * 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 -#include -#include -#include -#include -#include -#include -#include "config.h" -#include "video_out.h" -#include "fastmemcpy.h" -#include "mp_msg.h" -#include "aspect.h" -#include "sub/sub.h" -#include "w32_common.h" -#include "libmpcodecs/vfcap.h" -#include "libmpcodecs/mp_image.h" -#include "osd.h" -#include "options.h" - -static struct vo *dx_vo; - -#define vo_w32_window (dx_vo->w32->window) - -static LPDIRECTDRAWCOLORCONTROL g_cc = NULL; //color control interface -static LPDIRECTDRAW7 g_lpdd = NULL; //DirectDraw Object -static LPDIRECTDRAWSURFACE7 g_lpddsPrimary = NULL; //Primary Surface: viewport through the Desktop -static LPDIRECTDRAWSURFACE7 g_lpddsOverlay = NULL; //Overlay Surface -static LPDIRECTDRAWSURFACE7 g_lpddsBack = NULL; //Back surface -static LPDIRECTDRAWCLIPPER g_lpddclipper; //clipper object, can only be used without overlay -static DDSURFACEDESC2 ddsdsf; //surface descripiton needed for locking -static HINSTANCE hddraw_dll; //handle to ddraw.dll -static RECT rd; //rect of our stretched image -static RECT rs; //rect of our source image -static HBRUSH colorbrush = NULL; // Handle to colorkey brush -static HBRUSH blackbrush = NULL; // Handle to black brush -static uint32_t image_width, image_height; //image width and height -static uint8_t *image = NULL; //image data -static void *tmp_image = NULL; -static uint32_t image_format = 0; //image format -static uint32_t primary_image_format; -static uint32_t vm_height = 0; -static uint32_t vm_width = 0; -static uint32_t vm_bpp = 0; -static uint32_t dstride; //surface stride -static uint32_t nooverlay = 0; //NonOverlay mode -static DWORD destcolorkey; //colorkey for our surface -static COLORREF windowcolor = RGB(0, 0, 16); //windowcolor == colorkey -static int adapter_count = 0; -static GUID selected_guid; -static GUID *selected_guid_ptr = NULL; - -/***************************************************************************** - * DirectDraw GUIDs. - * Defining them here allows us to get rid of the dxguid library during - * the linking stage. - *****************************************************************************/ -#define IID_IDirectDraw7 MP_IID_IDirectDraw7 -static const GUID MP_IID_IDirectDraw7 = { - 0x15e65ec0, 0x3b9c, 0x11d2, { 0xb9, 0x2f, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b } -}; - -#define IID_IDirectDrawColorControl MP_IID_IDirectDrawColorControl -static const GUID MP_IID_IDirectDrawColorControl = { - 0x4b9f0ee0, 0x0d7e, 0x11d0, { 0x9b, 0x06, 0x00, 0xa0, 0xc9, 0x03, 0xa3, 0xb8 } -}; - -struct directx_fourcc_caps { - char img_format_name[6]; //human readable name - uint32_t img_format; //as MPlayer image format - DDPIXELFORMAT g_ddpfOverlay; //as Directx Sourface description -} static const g_ddpf[] = { - { "YV12 ", IMGFMT_YV12, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'V', '1', '2'), 0, 0, 0, 0, 0 } }, - { "I420 ", IMGFMT_I420, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('I', '4', '2', '0'), 0, 0, 0, 0, 0 } }, //yv12 with swapped uv - { "IYUV ", IMGFMT_IYUV, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('I', 'Y', 'U', 'V'), 0, 0, 0, 0, 0 } }, //same as i420 - { "YVU9 ", IMGFMT_YVU9, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'V', 'U', '9'), 0, 0, 0, 0, 0 } }, - { "YUY2 ", IMGFMT_YUY2, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'U', 'Y', '2'), 0, 0, 0, 0, 0 } }, - { "UYVY ", IMGFMT_UYVY, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('U', 'Y', 'V', 'Y'), 0, 0, 0, 0, 0 } }, - { "BGR8 ", IMGFMT_BGR8, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 8, 0x00000000, 0x00000000, 0x00000000, 0 } }, - { "RGB15", IMGFMT_RGB15, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000001F, 0x000003E0, 0x00007C00, 0 } }, //RGB 5:5:5 - { "BGR15", IMGFMT_BGR15, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x00007C00, 0x000003E0, 0x0000001F, 0 } }, - { "RGB16", IMGFMT_RGB16, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000001F, 0x000007E0, 0x0000F800, 0 } }, //RGB 5:6:5 - { "BGR16", IMGFMT_BGR16, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000F800, 0x000007E0, 0x0000001F, 0 } }, - { "RGB24", IMGFMT_RGB24, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24, 0x000000FF, 0x0000FF00, 0x00FF0000, 0 } }, - { "BGR24", IMGFMT_BGR24, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24, 0x00FF0000, 0x0000FF00, 0x000000FF, 0 } }, - { "RGB32", IMGFMT_RGB32, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x000000FF, 0x0000FF00, 0x00FF0000, 0 } }, - { "BGR32", IMGFMT_BGR32, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0 } } -}; -#define NUM_FORMATS (sizeof(g_ddpf) / sizeof(g_ddpf[0])) - -// what hw supports with corresponding format in g_ddpf -static uint32_t drv_caps[NUM_FORMATS]; - -static void draw_osd_elem(void *ctx, int x0, int y0, int w, int h, - unsigned char *src, unsigned char *srca, int stride) -{ - switch (image_format) { - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - case IMGFMT_YVU9: - vo_draw_alpha_yv12(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + x0, dstride); - break; - case IMGFMT_YUY2: - vo_draw_alpha_yuy2(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride); - break; - case IMGFMT_UYVY: - vo_draw_alpha_yuy2(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0 + 1, dstride); - break; - case IMGFMT_RGB15: - case IMGFMT_BGR15: - vo_draw_alpha_rgb15(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride); - break; - case IMGFMT_RGB16: - case IMGFMT_BGR16: - vo_draw_alpha_rgb16(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride); - break; - case IMGFMT_RGB24: - case IMGFMT_BGR24: - vo_draw_alpha_rgb24(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 4 * x0, dstride); - break; - case IMGFMT_RGB32: - case IMGFMT_BGR32: - vo_draw_alpha_rgb32(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 4 * x0, dstride); - break; - } -} - -static void draw_osd(struct vo *vo, struct osd_state *osd) -{ - osd_draw_text(osd, image_width, image_height, draw_osd_elem, NULL); -} - -static int query_format(struct vo *vo, uint32_t format) -{ - int i; - for (i = 0; i < NUM_FORMATS; i++) - if (g_ddpf[i].img_format == format) - return drv_caps[i]; - return 0; -} - -struct errmap { - HRESULT err; - const char *errstr; -} static const dd_errmap[] = { - {DDERR_INCOMPATIBLEPRIMARY, "incompatible primary surface"}, - {DDERR_INVALIDCAPS, "invalid caps"}, - {DDERR_INVALIDOBJECT, "invalid object"}, - {DDERR_INVALIDPARAMS, "invalid parameters"}, - {DDERR_INVALIDRECT, "invalid rectangle"}, - {DDERR_INVALIDSURFACETYPE, "invalid surfacetype"}, - {DDERR_NODIRECTDRAWHW, "no directdraw hardware"}, - {DDERR_NOEMULATION, "can't emulate"}, - {DDERR_NOFLIPHW, "hardware can't do flip"}, - {DDERR_NOOVERLAYHW, "hardware can't do overlay"}, - {DDERR_NOSTRETCHHW, "hardware can't stretch: try to size the window back"}, - {DDERR_OUTOFMEMORY, "not enough system memory"}, - {DDERR_OUTOFVIDEOMEMORY, "not enough video memory"}, - {DDERR_UNSUPPORTED, "unsupported"}, - {DDERR_UNSUPPORTEDMODE, "unsupported mode"}, - {DDERR_HEIGHTALIGN, "height align"}, - {DDERR_XALIGN, "x align"}, - {DDERR_SURFACELOST, "surfaces lost"}, - {0, NULL} -}; - -static const char *dd_errstr(HRESULT res) -{ - int i; - for (i = 0; dd_errmap[i].errstr; i++) - if (dd_errmap[i].err == res) - return dd_errmap[i].errstr; - return "unknown error"; -} - -static uint32_t Directx_CreatePrimarySurface(void) -{ - DDSURFACEDESC2 ddsd = { .dwSize = sizeof(ddsd) }; - //cleanup - if (g_lpddsPrimary) - g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); - g_lpddsPrimary = NULL; - - if (dx_vo->opts->vidmode) - g_lpdd->lpVtbl->SetDisplayMode(g_lpdd, vm_width, vm_height, vm_bpp, vo_refresh_rate, 0); - //set flags and create a primary surface. - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsd, &g_lpddsPrimary, NULL) == DD_OK) - mp_msg(MSGT_VO, MSGL_DBG3, "primary surface created\n"); - else { - mp_msg(MSGT_VO, MSGL_FATAL, "could not create primary surface\n"); - return 1; - } - return 0; -} - -static uint32_t Directx_CreateOverlay(uint32_t imgfmt) -{ - HRESULT ddrval; - DDSURFACEDESC2 ddsdOverlay = { - .dwSize = sizeof(ddsdOverlay), - .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_VIDEOMEMORY, - .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_BACKBUFFERCOUNT | DDSD_PIXELFORMAT, - .dwWidth = image_width, - .dwHeight = image_height, - .dwBackBufferCount = 2, - }; - uint32_t i = 0; - while (i < NUM_FORMATS && imgfmt != g_ddpf[i].img_format) - i++; - if (!g_lpdd || !g_lpddsPrimary || i == NUM_FORMATS) - return 1; - //cleanup - if (g_lpddsOverlay) - g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); - if (g_lpddsBack) - g_lpddsBack->lpVtbl->Release(g_lpddsBack); - g_lpddsOverlay = NULL; - g_lpddsBack = NULL; - //create our overlay - ddsdOverlay.ddpfPixelFormat = g_ddpf[i].g_ddpfOverlay; - if (vo_doublebuffering) { //tribblebuffering - if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL) == DD_OK) { - mp_msg(MSGT_VO, MSGL_V, "overlay with format %s created\n", g_ddpf[i].img_format_name); - //get the surface directly attached to the primary (the back buffer) - ddsdOverlay.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; - if (g_lpddsOverlay->lpVtbl->GetAttachedSurface(g_lpddsOverlay, &ddsdOverlay.ddsCaps, &g_lpddsBack) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't get attached surface\n"); - return 1; - } - return 0; - } - vo_doublebuffering = 0; //disable tribblebuffering - mp_msg(MSGT_VO, MSGL_V, "cannot create tribblebuffer overlay with format %s\n", g_ddpf[i].img_format_name); - } - //single buffer - mp_msg(MSGT_VO, MSGL_V, "using singlebuffer overlay\n"); - ddsdOverlay.dwBackBufferCount = 0; - ddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY; - ddsdOverlay.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; - ddsdOverlay.ddpfPixelFormat = g_ddpf[i].g_ddpfOverlay; - // try to create the overlay surface - ddrval = g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL); - if (ddrval != DD_OK) { - if (ddrval == DDERR_INVALIDPIXELFORMAT) - mp_msg(MSGT_VO, MSGL_V, " invalid pixelformat: %s\n", g_ddpf[i].img_format_name); - else - mp_msg(MSGT_VO, MSGL_ERR, "create surface failed: %s (0x%x)\n", dd_errstr(ddrval), (unsigned int)ddrval); - return 1; - } - g_lpddsBack = g_lpddsOverlay; - return 0; -} - -static uint32_t Directx_CreateBackpuffer(void) -{ - DDSURFACEDESC2 ddsd = { - .dwSize = sizeof(ddsd), - .ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, - .dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, - .dwWidth = image_width, - .dwHeight = image_height, - }; - //cleanup - if (g_lpddsBack) - g_lpddsBack->lpVtbl->Release(g_lpddsBack); - g_lpddsBack = NULL; - if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsd, &g_lpddsBack, 0) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't create backpuffer\n"); - return 1; - } - mp_msg(MSGT_VO, MSGL_DBG3, "backbuffer created\n"); - return 0; -} - -static void uninit(struct vo *vo) -{ - if (g_cc) - g_cc->lpVtbl->Release(g_cc); - g_cc = NULL; - if (g_lpddclipper) - g_lpddclipper->lpVtbl->Release(g_lpddclipper); - g_lpddclipper = NULL; - mp_msg(MSGT_VO, MSGL_DBG3, "clipper released\n"); - if (g_lpddsBack) - g_lpddsBack->lpVtbl->Release(g_lpddsBack); - g_lpddsBack = NULL; - mp_msg(MSGT_VO, MSGL_DBG3, "back surface released\n"); - if (vo_doublebuffering && !nooverlay) { - if (g_lpddsOverlay) - g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); - g_lpddsOverlay = NULL; - mp_msg(MSGT_VO, MSGL_DBG3, "overlay surface released\n"); - } - if (g_lpddsPrimary) - g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); - g_lpddsPrimary = NULL; - mp_msg(MSGT_VO, MSGL_DBG3, "primary released\n"); - if (colorbrush) - DeleteObject(colorbrush); - colorbrush = NULL; - mp_msg(MSGT_VO, MSGL_DBG3, "GDI resources deleted\n"); - if (g_lpdd) { - if (dx_vo->opts->vidmode) - g_lpdd->lpVtbl->RestoreDisplayMode(g_lpdd); - g_lpdd->lpVtbl->Release(g_lpdd); - } - mp_msg(MSGT_VO, MSGL_DBG3, "directdrawobject released\n"); - FreeLibrary(hddraw_dll); - hddraw_dll = NULL; - mp_msg(MSGT_VO, MSGL_DBG3, "ddraw.dll freed\n"); - mp_msg(MSGT_VO, MSGL_DBG3, "uninitialized\n"); - vo_w32_uninit(vo); - dx_vo = NULL; -} - -static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm) -{ - if (!lpGUID) - lpDriverDescription = "Primary Display Adapter"; - mp_msg(MSGT_VO, MSGL_INFO, " adapter %d: %s", adapter_count, lpDriverDescription); - - if (adapter_count == vo_adapter_num) { - if (!lpGUID) - selected_guid_ptr = NULL; - else { - selected_guid = *lpGUID; - selected_guid_ptr = &selected_guid; - } - - mp_msg(MSGT_VO, MSGL_INFO, "\t\t<--"); - } - mp_msg(MSGT_VO, MSGL_INFO, "\n"); - - adapter_count++; - - return 1; // list all adapters -} - -static uint32_t Directx_InitDirectDraw(void) -{ - HRESULT (WINAPI *OurDirectDrawCreateEx)(GUID *, LPVOID *, REFIID, IUnknown FAR *); - DDSURFACEDESC2 ddsd = { - .dwSize = sizeof(ddsd), - .dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT, - }; - LPDIRECTDRAWENUMERATEEX OurDirectDrawEnumerateEx; - - adapter_count = 0; - - mp_msg(MSGT_VO, MSGL_DBG3, "Initing DirectDraw\n"); - - //load direct draw DLL: based on videolans code - hddraw_dll = LoadLibrary("DDRAW.DLL"); - if (!hddraw_dll) { - mp_msg(MSGT_VO, MSGL_FATAL, "failed loading ddraw.dll\n"); - return 1; - } - - if (vo_adapter_num) { //display other than default - OurDirectDrawEnumerateEx = (LPDIRECTDRAWENUMERATEEX)GetProcAddress(hddraw_dll, "DirectDrawEnumerateExA"); - if (!OurDirectDrawEnumerateEx) { - FreeLibrary(hddraw_dll); - hddraw_dll = NULL; - mp_msg(MSGT_VO, MSGL_FATAL, "failed geting proc address: DirectDrawEnumerateEx\n"); - mp_msg(MSGT_VO, MSGL_FATAL, "no directx 7 or higher installed\n"); - return 1; - } - - // enumerate all display devices attached to the desktop - OurDirectDrawEnumerateEx(EnumCallbackEx, NULL, DDENUM_ATTACHEDSECONDARYDEVICES); - - if (vo_adapter_num >= adapter_count) - mp_msg(MSGT_VO, MSGL_ERR, "Selected adapter (%d) doesn't exist: Default Display Adapter selected\n", vo_adapter_num); - } - - OurDirectDrawCreateEx = (void *)GetProcAddress(hddraw_dll, "DirectDrawCreateEx"); - if (!OurDirectDrawCreateEx) { - FreeLibrary(hddraw_dll); - hddraw_dll = NULL; - mp_msg(MSGT_VO, MSGL_FATAL, "failed geting proc address: DirectDrawCreateEx\n"); - return 1; - } - - // initialize DirectDraw and create directx v7 object - if (OurDirectDrawCreateEx(selected_guid_ptr, (VOID **)&g_lpdd, &IID_IDirectDraw7, NULL) != DD_OK) { - FreeLibrary(hddraw_dll); - hddraw_dll = NULL; - mp_msg(MSGT_VO, MSGL_FATAL, "can't initialize ddraw\n"); - return 1; - } - - //get current screen siz for selected monitor ... - g_lpdd->lpVtbl->GetDisplayMode(g_lpdd, &ddsd); - if (dx_vo->opts->vo_screenwidth && dx_vo->opts->vo_screenheight) { - vm_height = dx_vo->opts->vo_screenheight; - vm_width = dx_vo->opts->vo_screenwidth; - } else { - vm_height = ddsd.dwHeight; - vm_width = ddsd.dwWidth; - } - - if (dx_vo->opts->vo_dbpp) - vm_bpp = dx_vo->opts->vo_dbpp; - else - vm_bpp = ddsd.ddpfPixelFormat.dwRGBBitCount; - - if (dx_vo->opts->vidmode) { - if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't set cooperativelevel for exclusive mode\n"); - return 1; - } - /*SetDisplayMode(ddobject,width,height,bpp,refreshrate,aditionalflags)*/ - if (g_lpdd->lpVtbl->SetDisplayMode(g_lpdd, vm_width, vm_height, vm_bpp, 0, 0) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't set displaymode\n"); - return 1; - } - mp_msg(MSGT_VO, MSGL_V, "Initialized adapter %i for %i x %i @ %i \n", vo_adapter_num, vm_width, vm_height, vm_bpp); - return 0; - } - if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_NORMAL) != DD_OK) { // or DDSCL_SETFOCUSWINDOW - mp_msg(MSGT_VO, MSGL_FATAL, "could not set cooperativelevel for hardwarecheck\n"); - return 1; - } - mp_msg(MSGT_VO, MSGL_DBG3, "DirectDraw Initialized\n"); - return 0; -} - -static void clear_border(HDC dc, int x1, int y1, int x2, int y2) -{ - if (x2 <= x1 || y2 <= y1) - return; - FillRect(dc, &(RECT) { x1, y1, x2, y2 }, blackbrush); -} - -static void redraw_window(void) -{ - HDC dc = vo_w32_get_dc(dx_vo, vo_w32_window); - RECT r; - GetClientRect(vo_w32_window, &r); - if (vo_fs || dx_vo->opts->vidmode) { - FillRect(dc, &r, blackbrush); - } else { - FillRect(dc, &r, colorbrush); - // clear borders (not needed in fs; fs uses background = colorkey) - RECT rc = rd; - POINT origin = { 0, 0 }; - ClientToScreen(vo_w32_window, &origin); - OffsetRect(&rc, -origin.x, -origin.y); - clear_border(dc, r.left, r.top, r.right, rc.top); // top - clear_border(dc, r.left, rc.bottom, r.right, r.bottom); // bottom - clear_border(dc, r.left, rc.top, rc.left, rc.bottom); // left - clear_border(dc, rc.right, rc.top, r.right, rc.bottom); // right - } - vo_w32_release_dc(dx_vo, vo_w32_window, dc); -} - -static uint32_t Directx_ManageDisplay(void) -{ - HRESULT ddrval; - DDCAPS capsDrv = { .dwSize = sizeof(capsDrv) }; - DDOVERLAYFX ovfx = { .dwSize = sizeof(ovfx) }; - DWORD dwUpdateFlags = 0; - int width, height; - - redraw_window(); - - POINT origin = { 0, 0 }; - ClientToScreen(vo_w32_window, &origin); - - rd.left = origin.x - xinerama_x; - rd.top = origin.y - xinerama_y; - width = dx_vo->dwidth; - height = dx_vo->dheight; - - if (aspect_scaling()) { - aspect(dx_vo, &width, &height, A_WINZOOM); - panscan_calc_windowed(dx_vo); - width += dx_vo->panscan_x; - height += dx_vo->panscan_y; - } - rd.left += (dx_vo->dwidth - width ) / 2; - rd.top += (dx_vo->dheight - height) / 2; - - rd.right = rd.left + width; - rd.bottom = rd.top + height; - - /*ok, let's workaround some overlay limitations*/ - if (!nooverlay) { - uint32_t uStretchFactor1000; //minimum stretch - uint32_t xstretch1000, ystretch1000; - - if (!width || !height) { - // window is minimized, so we should hide the overlay in case - // colorkeying is not used or working. - // In addition trying to set width/height to 0 would crash - g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, NULL, g_lpddsPrimary, NULL, DDOVER_HIDE, NULL); - return 0; - } - - /*get driver capabilities*/ - if (g_lpdd->lpVtbl->GetCaps(g_lpdd, &capsDrv, NULL) != DD_OK) - return 1; - /*get minimum stretch, depends on display adaptor and mode (refresh rate!) */ - uStretchFactor1000 = capsDrv.dwMinOverlayStretch > 1000 ? capsDrv.dwMinOverlayStretch : 1000; - rd.right = ((width + rd.left) * uStretchFactor1000 + 999) / 1000; - rd.bottom = (height + rd.top) * uStretchFactor1000 / 1000; - /*calculate xstretch1000 and ystretch1000*/ - xstretch1000 = ((rd.right - rd.left) * 1000) / image_width; - ystretch1000 = ((rd.bottom - rd.top) * 1000) / image_height; - rs.left = 0; - rs.right = image_width; - rs.top = 0; - rs.bottom = image_height; - if (rd.left < 0) - rs.left = (-rd.left * 1000) / xstretch1000; - if (rd.top < 0) - rs.top = (-rd.top * 1000) / ystretch1000; - if (rd.right > dx_vo->opts->vo_screenwidth) - rs.right = ((dx_vo->opts->vo_screenwidth - rd.left) * 1000) / xstretch1000; - if (rd.bottom > dx_vo->opts->vo_screenheight) - rs.bottom = ((dx_vo->opts->vo_screenheight - rd.top) * 1000) / ystretch1000; - /*do not allow to zoom or shrink if hardware isn't able to do so*/ - if (width < image_width && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKX)) { - if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKXN) - mp_msg(MSGT_VO, MSGL_ERR, "can only shrinkN\n"); - else - mp_msg(MSGT_VO, MSGL_ERR, "can't shrink x\n"); - rd.right = rd.left + image_width; - } else if (width > image_width && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHX)) { - if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHXN) - mp_msg(MSGT_VO, MSGL_ERR, "can only stretchN\n"); - else - mp_msg(MSGT_VO, MSGL_ERR, "can't stretch x\n"); - rd.right = rd.left + image_width; - } - if (height < image_height && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKY)) { - if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKYN) - mp_msg(MSGT_VO, MSGL_ERR, "can only shrinkN\n"); - else - mp_msg(MSGT_VO, MSGL_ERR, "can't shrink y\n"); - rd.bottom = rd.top + image_height; - } else if (height > image_height && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHY)) { - if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHYN) - mp_msg(MSGT_VO, MSGL_ERR, "can only stretchN\n"); - else - mp_msg(MSGT_VO, MSGL_ERR, "can't stretch y\n"); - rd.bottom = rd.top + image_height; - } - /*the last thing to check are alignment restrictions - * these expressions (x & -y) just do alignment by dropping low order bits... - * so to round up, we add first, then truncate*/ - if ((capsDrv.dwCaps & DDCAPS_ALIGNBOUNDARYSRC) && capsDrv.dwAlignBoundarySrc) - rs.left = (rs.left + capsDrv.dwAlignBoundarySrc / 2) & - (signed)(capsDrv.dwAlignBoundarySrc); - if ((capsDrv.dwCaps & DDCAPS_ALIGNSIZESRC) && capsDrv.dwAlignSizeSrc) - rs.right = rs.left + ((rs.right - rs.left + capsDrv.dwAlignSizeSrc / 2) & - (signed)(capsDrv.dwAlignSizeSrc)); - if ((capsDrv.dwCaps & DDCAPS_ALIGNBOUNDARYDEST) && capsDrv.dwAlignBoundaryDest) - rd.left = (rd.left + capsDrv.dwAlignBoundaryDest / 2) & - (signed)(capsDrv.dwAlignBoundaryDest); - if ((capsDrv.dwCaps & DDCAPS_ALIGNSIZEDEST) && capsDrv.dwAlignSizeDest) - rd.right = rd.left + ((rd.right - rd.left) & - (signed)(capsDrv.dwAlignSizeDest)); - /*create an overlay FX structure to specify a destination color key*/ - if (vo_fs || dx_vo->opts->vidmode) { - ovfx.dckDestColorkey.dwColorSpaceLowValue = 0; - ovfx.dckDestColorkey.dwColorSpaceHighValue = 0; - } else { - ovfx.dckDestColorkey.dwColorSpaceLowValue = destcolorkey; - ovfx.dckDestColorkey.dwColorSpaceHighValue = destcolorkey; - } - // set the flags we'll send to UpdateOverlay //DDOVER_AUTOFLIP|DDOVERFX_MIRRORLEFTRIGHT|DDOVERFX_MIRRORUPDOWN could be useful?; - dwUpdateFlags = DDOVER_SHOW | DDOVER_DDFX; - /*if hardware can't do colorkeying set the window on top*/ - if (capsDrv.dwCKeyCaps & DDCKEYCAPS_DESTOVERLAY) - dwUpdateFlags |= DDOVER_KEYDESTOVERRIDE; - else if (!tmp_image) - dx_vo->opts->vo_ontop = 1; - } else { - g_lpddclipper->lpVtbl->SetHWnd(g_lpddclipper, 0, vo_w32_window); - } - - /*make sure the overlay is inside the screen*/ - rd.top = FFMAX(rd.top, 0); - rd.left = FFMAX(rd.left, 0); - rd.bottom = FFMIN(rd.bottom, dx_vo->opts->vo_screenheight); - rd.right = FFMIN(rd.right, dx_vo->opts->vo_screenwidth); - - /*for nonoverlay mode we are finished, for overlay mode we have to display the overlay first*/ - if (nooverlay) - return 0; - -// printf("overlay: %i %i %ix%i\n",rd.left,rd.top,rd.right - rd.left,rd.bottom - rd.top); - ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, &rs, g_lpddsPrimary, &rd, dwUpdateFlags, &ovfx); - if (FAILED(ddrval)) { - // one cause might be the driver lied about minimum stretch - // we should try upping the destination size a bit, or - // perhaps shrinking the source size - mp_msg(MSGT_VO, MSGL_ERR, "UpdateOverlay failed\n"); - mp_msg(MSGT_VO, MSGL_ERR, "Overlay:x1:%li,y1:%li,x2:%li,y2:%li,w:%li,h:%li\n", rd.left, rd.top, rd.right, rd.bottom, rd.right - rd.left, rd.bottom - rd.top); - mp_msg(MSGT_VO, MSGL_ERR, "%s (0x%x)\n", dd_errstr(ddrval), (unsigned int)ddrval); - if (ddrval == DDERR_SURFACELOST) { - g_lpddsOverlay->lpVtbl->Restore(g_lpddsOverlay); //restore and try again - g_lpddsPrimary->lpVtbl->Restore(g_lpddsPrimary); - ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, &rs, g_lpddsPrimary, &rd, dwUpdateFlags, &ovfx); - if (ddrval != DD_OK) - mp_msg(MSGT_VO, MSGL_FATAL, "UpdateOverlay failed again\n"); - } - /*ok we can't do anything about it -> hide overlay*/ - if (ddrval != DD_OK) { - ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, NULL, g_lpddsPrimary, NULL, DDOVER_HIDE, NULL); - return 1; - } - } - return 0; -} - -static void check_events(struct vo *vo) -{ - int evt = vo_w32_check_events(vo); - if (evt & (VO_EVENT_RESIZE | VO_EVENT_MOVE)) - Directx_ManageDisplay(); - if (evt & (VO_EVENT_RESIZE | VO_EVENT_MOVE | VO_EVENT_EXPOSE)) { - redraw_window(); - } -} - -//find out supported overlay pixelformats -static uint32_t Directx_CheckOverlayPixelformats(void) -{ - DDCAPS capsDrv = { .dwSize = sizeof(capsDrv) }; - HRESULT ddrval; - DDSURFACEDESC2 ddsdOverlay = { - .dwSize = sizeof(ddsdOverlay), - .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY, - .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT, - .dwWidth = 300, - .dwHeight = 280, - .dwBackBufferCount = 0, - }; - uint32_t i; - uint32_t formatcount = 0; - //get driver caps to determine overlay support - ddrval = g_lpdd->lpVtbl->GetCaps(g_lpdd, &capsDrv, NULL); - if (FAILED(ddrval)) { - mp_msg(MSGT_VO, MSGL_ERR, "failed getting ddrawcaps\n"); - return 1; - } - if (!(capsDrv.dwCaps & DDCAPS_OVERLAY)) { - mp_msg(MSGT_VO, MSGL_ERR, "Your card doesn't support overlay\n"); - return 1; - } - mp_msg(MSGT_VO, MSGL_V, "testing supported overlay pixelformats\n"); - //it is not possible to query for pixel formats supported by the - //overlay hardware: try out various formats till one works - //try to create an overlay surface using one of the pixel formats in our global list - for (i = 0; i < NUM_FORMATS; i++) { - ddsdOverlay.ddpfPixelFormat = g_ddpf[i].g_ddpfOverlay; - ddrval = g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL); - if (ddrval == DD_OK) { - mp_msg(MSGT_VO, MSGL_V, "%i %s supported\n", i, g_ddpf[i].img_format_name); - drv_caps[i] = VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP; - formatcount++; - } else - mp_msg(MSGT_VO, MSGL_V, "%i %s not supported\n", i, g_ddpf[i].img_format_name); - if (g_lpddsOverlay) { - g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); - g_lpddsOverlay = NULL; - } - } - mp_msg(MSGT_VO, MSGL_V, "Your card supports %i of %i overlayformats\n", formatcount, NUM_FORMATS); - if (formatcount == 0) { - mp_msg(MSGT_VO, MSGL_V, "Your card supports overlay, but we couldn't create one\n"); - mp_msg(MSGT_VO, MSGL_V, "This can have the following reasons:\n"); - mp_msg(MSGT_VO, MSGL_V, "- you are already using an overlay with another app\n"); - mp_msg(MSGT_VO, MSGL_V, "- you don't have enough videomemory\n"); - mp_msg(MSGT_VO, MSGL_V, "- vo_directx doesn't support the cards overlay pixelformat\n"); - return 1; - } - if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYMIRRORLEFTRIGHT) - mp_msg(MSGT_VO, MSGL_V, "can mirror left right\n"); //I don't have hardware which - if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYMIRRORUPDOWN) - mp_msg(MSGT_VO, MSGL_V, "can mirror up down\n"); //supports those send me one and I'll implement ;) - return 0; -} - -//find out the Pixelformat of the Primary Surface -static uint32_t Directx_CheckPrimaryPixelformat(void) -{ - int i; - uint32_t formatcount = 0; - DDPIXELFORMAT ddpf = { .dwSize = sizeof(ddpf) }; - DDSURFACEDESC2 ddsd; - HDC hdc; - HRESULT hres; - COLORREF rgbT = RGB(0, 0, 0); - mp_msg(MSGT_VO, MSGL_V, "checking primary surface\n"); - //we have to create a primary surface first - if (Directx_CreatePrimarySurface() != 0) - return 1; - if (g_lpddsPrimary->lpVtbl->GetPixelFormat(g_lpddsPrimary, &ddpf) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't get pixelformat\n"); - return 1; - } - for (i = 0; i < NUM_FORMATS; i++) { - if (g_ddpf[i].g_ddpfOverlay.dwRGBBitCount == ddpf.dwRGBBitCount) { - if (g_ddpf[i].g_ddpfOverlay.dwRBitMask == ddpf.dwRBitMask) { - mp_msg(MSGT_VO, MSGL_V, "%i %s supported\n", i, g_ddpf[i].img_format_name); - drv_caps[i] = VFCAP_CSP_SUPPORTED | VFCAP_OSD; - formatcount++; - primary_image_format = g_ddpf[i].img_format; - } - } - } - //get the colorkey for overlay mode - destcolorkey = CLR_INVALID; - if (windowcolor != CLR_INVALID && g_lpddsPrimary->lpVtbl->GetDC(g_lpddsPrimary, &hdc) == DD_OK) { - rgbT = GetPixel(hdc, 0, 0); - SetPixel(hdc, 0, 0, windowcolor); - g_lpddsPrimary->lpVtbl->ReleaseDC(g_lpddsPrimary, hdc); - } - // read back the converted color - ddsd.dwSize = sizeof(ddsd); - while ((hres = g_lpddsPrimary->lpVtbl->Lock(g_lpddsPrimary, NULL, &ddsd, 0, NULL)) == DDERR_WASSTILLDRAWING) - ; - if (hres == DD_OK) { - destcolorkey = *(DWORD *)ddsd.lpSurface; - if (ddsd.ddpfPixelFormat.dwRGBBitCount < 32) - destcolorkey &= (1 << ddsd.ddpfPixelFormat.dwRGBBitCount) - 1; - g_lpddsPrimary->lpVtbl->Unlock(g_lpddsPrimary, NULL); - } - if (windowcolor != CLR_INVALID && g_lpddsPrimary->lpVtbl->GetDC(g_lpddsPrimary, &hdc) == DD_OK) { - SetPixel(hdc, 0, 0, rgbT); - g_lpddsPrimary->lpVtbl->ReleaseDC(g_lpddsPrimary, hdc); - } - //release primary - g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); - g_lpddsPrimary = NULL; - if (formatcount == 0) { - mp_msg(MSGT_VO, MSGL_FATAL, "Unknown Pixelformat\n"); - return 1; - } - return 0; -} - -static int preinit(struct vo *vo, const char *arg) -{ - dx_vo = vo; - if (arg) { - if (strstr(arg, "noaccel")) { - mp_msg(MSGT_VO, MSGL_V, "disabled overlay\n"); - nooverlay = 1; - } - } - - windowcolor = vo_colorkey; - colorbrush = CreateSolidBrush(windowcolor); - blackbrush = (HBRUSH)GetStockObject(BLACK_BRUSH); - if (!vo_w32_init(vo)) - return 1; - if (!vo_w32_config(vo, 100, 100, VOFLAG_HIDDEN)) - return 1; - - if (Directx_InitDirectDraw() != 0) - return 1; //init DirectDraw - - if (Directx_CheckPrimaryPixelformat() != 0) - return 1; - if (!nooverlay && Directx_CheckOverlayPixelformats() == 0) { //check for supported hardware - mp_msg(MSGT_VO, MSGL_V, "hardware supports overlay\n"); - nooverlay = 0; - } else { //if we can't have overlay we create a backpuffer with the same imageformat as the primary surface - mp_msg(MSGT_VO, MSGL_V, "using backpuffer\n"); - nooverlay = 1; - } - mp_msg(MSGT_VO, MSGL_DBG3, "preinit succesfully finished\n"); - return 0; -} - -static int draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, int x, int y) -{ - uint8_t *s; - uint8_t *d; - uint32_t uvstride = dstride / 2; - // copy Y - d = image + dstride * y + x; - s = src[0]; - mem2agpcpy_pic(d, s, w, h, dstride, stride[0]); - - w /= 2; - h /= 2; - x /= 2; - y /= 2; - - // copy U - d = image + dstride * image_height + uvstride * y + x; - if (image_format == IMGFMT_YV12) - s = src[2]; - else - s = src[1]; - mem2agpcpy_pic(d, s, w, h, uvstride, stride[1]); - - // copy V - d = image + dstride * image_height + uvstride * (image_height / 2) + uvstride * y + x; - if (image_format == IMGFMT_YV12) - s = src[1]; - else - s = src[2]; - mem2agpcpy_pic(d, s, w, h, uvstride, stride[2]); - return 0; -} - -static void flip_page(struct vo *vo) -{ - HRESULT dxresult; - g_lpddsBack->lpVtbl->Unlock(g_lpddsBack, NULL); - if (vo_doublebuffering) { - // flip to the next image in the sequence - dxresult = g_lpddsOverlay->lpVtbl->Flip(g_lpddsOverlay, NULL, DDFLIP_WAIT); - if (dxresult == DDERR_SURFACELOST) { - mp_msg(MSGT_VO, MSGL_ERR, "Restoring Surface\n"); - g_lpddsBack->lpVtbl->Restore(g_lpddsBack); - // restore overlay and primary before calling - // Directx_ManageDisplay() to avoid error messages - g_lpddsOverlay->lpVtbl->Restore(g_lpddsOverlay); - g_lpddsPrimary->lpVtbl->Restore(g_lpddsPrimary); - // update overlay in case we return from screensaver - Directx_ManageDisplay(); - dxresult = g_lpddsOverlay->lpVtbl->Flip(g_lpddsOverlay, NULL, DDFLIP_WAIT); - } - if (dxresult != DD_OK) - mp_msg(MSGT_VO, MSGL_ERR, "can't flip page\n"); - } - if (nooverlay) { - // ask for the "NOTEARING" option - DDBLTFX ddbltfx = { - .dwSize = sizeof(ddbltfx), - .dwDDFX = DDBLTFX_NOTEARING, - }; - g_lpddsPrimary->lpVtbl->Blt(g_lpddsPrimary, &rd, g_lpddsBack, NULL, DDBLT_WAIT, &ddbltfx); - } - if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack, NULL, &ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT, NULL) == DD_OK) { - free(tmp_image); - tmp_image = NULL; - dstride = ddsdsf.lPitch; - image = ddsdsf.lpSurface; - } else if (!tmp_image) { - mp_msg(MSGT_VO, MSGL_WARN, "Locking the surface failed, rendering to a hidden surface!\n"); - tmp_image = image = calloc(1, image_height * dstride * 2); - } -} - -static uint32_t put_image(mp_image_t *mpi) -{ - uint8_t *d; - uint8_t *s; - uint32_t x = 0; - uint32_t y = 0; - uint32_t w = mpi->w; - uint32_t h = mpi->h; - - if ((mpi->flags & MP_IMGFLAG_DIRECT) || (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)) { - mp_msg(MSGT_VO, MSGL_DBG3, "put_image: nothing to do: drawslices\n"); - return VO_TRUE; - } - - if (mpi->flags & MP_IMGFLAG_PLANAR) { - if (image_format != IMGFMT_YVU9) - draw_slice(dx_vo, mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0); - else { - // copy Y - d = image + dstride * y + x; - s = mpi->planes[0]; - mem2agpcpy_pic(d, s, w, h, dstride, mpi->stride[0]); - w /= 4; - h /= 4; - x /= 4; - y /= 4; - // copy V - d = image + dstride * image_height + dstride * y / 4 + x; - s = mpi->planes[2]; - mem2agpcpy_pic(d, s, w, h, dstride / 4, mpi->stride[1]); - // copy U - d = image + dstride * image_height + dstride * image_height / 16 + dstride / 4 * y + x; - s = mpi->planes[1]; - mem2agpcpy_pic(d, s, w, h, dstride / 4, mpi->stride[2]); - } - } else { //packed - mem2agpcpy_pic(image, mpi->planes[0], w * (mpi->bpp / 8), h, dstride, mpi->stride[0]); - } - return VO_TRUE; -} - -static int config(struct vo *vo, uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t options, uint32_t format) -{ - image_format = format; - image_width = width; - image_height = height; - if (format != primary_image_format) - nooverlay = 0; - - /*release all directx objects*/ - if (g_cc) - g_cc->lpVtbl->Release(g_cc); - g_cc = NULL; - if (g_lpddclipper) - g_lpddclipper->lpVtbl->Release(g_lpddclipper); - g_lpddclipper = NULL; - if (g_lpddsBack) - g_lpddsBack->lpVtbl->Release(g_lpddsBack); - g_lpddsBack = NULL; - if (vo_doublebuffering) - if (g_lpddsOverlay) - g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); - g_lpddsOverlay = NULL; - if (g_lpddsPrimary) - g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); - g_lpddsPrimary = NULL; - mp_msg(MSGT_VO, MSGL_DBG3, "overlay surfaces released\n"); - - if (!vo_w32_config(vo, d_width, d_height, options)) - return 1; - - /*create the surfaces*/ - if (Directx_CreatePrimarySurface()) - return 1; - - //create palette for 256 color mode - if (image_format == IMGFMT_BGR8) { - LPDIRECTDRAWPALETTE ddpalette = NULL; - LPPALETTEENTRY palette = calloc(256, sizeof(*palette)); - int i; - for (i = 0; i < 256; i++) { - palette[i].peRed = ((i >> 5) & 0x07) * 255 / 7; - palette[i].peGreen = ((i >> 2) & 0x07) * 255 / 7; - palette[i].peBlue = ((i >> 0) & 0x03) * 255 / 3; - palette[i].peFlags = PC_NOCOLLAPSE; - } - g_lpdd->lpVtbl->CreatePalette(g_lpdd, DDPCAPS_8BIT | DDPCAPS_INITIALIZE, palette, &ddpalette, NULL); - g_lpddsPrimary->lpVtbl->SetPalette(g_lpddsPrimary, ddpalette); - free(palette); - ddpalette->lpVtbl->Release(ddpalette); - } - - if (!nooverlay && Directx_CreateOverlay(image_format)) { - if (format == primary_image_format) - nooverlay = 1; /*overlay creation failed*/ - else { - mp_msg(MSGT_VO, MSGL_FATAL, "can't use overlay mode: please use -vo directx:noaccel\n"); - return 1; - } - } - if (nooverlay) { - if (Directx_CreateBackpuffer()) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't get the driver to work on your system :(\n"); - return 1; - } - mp_msg(MSGT_VO, MSGL_V, "back surface created\n"); - vo_doublebuffering = 0; - /*create clipper for nonoverlay mode*/ - if (g_lpdd->lpVtbl->CreateClipper(g_lpdd, 0, &g_lpddclipper, NULL) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't create clipper\n"); - return 1; - } - if (g_lpddclipper->lpVtbl->SetHWnd(g_lpddclipper, 0, vo_w32_window) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't associate clipper with window\n"); - return 1; - } - if (g_lpddsPrimary->lpVtbl->SetClipper(g_lpddsPrimary, g_lpddclipper) != DD_OK) { - mp_msg(MSGT_VO, MSGL_FATAL, "can't associate primary surface with clipper\n"); - return 1; - } - mp_msg(MSGT_VO, MSGL_DBG3, "clipper succesfully created\n"); - } else { - if (DD_OK != g_lpddsOverlay->lpVtbl->QueryInterface(g_lpddsOverlay, &IID_IDirectDrawColorControl, (void **)&g_cc)) - mp_msg(MSGT_VO, MSGL_V, "unable to get DirectDraw ColorControl interface\n"); - } - Directx_ManageDisplay(); - memset(&ddsdsf, 0, sizeof(DDSURFACEDESC2)); - ddsdsf.dwSize = sizeof(DDSURFACEDESC2); - if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack, NULL, &ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT, NULL) == DD_OK) { - dstride = ddsdsf.lPitch; - image = ddsdsf.lpSurface; - return 0; - } - mp_msg(MSGT_VO, MSGL_V, "Initial Lock on the Surface failed.\n"); - return 1; -} - -//function to set color controls -// brightness [0, 10000] -// contrast [0, 20000] -// hue [-180, 180] -// saturation [0, 20000] -static uint32_t color_ctrl_set(const char *what, int value) -{ - uint32_t r = VO_NOTIMPL; - DDCOLORCONTROL dcc = { .dwSize = sizeof(dcc) }; - //printf("\n*** %s = %d\n", what, value); - if (!g_cc) { - //printf("\n *** could not get color control interface!!!\n"); - return VO_NOTIMPL; - } - - if (!strcmp(what, "brightness")) { - dcc.dwFlags = DDCOLOR_BRIGHTNESS; - dcc.lBrightness = (value + 100) * 10000 / 200; - r = VO_TRUE; - } else if (!strcmp(what, "contrast")) { - dcc.dwFlags = DDCOLOR_CONTRAST; - dcc.lContrast = (value + 100) * 20000 / 200; - r = VO_TRUE; - } else if (!strcmp(what, "hue")) { - dcc.dwFlags = DDCOLOR_HUE; - dcc.lHue = value * 180 / 100; - r = VO_TRUE; - } else if (!strcmp(what, "saturation")) { - dcc.dwFlags = DDCOLOR_SATURATION; - dcc.lSaturation = (value + 100) * 20000 / 200; - r = VO_TRUE; - } - - if (r == VO_TRUE) { - g_cc->lpVtbl->SetColorControls(g_cc, &dcc); - } - return r; -} - -//analoguous to color_ctrl_set -static uint32_t color_ctrl_get(const char *what, int *value) -{ - uint32_t r = VO_NOTIMPL; - DDCOLORCONTROL dcc = { .dwSize = sizeof(dcc) }; - if (!g_cc) { - //printf("\n *** could not get color control interface!!!\n"); - return VO_NOTIMPL; - } - - if (g_cc->lpVtbl->GetColorControls(g_cc, &dcc) != DD_OK) { - return r; - } - - if (!strcmp(what, "brightness") && (dcc.dwFlags & DDCOLOR_BRIGHTNESS)) { - *value = dcc.lBrightness * 200 / 10000 - 100; - r = VO_TRUE; - } else if (!strcmp(what, "contrast") && (dcc.dwFlags & DDCOLOR_CONTRAST)) { - *value = dcc.lContrast * 200 / 20000 - 100; - r = VO_TRUE; - } else if (!strcmp(what, "hue") && (dcc.dwFlags & DDCOLOR_HUE)) { - *value = dcc.lHue * 100 / 180; - r = VO_TRUE; - } else if (!strcmp(what, "saturation") && (dcc.dwFlags & DDCOLOR_SATURATION)) { - *value = dcc.lSaturation * 200 / 20000 - 100; - r = VO_TRUE; - } -// printf("\n*** %s = %d\n", what, *value); - - return r; -} - -static int control(struct vo *vo, uint32_t request, void *data) -{ - switch (request) { - case VOCTRL_QUERY_FORMAT: - return query_format(vo, *(uint32_t *)data); - case VOCTRL_DRAW_IMAGE: - return put_image(data); - case VOCTRL_BORDER: - vo_w32_border(vo); - Directx_ManageDisplay(); - return VO_TRUE; - case VOCTRL_ONTOP: - vo_w32_ontop(vo); - return VO_TRUE; - case VOCTRL_ROOTWIN: - if (WinID != -1) - return VO_TRUE; - if (dx_vo->opts->vidmode) { - mp_msg(MSGT_VO, MSGL_ERR, "rootwin has no meaning in exclusive mode\n"); - } else { - if (vo_rootwin) - vo_rootwin = 0; - else - vo_rootwin = 1; - Directx_ManageDisplay(); - } - return VO_TRUE; - case VOCTRL_FULLSCREEN: - vo_w32_fullscreen(vo); - Directx_ManageDisplay(); - return VO_TRUE; - case VOCTRL_SET_EQUALIZER: { - struct voctrl_set_equalizer_args *args = data; - return color_ctrl_set(args->name, args->value); - } - case VOCTRL_GET_EQUALIZER: { - struct voctrl_get_equalizer_args *args = data; - return color_ctrl_get(args->name, args->valueptr); - } - case VOCTRL_UPDATE_SCREENINFO: - w32_update_xinerama_info(vo); - return VO_TRUE; - } - return VO_NOTIMPL; -} - -const struct vo_driver video_out_directx = { - .is_new = false, - .info = &(const vo_info_t) { - "Directx DDraw YUV/RGB/BGR renderer", - "directx", - "Sascha Sommer ", - "" - }, - .preinit = preinit, - .config = config, - .control = control, - .draw_slice = draw_slice, - .draw_osd = draw_osd, - .flip_page = flip_page, - .check_events = check_events, - .uninit = uninit, -};