Skip to content

V
vlc-gpu
Commit b311515d authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Removed non converted ggi video output module.

parent 18c556aa
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 549 deletions
configure.ac
View file @ b311515d
...@@ -3699,30 +3699,6 @@ if test "${enable_directfb}" = "yes"; then ...@@ -3699,30 +3699,6 @@ if test "${enable_directfb}" = "yes"; then
fi fi
fi fi
dnl
dnl GGI module
dnl
AC_ARG_ENABLE(ggi,
[ --enable-ggi GGI support (default disabled)])
if test "${enable_ggi}" = "yes"
then
AC_CHECK_HEADER([ggi/ggi.h],[
VLC_ADD_PLUGIN([ggi])
VLC_ADD_LIBS([ggi],[-lggi])
AC_ARG_WITH(ggi,
[ --with-ggi=PATH path to libggi],
[ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
then
VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib])
fi ])
],[
AC_MSG_ERROR([LibGGI development files can't be found])
])
fi
dnl dnl
dnl AA plugin dnl AA plugin
dnl dnl
......
modules/video_output/Modules.am
View file @ b311515d
...@@ -8,7 +8,6 @@ SOURCES_aa = aa.c ...@@ -8,7 +8,6 @@ SOURCES_aa = aa.c
SOURCES_caca = caca.c SOURCES_caca = caca.c
SOURCES_fb = fb.c SOURCES_fb = fb.c
SOURCES_omapfb = omapfb.c SOURCES_omapfb = omapfb.c
SOURCES_ggi = ggi.c
SOURCES_vout_sdl = sdl.c SOURCES_vout_sdl = sdl.c
SOURCES_svgalib = svgalib.c SOURCES_svgalib = svgalib.c
SOURCES_hd1000v = hd1000v.cpp SOURCES_hd1000v = hd1000v.cpp
......
modules/video_output/ggi.c deleted 100644 → 0
View file @ 18c556aa
/*****************************************************************************
* ggi.c : GGI plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2009 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <ggi/ggi.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy ( vlc_object_t * );
static int Init ( vout_thread_t * );
static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * );
static void Display ( vout_thread_t *, picture_t * );
static int OpenDisplay ( vout_thread_t * );
static void CloseDisplay ( vout_thread_t * );
static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"X11 hardware display to use.\n" \
"By default, VLC will use the value of the DISPLAY " \
"environment variable.")
vlc_module_begin ()
add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
set_description( "General Graphics Interface video output" )
set_capability( "video output", 30 )
set_callbacks( Create, Destroy )
vlc_module_end ()
/*****************************************************************************
* vout_sys_t: video output GGI method descriptor
*****************************************************************************
* This structure is part of the video output thread descriptor.
* It describes the GGI specific properties of an output thread.
*****************************************************************************/
struct vout_sys_t
{
/* GGI system information */
ggi_visual_t p_display; /* display device */
ggi_mode mode; /* mode descriptor */
int i_bits_per_pixel;
/* Buffer information */
ggi_directbuffer * pp_buffer[2]; /* buffers */
int i_index;
bool b_must_acquire; /* must be acquired before writing */
};
/*****************************************************************************
* Create: allocate GGI video thread output method
*****************************************************************************
* This function allocate and initialize a GGI vout method. It uses some of the
* vout properties to choose the correct mode, and change them according to the
* mode actually used.
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
return VLC_ENOMEM;
/* Open and initialize device */
if( OpenDisplay( p_vout ) )
{
msg_Err( p_vout, "cannot initialize GGI display" );
free( p_vout->p_sys );
return VLC_EGENERIC;
}
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_render = NULL;
p_vout->pf_display = Display;
return VLC_SUCCESS;
}
/*****************************************************************************
* Init: initialize GGI video thread output method
*****************************************************************************
* This function initialize the GGI display device.
*****************************************************************************/
static int Init( vout_thread_t *p_vout )
{
#define p_b p_vout->p_sys->pp_buffer
int i_index;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
p_vout->output.i_width = p_vout->p_sys->mode.visible.x;
p_vout->output.i_height = p_vout->p_sys->mode.visible.y;
p_vout->output.i_aspect = p_vout->p_sys->mode.visible.x
* VOUT_ASPECT_FACTOR
/ p_vout->p_sys->mode.visible.y;
switch( p_vout->p_sys->i_bits_per_pixel )
{
case 8:
p_vout->output.i_chroma = VLC_CODEC_RGB8;
p_vout->output.pf_setpalette = SetPalette;
break;
case 15:
p_vout->output.i_chroma = VLC_CODEC_RGB15; break;
case 16:
p_vout->output.i_chroma = VLC_CODEC_RGB16; break;
case 24:
p_vout->output.i_chroma = VLC_CODEC_RGB24; break;
case 32:
p_vout->output.i_chroma = VLC_CODEC_RGB32; break;
default:
msg_Err( p_vout, "unknown screen depth %i",
p_vout->p_sys->i_bits_per_pixel );
return VLC_EGENERIC;
}
/* Only useful for bits_per_pixel != 8 */
p_vout->output.i_rmask = p_b[ 0 ]->buffer.plb.pixelformat->red_mask;
p_vout->output.i_gmask = p_b[ 0 ]->buffer.plb.pixelformat->green_mask;
p_vout->output.i_bmask = p_b[ 0 ]->buffer.plb.pixelformat->blue_mask;
p_pic = NULL;
/* Find an empty picture slot */
for( i_index = 0 ; i_index < VOUT_MAX_PICTURES ; i_index++ )
{
if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE )
{
p_pic = p_vout->p_picture + i_index;
break;
}
}
if( p_pic == NULL )
{
return VLC_EGENERIC;
}
/* We know the chroma, allocate a buffer which will be used
* directly by the decoder */
p_vout->p_sys->i_index = 0;
p_pic->p->p_pixels = p_b[ 0 ]->write;
p_pic->p->i_pixel_pitch = p_b[ 0 ]->buffer.plb.pixelformat->size / 8;
p_pic->p->i_lines = p_vout->p_sys->mode.visible.y;
p_pic->p->i_visible_lines = p_vout->p_sys->mode.visible.y;
p_pic->p->i_pitch = p_b[ 0 ]->buffer.plb.stride;
if( p_b[ 0 ]->buffer.plb.pixelformat->size / 8
* p_vout->p_sys->mode.visible.x
!= p_b[ 0 ]->buffer.plb.stride )
{
p_pic->p->i_visible_pitch = p_b[ 0 ]->buffer.plb.pixelformat->size
/ 8 * p_vout->p_sys->mode.visible.x;
}
else
{
p_pic->p->i_visible_pitch = p_b[ 0 ]->buffer.plb.stride;
}
p_pic->i_planes = 1;
p_pic->i_status = DESTROYED_PICTURE;
p_pic->i_type = DIRECT_PICTURE;
PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic;
I_OUTPUTPICTURES++;
/* Acquire first buffer */
if( p_vout->p_sys->b_must_acquire )
{
ggiResourceAcquire( p_b[ 0 ]->resource,
GGI_ACTYPE_WRITE );
}
/* Listen to the keyboard and the mouse buttons */
ggiSetEventMask( p_vout->p_sys->p_display,
emKeyboard | emPtrButtonPress | emPtrButtonRelease );
/* Set asynchronous display mode -- usually quite faster */
ggiAddFlags( p_vout->p_sys->p_display, GGIFLAG_ASYNC );
return VLC_SUCCESS;
#undef p_b
}
/*****************************************************************************
* End: terminate GGI video thread output method
*****************************************************************************
* Terminate an output method created by Create
*****************************************************************************/
static void End( vout_thread_t *p_vout )
{
#define p_b p_vout->p_sys->pp_buffer
/* Release buffer */
if( p_vout->p_sys->b_must_acquire )
{
ggiResourceRelease( p_b[ p_vout->p_sys->i_index ]->resource );
}
#undef p_b
}
/*****************************************************************************
* Destroy: destroy GGI video thread output method
*****************************************************************************
* Terminate an output method created by Create
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
CloseDisplay( p_vout );
free( p_vout->p_sys );
}
/*****************************************************************************
* Manage: handle GGI events
*****************************************************************************
* This function should be called regularly by video output thread. It returns
* a non null value if an error occurred.
*****************************************************************************/
static int Manage( vout_thread_t *p_vout )
{
struct timeval tv = { 0, 1000 }; /* 1 millisecond */
gii_event_mask mask;
gii_event event;
mask = emKeyboard | emPtrButtonPress | emPtrButtonRelease;
ggiEventPoll( p_vout->p_sys->p_display, mask, &tv );
while( ggiEventsQueued( p_vout->p_sys->p_display, mask) )
{
ggiEventRead( p_vout->p_sys->p_display, &event, mask);
switch( event.any.type )
{
case evKeyRelease:
switch( event.key.sym )
{
case 'q':
case 'Q':
case GIIUC_Escape:
libvlc_Quit( p_vout->p_libvlc );
break;
default:
break;
}
break;
case evPtrButtonRelease:
switch( event.pbutton.button )
{
case GII_PBUTTON_LEFT:
/*FIXME
var_SetCoords( p_vout, "mouse-clicked", x, y );*/
break;
case GII_PBUTTON_RIGHT:
var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
break;
}
break;
default:
break;
}
}
return( 0 );
}
/*****************************************************************************
* Display: displays previously rendered output
*****************************************************************************/
static void Display( vout_thread_t *p_vout, picture_t *p_pic )
{
#define p_b p_vout->p_sys->pp_buffer
p_pic->p->p_pixels = p_b[ p_vout->p_sys->i_index ]->write;
/* Change display frame */
if( p_vout->p_sys->b_must_acquire )
{
ggiResourceRelease( p_b[ p_vout->p_sys->i_index ]->resource );
}
ggiSetDisplayFrame( p_vout->p_sys->p_display,
p_b[ p_vout->p_sys->i_index ]->frame );
/* Swap buffers and change write frame */
p_vout->p_sys->i_index ^= 1;
p_pic->p->p_pixels = p_b[ p_vout->p_sys->i_index ]->write;
if( p_vout->p_sys->b_must_acquire )
{
ggiResourceAcquire( p_b[ p_vout->p_sys->i_index ]->resource,
GGI_ACTYPE_WRITE );
}
ggiSetWriteFrame( p_vout->p_sys->p_display,
p_b[ p_vout->p_sys->i_index ]->frame );
/* Flush the output so that it actually displays */
ggiFlush( p_vout->p_sys->p_display );
#undef p_b
}
/* following functions are local */
/*****************************************************************************
* OpenDisplay: open and initialize GGI device
*****************************************************************************
* Open and initialize display according to preferences specified in the vout
* thread fields.
*****************************************************************************/
static int OpenDisplay( vout_thread_t *p_vout )
{
#define p_b p_vout->p_sys->pp_buffer
ggi_color col_fg; /* foreground color */
ggi_color col_bg; /* background color */
int i_index; /* all purposes index */
char *psz_display;
/* Initialize library */
if( ggiInit() )
{
msg_Err( p_vout, "cannot initialize GGI library" );
return VLC_EGENERIC;
}
/* Open display */
psz_display = var_InheritString( p_vout, "ggi-display" );
p_vout->p_sys->p_display = ggiOpen( psz_display, NULL );
free( psz_display );
if( p_vout->p_sys->p_display == NULL )
{
msg_Err( p_vout, "cannot open GGI default display" );
ggiExit();
return VLC_EGENERIC;
}
/* Find most appropriate mode */
p_vout->p_sys->mode.frames = 2; /* 2 buffers */
p_vout->p_sys->mode.visible.x = var_InheritInteger( p_vout, "width" );
p_vout->p_sys->mode.visible.y = var_InheritInteger( p_vout, "height" );
p_vout->p_sys->mode.virt.x = GGI_AUTO;
p_vout->p_sys->mode.virt.y = GGI_AUTO;
p_vout->p_sys->mode.size.x = GGI_AUTO;
p_vout->p_sys->mode.size.y = GGI_AUTO;
p_vout->p_sys->mode.graphtype = GT_15BIT; /* minimum usable depth */
p_vout->p_sys->mode.dpp.x = GGI_AUTO;
p_vout->p_sys->mode.dpp.y = GGI_AUTO;
ggiCheckMode( p_vout->p_sys->p_display, &p_vout->p_sys->mode );
/* FIXME: Check that returned mode has some minimum properties */
/* Set mode */
if( ggiSetMode( p_vout->p_sys->p_display, &p_vout->p_sys->mode ) )
{
msg_Err( p_vout, "cannot set GGI mode" );
ggiClose( p_vout->p_sys->p_display );
ggiExit();
return VLC_EGENERIC;
}
/* Check buffers properties */
p_vout->p_sys->b_must_acquire = 0;
for( i_index = 0; i_index < 2; i_index++ )
{
/* Get buffer address */
p_vout->p_sys->pp_buffer[ i_index ] =
(ggi_directbuffer *)ggiDBGetBuffer( p_vout->p_sys->p_display,
i_index );
if( p_b[ i_index ] == NULL )
{
msg_Err( p_vout, "double buffering is not possible" );
ggiClose( p_vout->p_sys->p_display );
ggiExit();
return VLC_EGENERIC;
}
/* Check buffer properties */
if( ! ( p_b[ i_index ]->type & GGI_DB_SIMPLE_PLB )
|| ( p_b[ i_index ]->page_size != 0 )
|| ( p_b[ i_index ]->write == NULL )
|| ( p_b[ i_index ]->noaccess != 0 )
|| ( p_b[ i_index ]->align != 0 ) )
{
msg_Err( p_vout, "incorrect video memory type" );
ggiClose( p_vout->p_sys->p_display );
ggiExit();
return VLC_EGENERIC;
}
/* Check if buffer needs to be acquired before write */
if( ggiResourceMustAcquire( p_b[ i_index ]->resource ) )
{
p_vout->p_sys->b_must_acquire = 1;
}
}
/* Set graphic context colors */
col_fg.r = col_fg.g = col_fg.b = -1;
col_bg.r = col_bg.g = col_bg.b = 0;
if( ggiSetGCForeground(p_vout->p_sys->p_display,
ggiMapColor(p_vout->p_sys->p_display,&col_fg)) ||
ggiSetGCBackground(p_vout->p_sys->p_display,
ggiMapColor(p_vout->p_sys->p_display,&col_bg)) )
{
msg_Err( p_vout, "cannot set colors" );
ggiClose( p_vout->p_sys->p_display );
ggiExit();
return VLC_EGENERIC;
}
/* Set clipping for text */
if( ggiSetGCClipping( p_vout->p_sys->p_display, 0, 0,
p_vout->p_sys->mode.visible.x,
p_vout->p_sys->mode.visible.y ) )
{
msg_Err( p_vout, "cannot set clipping" );
ggiClose( p_vout->p_sys->p_display );
ggiExit();
return VLC_EGENERIC;
}
/* FIXME: set palette in 8bpp */
p_vout->p_sys->i_bits_per_pixel = p_b[ 0 ]->buffer.plb.pixelformat->depth;
return VLC_SUCCESS;
#undef p_b
}
/*****************************************************************************
* CloseDisplay: close and reset GGI device
*****************************************************************************
* This function returns all resources allocated by OpenDisplay and restore
* the original state of the device.
*****************************************************************************/
static void CloseDisplay( vout_thread_t *p_vout )
{
/* Restore original mode and close display */
ggiClose( p_vout->p_sys->p_display );
/* Exit library */
ggiExit();
}
/*****************************************************************************
* SetPalette: sets an 8 bpp palette
*****************************************************************************/
static void SetPalette( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{
ggi_color colors[256];
int i;
/* Fill colors with color information */
for( i = 0; i < 256; i++ )
{
colors[ i ].r = red[ i ];
colors[ i ].g = green[ i ];
colors[ i ].b = blue[ i ];
colors[ i ].a = 0;
}
/* Set palette */
if( ggiSetPalette( p_vout->p_sys->p_display, 0, 256, colors ) < 0 )
{
msg_Err( p_vout, "failed to set palette" );
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment