/*****************************************************************************
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
+ * Copyright (C) 1998-2006 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Sam Hocevar <sam@zoy.org>
* David Kennedy <dkennedy@tinytoad.com>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
-#include <stdlib.h> /* free() */
-#include <string.h> /* strerror() */
-
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_vout.h>
#include <vlc_keys.h>
+#include <errno.h> /* ENOMEM */
+
#ifdef HAVE_MACHINE_PARAM_H
/* BSD */
# include <machine/param.h>
# include <netinet/in.h> /* BSD: struct in_addr */
#endif
+#ifdef HAVE_XSP
+#include <X11/extensions/Xsp.h>
+#endif
+
#ifdef HAVE_SYS_SHM_H
# include <sys/shm.h> /* shmget(), shmctl() */
#endif
#include <X11/Xlib.h>
+#include <X11/Xproto.h>
#include <X11/Xmd.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
+#include <X11/XF86keysym.h>
#ifdef HAVE_SYS_SHM_H
# include <X11/extensions/XShm.h>
#endif
# include <X11/extensions/dpms.h>
#endif
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
# include <X11/extensions/Xv.h>
# include <X11/extensions/Xvlib.h>
#endif
# include <X11/extensions/Xinerama.h>
#endif
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+# include <X11/extensions/xf86vmode.h>
+#endif
+
+#ifdef MODULE_NAME_IS_xvmc
+# include <X11/extensions/vldXvMC.h>
+# include "../../codec/xvmc/accel_xvmc.h"
+#endif
+
#include "xcommon.h"
/*****************************************************************************
#ifdef HAVE_SYS_SHM_H
static IMAGE_TYPE *CreateShmImage ( vout_thread_t *,
Display *, EXTRA_ARGS_SHM, int, int );
+static vlc_bool_t b_shm = VLC_TRUE;
#endif
static void ToggleFullScreen ( vout_thread_t * );
static void DestroyCursor ( vout_thread_t * );
static void ToggleCursor ( vout_thread_t * );
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
static int XVideoGetPort ( vout_thread_t *, vlc_fourcc_t, vlc_fourcc_t * );
static void XVideoReleasePort( vout_thread_t *, int );
#endif
uint16_t *, uint16_t *, uint16_t * );
#endif
+#ifdef MODULE_NAME_IS_xvmc
+static void RenderVideo ( vout_thread_t *, picture_t * );
+static int xvmc_check_yv12( Display *display, XvPortID port );
+static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout );
+#endif
+
static void TestNetWMSupport( vout_thread_t * );
static int ConvertKey( int );
static int WindowOnTop( vout_thread_t *, vlc_bool_t );
+static int X11ErrorHandler( Display *, XErrorEvent * );
+
+#ifdef HAVE_XSP
+static void EnablePixelDoubling( vout_thread_t *p_vout );
+static void DisablePixelDoubling( vout_thread_t *p_vout );
+#endif
+
+#ifdef HAVE_OSSO
+static const int i_backlight_on_interval = 300;
+#endif
+
+
+
/*****************************************************************************
* Activate: allocate X11 video thread output method
*****************************************************************************
vout_thread_t *p_vout = (vout_thread_t *)p_this;
char * psz_display;
vlc_value_t val;
-
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvmc)
+ char *psz_value;
+#endif
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
char * psz_chroma;
vlc_fourcc_t i_chroma = 0;
vlc_bool_t b_chroma = 0;
p_vout->pf_init = InitVideo;
p_vout->pf_end = EndVideo;
p_vout->pf_manage = ManageVideo;
+#ifdef MODULE_NAME_IS_xvmc
+ p_vout->pf_render = RenderVideo;
+#else
p_vout->pf_render = NULL;
+#endif
p_vout->pf_display = DisplayVideo;
p_vout->pf_control = Control;
}
if( psz_display ) free( psz_display );
+ /* Replace error handler so we can intercept some non-fatal errors */
+ XSetErrorHandler( X11ErrorHandler );
+
/* Get a screen ID matching the XOpenDisplay return value */
p_vout->p_sys->i_screen = DefaultScreen( p_vout->p_sys->p_display );
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
psz_chroma = config_GetPsz( p_vout, "xvideo-chroma" );
if( psz_chroma )
{
}
}
p_vout->output.i_chroma = X112VLC_FOURCC(p_vout->output.i_chroma);
+#elif defined(MODULE_NAME_IS_glx)
+ {
+ int i_opcode, i_evt, i_err = 0;
+ int i_maj, i_min = 0;
+
+ /* Check for GLX extension */
+ if( !XQueryExtension( p_vout->p_sys->p_display, "GLX",
+ &i_opcode, &i_evt, &i_err ) )
+ {
+ msg_Err( p_this, "GLX extension not supported" );
+ XCloseDisplay( p_vout->p_sys->p_display );
+ free( p_vout->p_sys );
+ return VLC_EGENERIC;
+ }
+ if( !glXQueryExtension( p_vout->p_sys->p_display, &i_err, &i_evt ) )
+ {
+ msg_Err( p_this, "glXQueryExtension failed" );
+ XCloseDisplay( p_vout->p_sys->p_display );
+ free( p_vout->p_sys );
+ return VLC_EGENERIC;
+ }
+
+ /* Check GLX version */
+ if (!glXQueryVersion( p_vout->p_sys->p_display, &i_maj, &i_min ) )
+ {
+ msg_Err( p_this, "glXQueryVersion failed" );
+ XCloseDisplay( p_vout->p_sys->p_display );
+ free( p_vout->p_sys );
+ return VLC_EGENERIC;
+ }
+ if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) )
+ {
+ p_vout->p_sys->b_glx13 = VLC_FALSE;
+ msg_Dbg( p_this, "using GLX 1.2 API" );
+ }
+ else
+ {
+ p_vout->p_sys->b_glx13 = VLC_TRUE;
+ msg_Dbg( p_this, "using GLX 1.3 API" );
+ }
+ }
#endif
/* Create blank cursor (for mouse cursor autohiding) */
/* Set main window's size */
p_vout->p_sys->original_window.i_width = p_vout->i_window_width;
p_vout->p_sys->original_window.i_height = p_vout->i_window_height;
-
+ var_Create( p_vout, "video-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
/* Spawn base window - this window will include the video output window,
* but also command buttons, subtitles and other indicators */
if( CreateWindow( p_vout, &p_vout->p_sys->original_window ) )
TestNetWMSupport( p_vout );
+#ifdef MODULE_NAME_IS_xvmc
+ p_vout->p_sys->p_last_subtitle_save = NULL;
+ psz_value = config_GetPsz( p_vout, "xvmc-deinterlace-mode" );
+
+ /* Look what method was requested */
+ //var_Create( p_vout, "xvmc-deinterlace-mode", VLC_VAR_STRING );
+ //var_Change( p_vout, "xvmc-deinterlace-mode", VLC_VAR_INHERITVALUE, &val, NULL );
+ if( psz_value )
+ {
+ if( (strcmp(psz_value, "bob") == 0) ||
+ (strcmp(psz_value, "blend") == 0) )
+ p_vout->p_sys->xvmc_deinterlace_method = 2;
+ else if (strcmp(psz_value, "discard") == 0)
+ p_vout->p_sys->xvmc_deinterlace_method = 1;
+ else
+ p_vout->p_sys->xvmc_deinterlace_method = 0;
+ free(psz_value );
+ }
+ else
+ p_vout->p_sys->xvmc_deinterlace_method = 0;
+
+ /* Look what method was requested */
+ //var_Create( p_vout, "xvmc-crop-style", VLC_VAR_STRING );
+ //var_Change( p_vout, "xvmc-crop-style", VLC_VAR_INHERITVALUE, &val, NULL );
+ psz_value = config_GetPsz( p_vout, "xvmc-crop-style" );
+
+ if( psz_value )
+ {
+ if( strncmp( psz_value, "eq", 2 ) == 0 )
+ p_vout->p_sys->xvmc_crop_style = 1;
+ else if( strncmp( psz_value, "4-16", 4 ) == 0)
+ p_vout->p_sys->xvmc_crop_style = 2;
+ else if( strncmp( psz_value, "16-4", 4 ) == 0)
+ p_vout->p_sys->xvmc_crop_style = 3;
+ else
+ p_vout->p_sys->xvmc_crop_style = 0;
+ free( psz_value );
+ }
+ else
+ p_vout->p_sys->xvmc_crop_style = 0;
+
+ msg_Dbg(p_vout, "Deinterlace = %d", p_vout->p_sys->xvmc_deinterlace_method);
+ msg_Dbg(p_vout, "Crop = %d", p_vout->p_sys->xvmc_crop_style);
+
+ if( !checkXvMCCap( p_vout ) )
+ {
+ msg_Err( p_vout, "no XVMC capability found" );
+ E_(Deactivate)( p_vout );
+ return VLC_EGENERIC;
+ }
+ sub_pic.p_sys = NULL;
+ p_vout->p_sys->last_date = 0;
+#endif
+
+#ifdef HAVE_XSP
+ p_vout->p_sys->i_hw_scale = 1;
+#endif
+
+#ifdef HAVE_OSSO
+ p_vout->p_sys->i_backlight_on_counter = i_backlight_on_interval;
+ p_vout->p_sys->p_octx = osso_initialize( "vlc", VERSION, 0, NULL );
+ if ( p_vout->p_sys->p_octx == NULL ) {
+ msg_Err( p_vout, "Could not get osso context" );
+ } else {
+ msg_Dbg( p_vout, "Initialized osso context" );
+ }
+#endif
+
/* Variable to indicate if the window should be on top of others */
/* Trigger a callback right now */
var_Get( p_vout, "video-on-top", &val );
}
#elif defined(MODULE_NAME_IS_xvideo)
XVideoReleasePort( p_vout, p_vout->p_sys->i_xvport );
+#elif defined(MODULE_NAME_IS_xvmc)
+ if( p_vout->p_sys->xvmc_cap )
+ {
+ xvmc_context_writer_lock( &p_vout->p_sys->xvmc_lock );
+ xxmc_dispose_context( p_vout );
+ if( p_vout->p_sys->old_subpic )
+ {
+ xxmc_xvmc_free_subpicture( p_vout, p_vout->p_sys->old_subpic );
+ p_vout->p_sys->old_subpic = NULL;
+ }
+ if( p_vout->p_sys->new_subpic )
+ {
+ xxmc_xvmc_free_subpicture( p_vout, p_vout->p_sys->new_subpic );
+ p_vout->p_sys->new_subpic = NULL;
+ }
+ free( p_vout->p_sys->xvmc_cap );
+ xvmc_context_writer_unlock( &p_vout->p_sys->xvmc_lock );
+ }
#endif
+#ifdef HAVE_XSP
+ DisablePixelDoubling(p_vout);
+#endif
+
DestroyCursor( p_vout );
EnableXScreenSaver( p_vout );
DestroyWindow( p_vout, &p_vout->p_sys->original_window );
-
XCloseDisplay( p_vout->p_sys->p_display );
/* Destroy structure */
vlc_mutex_destroy( &p_vout->p_sys->lock );
+#ifdef MODULE_NAME_IS_xvmc
+ free_context_lock( &p_vout->p_sys->xvmc_lock );
+#endif
+
+#ifdef HAVE_OSSO
+ if ( p_vout->p_sys->p_octx != NULL ) {
+ msg_Dbg( p_vout, "Deinitializing osso context" );
+ osso_deinitialize( p_vout->p_sys->p_octx );
+ }
+#endif
+
free( p_vout->p_sys );
}
+#ifdef MODULE_NAME_IS_xvmc
+
+#define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y')
+
+/* called xlocked */
+static int xvmc_check_yv12( Display *display, XvPortID port )
+{
+ XvImageFormatValues *formatValues;
+ int formats;
+ int i;
+
+ formatValues = XvListImageFormats( display, port, &formats );
+
+ for( i = 0; i < formats; i++ )
+ {
+ if( ( formatValues[i].id == XINE_IMGFMT_YV12 ) &&
+ ( !( strncmp( formatValues[i].guid, "YV12", 4 ) ) ) )
+ {
+ XFree (formatValues);
+ return 0;
+ }
+ }
+
+ XFree (formatValues);
+ return 1;
+}
+
+static void xvmc_sync_surface( vout_thread_t *p_vout, XvMCSurface * srf )
+{
+ XvMCSyncSurface( p_vout->p_sys->p_display, srf );
+}
+
+static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout )
+{
+ Atom atom;
+ int xv_double_buffer;
+
+ xv_double_buffer = 1;
+
+ XLockDisplay( p_vout->p_sys->p_display );
+ atom = XInternAtom( p_vout->p_sys->p_display, "XV_DOUBLE_BUFFER", False );
+#if 0
+ XvSetPortAttribute (p_vout->p_sys->p_display, p_vout->p_sys->i_xvport, atom, xv_double_buffer);
+#endif
+ XvMCSetAttribute( p_vout->p_sys->p_display, &p_vout->p_sys->context, atom, xv_double_buffer );
+ XUnlockDisplay( p_vout->p_sys->p_display );
+
+ //xprintf(this->xine, XINE_VERBOSITY_DEBUG,
+ // "video_out_xxmc: double buffering mode = %d\n", xv_double_buffer);
+}
+
+static void RenderVideo( vout_thread_t *p_vout, picture_t *p_pic )
+{
+ vlc_xxmc_t *xxmc = NULL;
+
+ vlc_mutex_lock( &p_vout->p_sys->lock );
+ xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock );
+
+ xxmc = &p_pic->p_sys->xxmc_data;
+ if( (!xxmc->decoded ||
+ !xxmc_xvmc_surface_valid( p_vout, p_pic->p_sys->xvmc_surf )) )
+ {
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+ return;
+ }
+
+ vlc_mutex_lock( &p_vout->lastsubtitle_lock );
+
+ if (p_vout->p_last_subtitle != NULL)
+ {
+ if( p_vout->p_sys->p_last_subtitle_save != p_vout->p_last_subtitle )
+ {
+ p_vout->p_sys->new_subpic =
+ xxmc_xvmc_alloc_subpicture( p_vout, &p_vout->p_sys->context,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height,
+ p_vout->p_sys->xvmc_cap[p_vout->p_sys->xvmc_cur_cap].subPicType.id );
+
+ if (p_vout->p_sys->new_subpic)
+ {
+ XVMCLOCKDISPLAY( p_vout->p_sys->p_display );
+ XvMCClearSubpicture( p_vout->p_sys->p_display,
+ p_vout->p_sys->new_subpic,
+ 0,
+ 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height,
+ 0x00 );
+ XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display );
+ clear_xx44_palette( &p_vout->p_sys->palette );
+
+ if( sub_pic.p_sys == NULL )
+ {
+ sub_pic.p_sys = malloc( sizeof( picture_sys_t ) );
+ if( sub_pic.p_sys != NULL )
+ {
+ sub_pic.p_sys->p_vout = p_vout;
+ sub_pic.p_sys->xvmc_surf = NULL;
+ sub_pic.p_sys->p_image = p_vout->p_sys->subImage;
+ }
+ }
+ sub_pic.p_sys->p_image = p_vout->p_sys->subImage;
+ sub_pic.p->p_pixels = sub_pic.p_sys->p_image->data;
+ sub_pic.p->i_pitch = p_vout->output.i_width;
+
+ memset( p_vout->p_sys->subImage->data, 0,
+ (p_vout->p_sys->subImage->width * p_vout->p_sys->subImage->height) );
+
+ if (p_vout->p_last_subtitle != NULL)
+ {
+ blend_xx44( p_vout->p_sys->subImage->data,
+ p_vout->p_last_subtitle,
+ p_vout->p_sys->subImage->width,
+ p_vout->p_sys->subImage->height,
+ p_vout->p_sys->subImage->width,
+ &p_vout->p_sys->palette,
+ (p_vout->p_sys->subImage->id == FOURCC_IA44) );
+ }
+
+ XVMCLOCKDISPLAY( p_vout->p_sys->p_display );
+ XvMCCompositeSubpicture( p_vout->p_sys->p_display,
+ p_vout->p_sys->new_subpic,
+ p_vout->p_sys->subImage,
+ 0, /* overlay->x */
+ 0, /* overlay->y */
+ p_vout->output.i_width, /* overlay->width, */
+ p_vout->output.i_height, /* overlay->height */
+ 0, /* overlay->x */
+ 0 ); /*overlay->y */
+ XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display );
+ if (p_vout->p_sys->old_subpic)
+ {
+ xxmc_xvmc_free_subpicture( p_vout,
+ p_vout->p_sys->old_subpic);
+ p_vout->p_sys->old_subpic = NULL;
+ }
+ if (p_vout->p_sys->new_subpic)
+ {
+ p_vout->p_sys->old_subpic = p_vout->p_sys->new_subpic;
+ p_vout->p_sys->new_subpic = NULL;
+ xx44_to_xvmc_palette( &p_vout->p_sys->palette,
+ p_vout->p_sys->xvmc_palette,
+ 0,
+ p_vout->p_sys->old_subpic->num_palette_entries,
+ p_vout->p_sys->old_subpic->entry_bytes,
+ p_vout->p_sys->old_subpic->component_order );
+ XVMCLOCKDISPLAY( p_vout->p_sys->p_display );
+ XvMCSetSubpicturePalette( p_vout->p_sys->p_display,
+ p_vout->p_sys->old_subpic,
+ p_vout->p_sys->xvmc_palette );
+ XvMCFlushSubpicture( p_vout->p_sys->p_display,
+ p_vout->p_sys->old_subpic);
+ XvMCSyncSubpicture( p_vout->p_sys->p_display,
+ p_vout->p_sys->old_subpic );
+ XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display );
+ }
+
+ XVMCLOCKDISPLAY( p_vout->p_sys->p_display);
+ if (p_vout->p_sys->xvmc_backend_subpic )
+ {
+ XvMCBlendSubpicture( p_vout->p_sys->p_display,
+ p_pic->p_sys->xvmc_surf,
+ p_vout->p_sys->old_subpic,
+ 0,
+ 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height,
+ 0,
+ 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height );
+ }
+ else
+ {
+ XvMCBlendSubpicture2( p_vout->p_sys->p_display,
+ p_pic->p_sys->xvmc_surf,
+ p_pic->p_sys->xvmc_surf,
+ p_vout->p_sys->old_subpic,
+ 0,
+ 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height,
+ 0,
+ 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height );
+ }
+ XVMCUNLOCKDISPLAY(p_vout->p_sys->p_display);
+ }
+ }
+ else
+ {
+ XVMCLOCKDISPLAY( p_vout->p_sys->p_display );
+ if( p_vout->p_sys->xvmc_backend_subpic )
+ {
+ XvMCBlendSubpicture( p_vout->p_sys->p_display,
+ p_pic->p_sys->xvmc_surf,
+ p_vout->p_sys->old_subpic,
+ 0, 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height,
+ 0, 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height );
+ }
+ else
+ {
+ XvMCBlendSubpicture2( p_vout->p_sys->p_display,
+ p_pic->p_sys->xvmc_surf,
+ p_pic->p_sys->xvmc_surf,
+ p_vout->p_sys->old_subpic,
+ 0, 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height,
+ 0, 0,
+ p_vout->p_sys->xvmc_width,
+ p_vout->p_sys->xvmc_height );
+ }
+ XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display );
+ }
+ }
+ p_vout->p_sys->p_last_subtitle_save = p_vout->p_last_subtitle;
+
+ vlc_mutex_unlock( &p_vout->lastsubtitle_lock );
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
+}
+#endif
+
+#ifdef HAVE_XSP
+/*****************************************************************************
+ * EnablePixelDoubling: Enables pixel doubling
+ *****************************************************************************
+ * Checks if the double size image fits in current window, and enables pixel
+ * doubling accordingly. The i_hw_scale is the integer scaling factor.
+ *****************************************************************************/
+static void EnablePixelDoubling( vout_thread_t *p_vout )
+{
+ int i_hor_scale = ( p_vout->p_sys->p_win->i_width ) / p_vout->render.i_width;
+ int i_vert_scale = ( p_vout->p_sys->p_win->i_height ) / p_vout->render.i_height;
+ if ( ( i_hor_scale > 1 ) && ( i_vert_scale > 1 ) ) {
+ p_vout->p_sys->i_hw_scale = 2;
+ msg_Dbg( p_vout, "Enabling pixel doubling, scaling factor %d", p_vout->p_sys->i_hw_scale );
+ XSPSetPixelDoubling( p_vout->p_sys->p_display, 0, 1 );
+ }
+}
+
+/*****************************************************************************
+ * DisablePixelDoubling: Disables pixel doubling
+ *****************************************************************************
+ * The scaling factor i_hw_scale is reset to the no-scaling value 1.
+ *****************************************************************************/
+static void DisablePixelDoubling( vout_thread_t *p_vout )
+{
+ if ( p_vout->p_sys->i_hw_scale > 1 ) {
+ msg_Dbg( p_vout, "Disabling pixel doubling" );
+ XSPSetPixelDoubling( p_vout->p_sys->p_display, 0, 0 );
+ p_vout->p_sys->i_hw_scale = 1;
+ }
+}
+#endif
+
+
+
/*****************************************************************************
* InitVideo: initialize X11 video thread output method
*****************************************************************************
*****************************************************************************/
static int InitVideo( vout_thread_t *p_vout )
{
- int i_index;
+ unsigned int i_index = 0;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
/* Initialize the output structure; we already found an XVideo port,
* and the corresponding chroma we will be using. Since we can
* arbitrary scale, stick to the coordinates and aspect. */
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
+ p_vout->fmt_out = p_vout->fmt_in;
+ p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
+
switch( p_vout->output.i_chroma )
{
- case VLC_FOURCC('R','V','1','5'):
+ case VLC_FOURCC('R','V','1','6'):
+#if defined( WORDS_BIGENDIAN )
+ p_vout->output.i_rmask = 0xf800;
+ p_vout->output.i_gmask = 0x07e0;
+ p_vout->output.i_bmask = 0x001f;
+#else
p_vout->output.i_rmask = 0x001f;
p_vout->output.i_gmask = 0x07e0;
p_vout->output.i_bmask = 0xf800;
+#endif
break;
- case VLC_FOURCC('R','V','1','6'):
+ case VLC_FOURCC('R','V','1','5'):
+#if defined( WORDS_BIGENDIAN )
+ p_vout->output.i_rmask = 0x7c00;
+ p_vout->output.i_gmask = 0x03e0;
+ p_vout->output.i_bmask = 0x001f;
+#else
p_vout->output.i_rmask = 0x001f;
p_vout->output.i_gmask = 0x03e0;
p_vout->output.i_bmask = 0x7c00;
+#endif
break;
}
case 16:
p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break;
case 24:
- p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break;
case 32:
p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break;
default:
return VLC_SUCCESS;
}
+#ifdef HAVE_XSP
+ vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width / p_vout->p_sys->i_hw_scale,
+ p_vout->p_sys->p_win->i_height / p_vout->p_sys->i_hw_scale,
+ &i_index, &i_index,
+ &p_vout->fmt_out.i_visible_width,
+ &p_vout->fmt_out.i_visible_height );
+#else
vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width,
p_vout->p_sys->p_win->i_height,
&i_index, &i_index,
- &p_vout->output.i_width, &p_vout->output.i_height );
+ &p_vout->fmt_out.i_visible_width,
+ &p_vout->fmt_out.i_visible_height );
+#endif
- /* Assume we have square pixels */
- p_vout->output.i_aspect = p_vout->output.i_width
- * VOUT_ASPECT_FACTOR / p_vout->output.i_height;
+ p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
+
+ p_vout->output.i_width = p_vout->fmt_out.i_width =
+ p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_width /
+ p_vout->fmt_in.i_visible_width;
+ p_vout->output.i_height = p_vout->fmt_out.i_height =
+ p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_height /
+ p_vout->fmt_in.i_visible_height;
+ p_vout->fmt_out.i_x_offset =
+ p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_x_offset /
+ p_vout->fmt_in.i_visible_width;
+ p_vout->fmt_out.i_y_offset =
+ p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_y_offset /
+ p_vout->fmt_in.i_visible_height;
+
+ p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_sar_den = 1;
+ p_vout->output.i_aspect = p_vout->fmt_out.i_aspect =
+ p_vout->fmt_out.i_width * VOUT_ASPECT_FACTOR /p_vout->fmt_out.i_height;
+
+ msg_Dbg( p_vout, "x11 image size %ix%i (%i,%i,%ix%i)",
+ p_vout->fmt_out.i_width, p_vout->fmt_out.i_height,
+ p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height );
#endif
/* Try to initialize up to MAX_DIRECTBUFFERS direct buffers */
I_OUTPUTPICTURES++;
}
+ if( p_vout->output.i_chroma == VLC_FOURCC('Y','V','1','2') )
+ {
+ /* U and V inverted compared to I420
+ * Fixme: this should be handled by the vout core */
+ p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0');
+ p_vout->fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
+ }
+
return VLC_SUCCESS;
}
*****************************************************************************/
static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
{
- int i_width, i_height, i_x, i_y;
+ unsigned int i_width, i_height, i_x, i_y;
vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width,
p_vout->p_sys->p_win->i_height,
vlc_mutex_lock( &p_vout->p_sys->lock );
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock );
+
+ vlc_xxmc_t *xxmc = &p_picture->p_sys->xxmc_data;
+ if( !xxmc->decoded ||
+ !xxmc_xvmc_surface_valid( p_vout, p_picture->p_sys->xvmc_surf ) )
+ {
+ msg_Dbg( p_vout, "DisplayVideo decoded=%d\tsurfacevalid=%d",
+ xxmc->decoded,
+ xxmc_xvmc_surface_valid( p_vout, p_picture->p_sys->xvmc_surf ) );
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+ return;
+ }
+
+ src_width = p_vout->output.i_width;
+ src_height = p_vout->output.i_height;
+
+ if( p_vout->p_sys->xvmc_crop_style == 1 )
+ {
+ src_x = 20;
+ src_y = 20;
+ src_width -= 40;
+ src_height -= 40;
+ }
+ else if( p_vout->p_sys->xvmc_crop_style == 2 )
+ {
+ src_x = 20;
+ src_y = 40;
+ src_width -= 40;
+ src_height -= 80;
+ }
+ else if( p_vout->p_sys->xvmc_crop_style == 3 )
+ {
+ src_x = 40;
+ src_y = 20;
+ src_width -= 80;
+ src_height -= 40;
+ }
+ else
+ {
+ src_x = 0;
+ src_y = 0;
+ }
+
+ if( p_vout->p_sys->xvmc_deinterlace_method > 0 )
+ { /* BOB DEINTERLACE */
+ if( (p_picture->p_sys->nb_display == 0) ||
+ (p_vout->p_sys->xvmc_deinterlace_method == 1) )
+ {
+ first_field = (p_picture->b_top_field_first) ?
+ XVMC_BOTTOM_FIELD : XVMC_TOP_FIELD;
+ }
+ else
+ {
+ first_field = (p_picture->b_top_field_first) ?
+ XVMC_TOP_FIELD : XVMC_BOTTOM_FIELD;
+ }
+ }
+ else
+ {
+ first_field = XVMC_FRAME_PICTURE;
+ }
+
+ XVMCLOCKDISPLAY( p_vout->p_sys->p_display );
+ XvMCFlushSurface( p_vout->p_sys->p_display, p_picture->p_sys->xvmc_surf );
+ /* XvMCSyncSurface(p_vout->p_sys->p_display, p_picture->p_sys->xvmc_surf); */
+ XvMCPutSurface( p_vout->p_sys->p_display,
+ p_picture->p_sys->xvmc_surf,
+ p_vout->p_sys->p_win->video_window,
+ src_x,
+ src_y,
+ src_width,
+ src_height,
+ 0 /*dest_x*/,
+ 0 /*dest_y*/,
+ i_width,
+ i_height,
+ first_field);
+
+ XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display );
+ if( p_vout->p_sys->xvmc_deinterlace_method == 2 )
+ { /* BOB DEINTERLACE */
+ if( p_picture->p_sys->nb_display == 0 )/* && ((t2-t1) < 15000)) */
+ {
+ mtime_t last_date = p_picture->date;
+
+ vlc_mutex_lock( &p_vout->picture_lock );
+ if( !p_vout->p_sys->last_date )
+ {
+ p_picture->date += 20000;
+ }
+ else
+ {
+ p_picture->date = ((3 * p_picture->date -
+ p_vout->p_sys->last_date) / 2 );
+ }
+ p_vout->p_sys->last_date = last_date;
+ p_picture->b_force = 1;
+ p_picture->p_sys->nb_display = 1;
+ vlc_mutex_unlock( &p_vout->picture_lock );
+ }
+ else
+ {
+ p_picture->p_sys->nb_display = 0;
+ p_picture->b_force = 0;
+ }
+ }
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+#endif
+
#ifdef HAVE_SYS_SHM_H
if( p_vout->p_sys->b_shm )
{
/* Display rendered image using shared memory extension */
-# ifdef MODULE_NAME_IS_xvideo
+# if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
XvShmPutImage( p_vout->p_sys->p_display, p_vout->p_sys->i_xvport,
p_vout->p_sys->p_win->video_window,
p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image,
- 0 /*src_x*/, 0 /*src_y*/,
- p_vout->output.i_width, p_vout->output.i_height,
+ p_vout->fmt_out.i_x_offset,
+ p_vout->fmt_out.i_y_offset,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height,
0 /*dest_x*/, 0 /*dest_y*/, i_width, i_height,
False /* Don't put True here or you'll waste your CPU */ );
# else
XShmPutImage( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->video_window,
p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image,
- 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/,
- p_vout->output.i_width, p_vout->output.i_height,
+ p_vout->fmt_out.i_x_offset,
+ p_vout->fmt_out.i_y_offset,
+ 0 /*dest_x*/, 0 /*dest_y*/,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height,
False /* Don't put True here ! */ );
# endif
}
#endif /* HAVE_SYS_SHM_H */
{
/* Use standard XPutImage -- this is gonna be slow ! */
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
XvPutImage( p_vout->p_sys->p_display, p_vout->p_sys->i_xvport,
p_vout->p_sys->p_win->video_window,
p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image,
- 0 /*src_x*/, 0 /*src_y*/,
- p_vout->output.i_width, p_vout->output.i_height,
+ p_vout->fmt_out.i_x_offset,
+ p_vout->fmt_out.i_y_offset,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height,
0 /*dest_x*/, 0 /*dest_y*/, i_width, i_height );
#else
XPutImage( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->video_window,
p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image,
- 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/,
- p_vout->output.i_width, p_vout->output.i_height );
+ p_vout->fmt_out.i_x_offset,
+ p_vout->fmt_out.i_y_offset,
+ 0 /*dest_x*/, 0 /*dest_y*/,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height );
#endif
}
vlc_mutex_lock( &p_vout->p_sys->lock );
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock );
+#endif
+
/* Handle events from the owner window */
if( p_vout->p_sys->p_win->owner_window )
{
{
val.i_int |= KEY_MODIFIER_ALT;
}
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
}
}
/* Mouse click */
/* Mouse move */
else if( xevent.type == MotionNotify )
{
- int i_width, i_height, i_x, i_y;
+ unsigned int i_width, i_height, i_x, i_y;
vlc_value_t val;
/* somewhat different use for vout_PlacePicture:
p_vout->p_sys->p_win->i_height,
&i_x, &i_y, &i_width, &i_height );
- val.i_int = ( xevent.xmotion.x - i_x )
- * p_vout->render.i_width / i_width;
+ val.i_int = ( xevent.xmotion.x - i_x ) *
+ p_vout->fmt_in.i_visible_width / i_width +
+ p_vout->fmt_in.i_x_offset;
var_Set( p_vout, "mouse-x", val );
- val.i_int = ( xevent.xmotion.y - i_y )
- * p_vout->render.i_height / i_height;
+ val.i_int = ( xevent.xmotion.y - i_y ) *
+ p_vout->fmt_in.i_visible_height / i_height +
+ p_vout->fmt_in.i_y_offset;
var_Set( p_vout, "mouse-y", val );
val.b_bool = VLC_TRUE;
{
/* (if this is the last a collection of expose events...) */
#if 0
- if( p_vout->p_vlc->p_input_bank->pp_input[0] != NULL )
+ if( p_vout->p_libvlc->p_input_bank->pp_input[0] != NULL )
{
- if( PAUSE_S == p_vout->p_vlc->p_input_bank->pp_input[0]
+ if( PAUSE_S == p_vout->p_libvlc->p_input_bank->pp_input[0]
->stream.control.i_status )
{
/* XVideoDisplay( p_vout )*/;
*/
if ( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{
- vlc_value_t val;
+ vlc_value_t val_fs, val_ontop;
/* Update the object variable and trigger callback */
- val.b_bool = !p_vout->b_fullscreen;
- var_Set( p_vout, "fullscreen", val );
+ val_fs.b_bool = !p_vout->b_fullscreen;
+
+ var_Set( p_vout, "fullscreen", val_fs );
+
+ /* Disable "always on top" in fullscreen mode */
+ var_Get( p_vout, "video-on-top", &val_ontop );
+ if( val_ontop.b_bool )
+ WindowOnTop( p_vout, val_fs.b_bool );
ToggleFullScreen( p_vout );
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
+ if( p_vout->i_changes & VOUT_CROP_CHANGE ||
+ p_vout->i_changes & VOUT_ASPECT_CHANGE )
+ {
+ p_vout->i_changes &= ~VOUT_CROP_CHANGE;
+ p_vout->i_changes &= ~VOUT_ASPECT_CHANGE;
+
+ p_vout->fmt_out.i_x_offset = p_vout->fmt_in.i_x_offset;
+ p_vout->fmt_out.i_y_offset = p_vout->fmt_in.i_y_offset;
+ p_vout->fmt_out.i_visible_width = p_vout->fmt_in.i_visible_width;
+ p_vout->fmt_out.i_visible_height = p_vout->fmt_in.i_visible_height;
+ p_vout->fmt_out.i_aspect = p_vout->fmt_in.i_aspect;
+ p_vout->fmt_out.i_sar_num = p_vout->fmt_in.i_sar_num;
+ p_vout->fmt_out.i_sar_den = p_vout->fmt_in.i_sar_den;
+ p_vout->output.i_aspect = p_vout->fmt_in.i_aspect;
+
+ p_vout->i_changes |= VOUT_SIZE_CHANGE;
+ }
+
/*
* Size change
*
*/
if( p_vout->i_changes & VOUT_SIZE_CHANGE )
{
- int i_width, i_height, i_x, i_y;
+ unsigned int i_width, i_height, i_x, i_y;
p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
}
}
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+#endif
+
+#ifdef HAVE_OSSO
+ if ( p_vout->p_sys->p_octx != NULL ) {
+ if ( p_vout->p_sys->i_backlight_on_counter == i_backlight_on_interval ) {
+ if ( osso_display_blanking_pause( p_vout->p_sys->p_octx ) != OSSO_OK ) {
+ msg_Err( p_vout, "Could not disable backlight blanking" );
+ } else {
+ msg_Dbg( p_vout, "Backlight blanking disabled" );
+ }
+ p_vout->p_sys->i_backlight_on_counter = 0;
+ } else {
+ p_vout->p_sys->i_backlight_on_counter ++;
+ }
+ }
+#endif
+
vlc_mutex_unlock( &p_vout->p_sys->lock );
-
return 0;
}
vlc_bool_t b_expose = VLC_FALSE;
vlc_bool_t b_configure_notify = VLC_FALSE;
vlc_bool_t b_map_notify = VLC_FALSE;
+ vlc_value_t val;
/* Prepare window manager hints and properties */
p_win->wm_protocols =
CWBackingStore | CWBackPixel | CWEventMask,
&xwindow_attributes );
- if( !p_vout->b_fullscreen )
+ var_Get( p_vout, "video-title", &val );
+ if( !val.psz_string || !*val.psz_string )
{
- /* Set window manager hints and properties: size hints, command,
- * window's name, and accepted protocols */
- XSetWMNormalHints( p_vout->p_sys->p_display,
- p_win->base_window, &xsize_hints );
- XSetCommand( p_vout->p_sys->p_display, p_win->base_window,
- p_vout->p_vlc->ppsz_argv, p_vout->p_vlc->i_argc );
-
XStoreName( p_vout->p_sys->p_display, p_win->base_window,
#ifdef MODULE_NAME_IS_x11
VOUT_TITLE " (X11 output)"
#else
VOUT_TITLE " (XVideo output)"
#endif
- );
+ );
+ }
+ else
+ {
+ XStoreName( p_vout->p_sys->p_display,
+ p_win->base_window, val.psz_string );
+ }
+ if( val.psz_string ) free( val.psz_string );
+
+ if( !p_vout->b_fullscreen )
+ {
+ /* Set window manager hints and properties: size hints, command,
+ * window's name, and accepted protocols */
+ XSetWMNormalHints( p_vout->p_sys->p_display,
+ p_win->base_window, &xsize_hints );
+ XSetCommand( p_vout->p_sys->p_display, p_win->base_window,
+ p_vout->p_libvlc->ppsz_argv, p_vout->p_libvlc->i_argc );
+
+ if( !var_GetBool( p_vout, "video-deco") )
+ {
+ Atom prop;
+ mwmhints_t mwmhints;
+
+ mwmhints.flags = MWM_HINTS_DECORATIONS;
+ mwmhints.decorations = False;
+
+ prop = XInternAtom( p_vout->p_sys->p_display, "_MOTIF_WM_HINTS",
+ False );
+
+ XChangeProperty( p_vout->p_sys->p_display,
+ p_win->base_window,
+ prop, prop, 32, PropModeReplace,
+ (unsigned char *)&mwmhints,
+ PROP_MWM_HINTS_ELEMENTS );
+ }
}
}
else
{
Window dummy1;
- unsigned int dummy2, dummy3;
+ int dummy2, dummy3;
+ unsigned int dummy4, dummy5;
/* Select events we are interested in. */
XSelectInput( p_vout->p_sys->p_display, p_win->owner_window,
&dummy1, &dummy2, &dummy3,
&p_win->i_width,
&p_win->i_height,
- &dummy2, &dummy3 );
+ &dummy4, &dummy5 );
/* We are already configured */
b_configure_notify = VLC_TRUE;
XMapWindow( p_vout->p_sys->p_display, p_win->base_window );
do
{
- XNextEvent( p_vout->p_sys->p_display, &xevent);
+ XWindowEvent( p_vout->p_sys->p_display, p_win->base_window,
+ SubstructureNotifyMask | StructureNotifyMask |
+ ExposureMask, &xevent);
if( (xevent.type == Expose)
&& (xevent.xexpose.window == p_win->base_window) )
{
b_expose = VLC_TRUE;
+ /* ConfigureNotify isn't sent if there isn't a window manager.
+ * Expose should be the last event to be received so it should
+ * be fine to assume we won't receive it anymore. */
+ b_configure_notify = VLC_TRUE;
}
else if( (xevent.type == MapNotify)
&& (xevent.xmap.window == p_win->base_window) )
{
#ifndef MODULE_NAME_IS_glx
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
int i_plane;
#endif
return -1;
}
+#ifdef MODULE_NAME_IS_xvmc
+ p_pic->p_sys->p_vout = p_vout;
+ p_pic->p_sys->xvmc_surf = NULL;
+ p_pic->p_sys->xxmc_data.decoded = 0;
+ p_pic->p_sys->xxmc_data.proc_xxmc_update_frame = xxmc_do_update_frame;
+ p_pic->p_accel_data = &p_pic->p_sys->xxmc_data;
+ p_pic->p_sys->nb_display = 0;
+#endif
+
/* Fill in picture_t fields */
vout_InitPicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma,
p_vout->output.i_width, p_vout->output.i_height,
/* Create image using XShm extension */
p_pic->p_sys->p_image =
CreateShmImage( p_vout, p_vout->p_sys->p_display,
-# ifdef MODULE_NAME_IS_xvideo
- p_vout->p_sys->i_xvport,
+# if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
+ p_vout->p_sys->i_xvport,
VLC2X11_FOURCC(p_vout->output.i_chroma),
# else
p_vout->p_sys->p_visual,
&p_pic->p_sys->shminfo,
p_vout->output.i_width, p_vout->output.i_height );
}
- else
+
+ if( !p_vout->p_sys->b_shm || !p_pic->p_sys->p_image )
#endif /* HAVE_SYS_SHM_H */
{
/* Create image without XShm extension */
p_pic->p_sys->p_image =
CreateImage( p_vout, p_vout->p_sys->p_display,
-#ifdef MODULE_NAME_IS_xvideo
- p_vout->p_sys->i_xvport,
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
+ p_vout->p_sys->i_xvport,
VLC2X11_FOURCC(p_vout->output.i_chroma),
p_pic->format.i_bits_per_pixel,
#else
p_vout->p_sys->i_bytes_per_pixel,
#endif
p_vout->output.i_width, p_vout->output.i_height );
+
+#ifdef HAVE_SYS_SHM_H
+ if( p_pic->p_sys->p_image && p_vout->p_sys->b_shm )
+ {
+ msg_Warn( p_vout, "couldn't create SHM image, disabling SHM" );
+ p_vout->p_sys->b_shm = VLC_FALSE;
+ }
+#endif /* HAVE_SYS_SHM_H */
}
if( p_pic->p_sys->p_image == NULL )
switch( p_vout->output.i_chroma )
{
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
case VLC_FOURCC('I','4','2','0'):
case VLC_FOURCC('Y','V','1','2'):
case VLC_FOURCC('Y','2','1','1'):
case VLC_FOURCC('R','V','3','2'):
p_pic->p->i_lines = p_pic->p_sys->p_image->height;
+ p_pic->p->i_visible_lines = p_pic->p_sys->p_image->height;
p_pic->p->p_pixels = p_pic->p_sys->p_image->data
+ p_pic->p_sys->p_image->xoffset;
p_pic->p->i_pitch = p_pic->p_sys->p_image->bytes_per_line;
IMAGE_FREE( p_pic->p_sys->p_image );
}
+#ifdef MODULE_NAME_IS_xvmc
+ if( p_pic->p_sys->xvmc_surf != NULL )
+ {
+ xxmc_xvmc_free_surface(p_vout , p_pic->p_sys->xvmc_surf);
+ p_pic->p_sys->xvmc_surf = NULL;
+ }
+#endif
+
/* Do NOT use XFlush here ! */
XSync( p_vout->p_sys->p_display, False );
screens = XineramaQueryScreens( p_vout->p_sys->p_display,
&i_num_screens );
- if( !SCREEN )
- SCREEN = config_GetInt( p_vout,
+ SCREEN = config_GetInt( p_vout,
MODULE_STRING "-xineramascreen" );
/* just check that user has entered a good value */
if( SCREEN >= i_num_screens || SCREEN < 0 )
{
- msg_Dbg( p_vout, "requested screen number invalid" );
+ msg_Dbg( p_vout, "requested screen number invalid (%d/%d)", SCREEN, i_num_screens );
SCREEN = 0;
}
#undef SCREEN
}
+ else
+#endif
+ {
+ /* The window wasn't necessarily created at the requested size */
+ p_vout->p_sys->p_win->i_x = p_vout->p_sys->p_win->i_y = 0;
+
+#ifdef HAVE_XF86VIDMODE
+ XF86VidModeModeLine mode;
+ int i_dummy;
+
+ if( XF86VidModeGetModeLine( p_vout->p_sys->p_display,
+ p_vout->p_sys->i_screen, &i_dummy,
+ &mode ) )
+ {
+ p_vout->p_sys->p_win->i_width = mode.hdisplay;
+ p_vout->p_sys->p_win->i_height = mode.vdisplay;
+
+ /* move cursor to the middle of the window to prevent
+ * unwanted display move if the display is smaller than the
+ * full desktop */
+ XWarpPointer( p_vout->p_sys->p_display, None,
+ p_vout->p_sys->p_win->base_window, 0, 0, 0, 0,
+ mode.hdisplay / 2 , mode.vdisplay / 2 );
+ /* force desktop view to upper left corner */
+ XF86VidModeSetViewPort( p_vout->p_sys->p_display,
+ p_vout->p_sys->i_screen, 0, 0 );
+ }
+ else
#endif
+ {
+ p_vout->p_sys->p_win->i_width =
+ DisplayWidth( p_vout->p_sys->p_display,
+ p_vout->p_sys->i_screen );
+ p_vout->p_sys->p_win->i_height =
+ DisplayHeight( p_vout->p_sys->p_display,
+ p_vout->p_sys->i_screen );
+ }
+
+ }
XMoveResizeWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
p_vout->p_sys->p_win->i_y,
p_vout->p_sys->p_win->i_width,
p_vout->p_sys->p_win->i_height );
+
+#ifdef HAVE_XSP
+ EnablePixelDoubling( p_vout );
+#endif
+
}
else
{
msg_Dbg( p_vout, "leaving fullscreen mode" );
- XReparentWindow( p_vout->p_sys->p_display,
- p_vout->p_sys->original_window.video_window,
- p_vout->p_sys->original_window.base_window, 0, 0 );
+#ifdef HAVE_XSP
+ DisablePixelDoubling( p_vout );
+#endif
+
+ XReparentWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->original_window.video_window,
+ p_vout->p_sys->original_window.base_window, 0, 0 );
p_vout->p_sys->fullscreen_window.video_window = None;
DestroyWindow( p_vout, &p_vout->p_sys->fullscreen_window );
}
}
-#ifdef MODULE_NAME_IS_xvideo
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
/*****************************************************************************
* XVideoGetPort: get YUV12 port
*****************************************************************************/
{
XvAdaptorInfo *p_adaptor;
unsigned int i;
- int i_adaptor, i_num_adaptors, i_requested_adaptor;
+ unsigned int i_adaptor, i_num_adaptors;
+ int i_requested_adaptor;
int i_selected_port;
switch( XvQueryExtension( p_vout->p_sys->p_display, &i, &i, &i, &i, &i ) )
}
i_selected_port = -1;
+#ifdef MODULE_NAME_IS_xvmc
+ i_requested_adaptor = config_GetInt( p_vout, "xvmc-adaptor" );
+#else
i_requested_adaptor = config_GetInt( p_vout, "xvideo-adaptor" );
-
+#endif
for( i_adaptor = 0; i_adaptor < i_num_adaptors; ++i_adaptor )
{
XvImageFormatValues *p_formats;
/* If we requested an adaptor and it's not this one, we aren't
* interested */
- if( i_requested_adaptor != -1 && i_adaptor != i_requested_adaptor )
+ if( i_requested_adaptor != -1 && ((int)i_adaptor != i_requested_adaptor) )
{
continue;
}
XPixmapFormatValues * p_formats; /* pixmap formats */
XVisualInfo * p_xvisual; /* visuals information */
XVisualInfo xvisual_template; /* visual template */
- int i_count; /* array size */
+ int i_count, i; /* array size */
#endif
#ifdef HAVE_SYS_SHM_H
if( config_GetInt( p_vout, MODULE_STRING "-shm" ) )
{
-# ifdef SYS_DARWIN
+# ifdef __APPLE__
/* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */
# else
p_vout->p_sys->b_shm =
*/
xvisual_template.screen = p_vout->p_sys->i_screen;
xvisual_template.class = TrueColor;
+/* In some cases, we get a truecolor class adaptor that has a different
+ color depth. So try to get a real true color one first */
+ xvisual_template.depth = p_vout->p_sys->i_screen_depth;
+
p_xvisual = XGetVisualInfo( p_vout->p_sys->p_display,
- VisualScreenMask | VisualClassMask,
+ VisualScreenMask | VisualClassMask |
+ VisualDepthMask,
&xvisual_template, &i_count );
if( p_xvisual == NULL )
{
- msg_Err( p_vout, "no TrueColor visual available" );
- return VLC_EGENERIC;
+ msg_Warn( p_vout, "No screen matching the required color depth" );
+ p_xvisual = XGetVisualInfo( p_vout->p_sys->p_display,
+ VisualScreenMask | VisualClassMask,
+ &xvisual_template, &i_count );
+ if( p_xvisual == NULL )
+ {
+
+ msg_Err( p_vout, "no TrueColor visual available" );
+ return VLC_EGENERIC;
+ }
}
p_vout->output.i_rmask = p_xvisual->red_mask;
p_formats = XListPixmapFormats( p_vout->p_sys->p_display, &i_count );
p_vout->p_sys->i_bytes_per_pixel = 0;
- for( ; i_count-- ; p_formats++ )
+ for( i = 0; i < i_count; i++ )
{
/* Under XFree4.0, the list contains pixmap formats available
* through all video depths ; so we have to check against current
* depth. */
- if( p_formats->depth == (int)p_vout->p_sys->i_screen_depth )
+ if( p_formats[i].depth == (int)p_vout->p_sys->i_screen_depth )
{
- if( p_formats->bits_per_pixel / 8
+ if( p_formats[i].bits_per_pixel / 8
> (int)p_vout->p_sys->i_bytes_per_pixel )
{
p_vout->p_sys->i_bytes_per_pixel =
- p_formats->bits_per_pixel / 8;
+ p_formats[i].bits_per_pixel / 8;
}
}
}
+ if( p_formats ) XFree( p_formats );
+
break;
}
p_vout->p_sys->p_visual = p_xvisual->visual;
int i_width, int i_height )
{
IMAGE_TYPE *p_image;
+ Status result;
/* Create XImage / XvImage */
#ifdef MODULE_NAME_IS_xvideo
+
+ /* Make sure the buffer is aligned to multiple of 16 */
+ i_height = ( i_height + 15 ) >> 4 << 4;
+ i_width = ( i_width + 15 ) >> 4 << 4;
+
+ p_image = XvShmCreateImage( p_display, i_xvport, i_chroma, 0,
+ i_width, i_height, p_shm );
+#elif defined(MODULE_NAME_IS_xvmc)
p_image = XvShmCreateImage( p_display, i_xvport, i_chroma, 0,
i_width, i_height, p_shm );
#else
p_shm->readOnly = True;
/* Attach shared memory segment to X server */
- if( XShmAttach( p_display, p_shm ) == False )
+ XSynchronize( p_display, True );
+ b_shm = VLC_TRUE;
+ result = XShmAttach( p_display, p_shm );
+ if( result == False || !b_shm )
{
msg_Err( p_vout, "cannot attach shared memory to X server" );
IMAGE_FREE( p_image );
shmdt( p_shm->shmaddr );
return NULL;
}
+ XSynchronize( p_display, False );
/* Send image to X server. This instruction is required, since having
* built a Shm XImage and not using it causes an error on XCloseDisplay,
/* Allocate memory for image */
#ifdef MODULE_NAME_IS_xvideo
+
+ /* Make sure the buffer is aligned to multiple of 16 */
+ i_height = ( i_height + 15 ) >> 4 << 4;
+ i_width = ( i_width + 15 ) >> 4 << 4;
+
p_data = (byte_t *) malloc( i_width * i_height * i_bits_per_pixel / 8 );
#elif defined(MODULE_NAME_IS_x11)
i_bytes_per_line = i_width * i_bytes_per_pixel;
/* Create XImage. p_data will be automatically freed */
#ifdef MODULE_NAME_IS_xvideo
p_image = XvCreateImage( p_display, i_xvport, i_chroma,
- p_data, i_width, i_height );
+ (char *)p_data, i_width, i_height );
#elif defined(MODULE_NAME_IS_x11)
p_image = XCreateImage( p_display, p_visual, i_depth, ZPixmap, 0,
- p_data, i_width, i_height, i_quantum, 0 );
+ (char *)p_data, i_width, i_height, i_quantum, 0 );
#endif
if( p_image == NULL )
{
return p_image;
}
+/*****************************************************************************
+ * X11ErrorHandler: replace error handler so we can intercept some of them
+ *****************************************************************************/
+static int X11ErrorHandler( Display * display, XErrorEvent * event )
+{
+ switch( event->request_code )
+ {
+ case X_SetInputFocus:
+ /* Ignore errors on XSetInputFocus()
+ * (they happen when a window is not yet mapped) */
+ return 0;
+
+ case 150: /* MIT-SHM */
+ case 146: /* MIT-SHM too, what gives? */
+ if( event->minor_code == X_ShmAttach )
+ {
+ b_shm = VLC_FALSE;
+ return 0;
+ }
+ break;
+ }
+
+ XSetErrorHandler(NULL);
+ return (XSetErrorHandler(X11ErrorHandler))( display, event );
+}
+
#ifdef MODULE_NAME_IS_x11
/*****************************************************************************
* SetPalette: sets an 8 bpp palette
*****************************************************************************/
static int Control( vout_thread_t *p_vout, int i_query, va_list args )
{
- double f_arg;
vlc_bool_t b_arg;
+ unsigned int i_width, i_height;
+ unsigned int *pi_width, *pi_height;
+ Drawable d = 0;
switch( i_query )
{
- case VOUT_SET_ZOOM:
+ case VOUT_GET_SIZE:
if( p_vout->p_sys->p_win->owner_window )
return vout_ControlWindow( p_vout,
(void *)p_vout->p_sys->p_win->owner_window, i_query, args);
- f_arg = va_arg( args, double );
+ pi_width = va_arg( args, unsigned int * );
+ pi_height = va_arg( args, unsigned int * );
+
+ vlc_mutex_lock( &p_vout->p_sys->lock );
+ *pi_width = p_vout->p_sys->p_win->i_width;
+ *pi_height = p_vout->p_sys->p_win->i_height;
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
+ return VLC_SUCCESS;
+
+ case VOUT_SET_SIZE:
+ if( p_vout->p_sys->p_win->owner_window )
+ return vout_ControlWindow( p_vout,
+ (void *)p_vout->p_sys->p_win->owner_window, i_query, args);
vlc_mutex_lock( &p_vout->p_sys->lock );
+ i_width = va_arg( args, unsigned int );
+ i_height = va_arg( args, unsigned int );
+ if( !i_width ) i_width = p_vout->i_window_width;
+ if( !i_height ) i_height = p_vout->i_window_height;
+
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock );
+#endif
/* Update dimensions */
- /* FIXME: export InitWindowSize() from vout core */
XResizeWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
- p_vout->i_window_width * f_arg,
- p_vout->i_window_height * f_arg );
-
+ i_width, i_height );
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+#endif
vlc_mutex_unlock( &p_vout->p_sys->lock );
return VLC_SUCCESS;
case VOUT_REPARENT:
vlc_mutex_lock( &p_vout->p_sys->lock );
+ if( i_query == VOUT_REPARENT ) d = (Drawable)va_arg( args, int );
+ if( !d )
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock );
+#endif
XReparentWindow( p_vout->p_sys->p_display,
p_vout->p_sys->original_window.base_window,
DefaultRootWindow( p_vout->p_sys->p_display ),
0, 0 );
+ else
+ XReparentWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->original_window.base_window,
+ d, 0, 0);
XSync( p_vout->p_sys->p_display, False );
p_vout->p_sys->original_window.owner_window = 0;
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+#endif
vlc_mutex_unlock( &p_vout->p_sys->lock );
return vout_vaControlDefault( p_vout, i_query, args );
b_arg = va_arg( args, vlc_bool_t );
vlc_mutex_lock( &p_vout->p_sys->lock );
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock );
+#endif
WindowOnTop( p_vout, b_arg );
+#ifdef MODULE_NAME_IS_xvmc
+ xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
+#endif
vlc_mutex_unlock( &p_vout->p_sys->lock );
return VLC_SUCCESS;
{ XK_End, KEY_END },
{ XK_Page_Up, KEY_PAGEUP },
{ XK_Page_Down, KEY_PAGEDOWN },
+
+ { XK_Insert, KEY_INSERT },
+ { XK_Delete, KEY_DELETE },
+ { XF86XK_AudioNext, KEY_MEDIA_NEXT_TRACK},
+ { XF86XK_AudioPrev, KEY_MEDIA_PREV_TRACK},
+ { XF86XK_AudioMute, KEY_VOLUME_MUTE },
+ { XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN },
+ { XF86XK_AudioRaiseVolume, KEY_VOLUME_UP },
+ { XF86XK_AudioPlay, KEY_MEDIA_PLAY_PAUSE },
+ { XF86XK_AudioPause, KEY_MEDIA_PLAY_PAUSE },
+
{ 0, 0 }
};
(XEvent*)&event );
}
+ /* use _NET_WM_STATE_ABOVE if window manager
+ * doesn't handle _NET_WM_STATE_STAYS_ON_TOP */
+ else if( p_vout->p_sys->b_net_wm_state_above )
+ {
+ XClientMessageEvent event;
+
+ memset( &event, 0, sizeof( XClientMessageEvent ) );
+
+ event.type = ClientMessage;
+ event.message_type = p_vout->p_sys->net_wm_state;
+ event.display = p_vout->p_sys->p_display;
+ event.window = p_vout->p_sys->p_win->base_window;
+ event.format = 32;
+ event.data.l[ 0 ] = b_on_top; /* set property */
+ event.data.l[ 1 ] = p_vout->p_sys->net_wm_state_above;
+
+ XSendEvent( p_vout->p_sys->p_display,
+ DefaultRootWindow( p_vout->p_sys->p_display ),
+ False, SubstructureRedirectMask,
+ (XEvent*)&event );
+ }
+
return VLC_SUCCESS;
}
projects / vlc / blobdiff