Skip to content

V
vlc
Commit d7892f12 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Converted dummy vout to "vout display".

parent d4e00382
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 165 deletions
modules/misc/dummy/dummy.c
View file @ d7892f12
...@@ -97,7 +97,7 @@ vlc_module_begin () ...@@ -97,7 +97,7 @@ vlc_module_begin ()
add_submodule () add_submodule ()
set_description( N_("Dummy video output function") ) set_description( N_("Dummy video output function") )
set_section( N_( "Dummy Video output" ), NULL ) set_section( N_( "Dummy Video output" ), NULL )
set_capability( "video output", 1 ) set_capability( "vout display", 1 )
set_callbacks( OpenVideo, NULL ) set_callbacks( OpenVideo, NULL )
set_category( CAT_VIDEO ) set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VOUT ) set_subcategory( SUBCAT_VIDEO_VOUT )
......
modules/misc/dummy/vout.c
View file @ d7892f12
/***************************************************************************** /*****************************************************************************
* vout_dummy.c: Dummy video output display method for testing purposes * vout.c: Dummy video output display method for testing purposes
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 the VideoLAN team * Copyright (C) 2000-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
...@@ -30,189 +30,62 @@ ...@@ -30,189 +30,62 @@
#endif #endif
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_vout.h> #include <vlc_vout_display.h>
#define DUMMY_WIDTH 16
#define DUMMY_HEIGHT 16
#define DUMMY_MAX_DIRECTBUFFERS 10
#include "dummy.h" #include "dummy.h"
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int Init ( vout_thread_t * ); static picture_t *Get(vout_display_t *);
static void End ( vout_thread_t * ); static void Display(vout_display_t *, picture_t *);
static int Manage ( vout_thread_t * ); static int Control(vout_display_t *, int, va_list);
static void Render ( vout_thread_t *, picture_t * ); static void Manage(vout_display_t *);
static void Display ( vout_thread_t *, picture_t * );
static void SetPalette ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
static int Control ( vout_thread_t *, int, va_list );
/*****************************************************************************
* OpenVideo: activates dummy video thread output method
*****************************************************************************
* This function initializes a dummy vout method.
*****************************************************************************/
int OpenVideo ( vlc_object_t *p_this )
{
vout_thread_t * p_vout = (vout_thread_t *)p_this;
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_render = Render;
p_vout->pf_display = Display;
p_vout->pf_control = Control;
return VLC_SUCCESS;
}
/***************************************************************************** /*****************************************************************************
* Control: control facility for the vout * OpenVideo: activates dummy vout display method
*****************************************************************************/ *****************************************************************************/
static int Control( vout_thread_t *p_vout, int i_query, va_list args ) int OpenVideo(vlc_object_t *object)
{ {
(void) p_vout; (void) i_query; (void) args; vout_display_t *vd = (vout_display_t *)object;
return VLC_EGENERIC;
}
/* p_vd->info is not modified */
/***************************************************************************** char *chroma = var_CreateGetNonEmptyString(vd, "dummy-chroma");
* Init: initialize dummy video thread output method if (chroma) {
*****************************************************************************/ vlc_fourcc_t fcc = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma);
static int Init( vout_thread_t *p_vout ) if (fcc != 0) {
{ msg_Dbg(vd, "forcing chroma 0x%.8x (%4.4s)", fcc, (char*)&fcc);
int i_index, i_chroma; vd->fmt.i_chroma = fcc;
char *psz_chroma;
picture_t *p_pic;
bool b_chroma = 0;
psz_chroma = config_GetPsz( p_vout, "dummy-chroma" );
i_chroma = vlc_fourcc_GetCodecFromString( VIDEO_ES, psz_chroma );
b_chroma = i_chroma != 0;
free( psz_chroma );
I_OUTPUTPICTURES = 0;
/* Initialize the output structure */
if( b_chroma )
{
msg_Dbg( p_vout, "forcing chroma 0x%.8x (%4.4s)",
i_chroma, (char*)&i_chroma );
p_vout->output.i_chroma = i_chroma;
if ( i_chroma == VLC_CODEC_RGB8 )
{
p_vout->output.pf_setpalette = SetPalette;
} }
p_vout->output.i_width = p_vout->render.i_width; free(chroma);
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
} }
else vd->get = Get;
{ vd->prepare = NULL;
/* Use same chroma as input */ vd->display = Display;
p_vout->output.i_chroma = p_vout->render.i_chroma; vd->control = Control;
p_vout->output.i_rmask = p_vout->render.i_rmask; vd->manage = Manage;
p_vout->output.i_gmask = p_vout->render.i_gmask;
p_vout->output.i_bmask = p_vout->render.i_bmask;
p_vout->output.i_width = p_vout->render.i_width;
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
}
/* Try to initialize DUMMY_MAX_DIRECTBUFFERS direct buffers */
while( I_OUTPUTPICTURES < DUMMY_MAX_DIRECTBUFFERS )
{
p_pic = NULL;
/* Find an empty picture slot */ return VLC_SUCCESS;
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;
}
}
/* Allocate the picture */
if( p_pic == NULL )
{
break;
}
vout_AllocatePicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma,
p_vout->output.i_width, p_vout->output.i_height,
p_vout->output.i_aspect );
if( p_pic->i_planes == 0 )
{
break;
}
p_pic->i_status = DESTROYED_PICTURE;
p_pic->i_type = DIRECT_PICTURE;
PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic;
I_OUTPUTPICTURES++;
}
return( 0 );
}
/*****************************************************************************
* End: terminate dummy video thread output method
*****************************************************************************/
static void End( vout_thread_t *p_vout )
{
int i_index;
/* Free the fake output buffers we allocated */
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
}
} }
/***************************************************************************** static picture_t *Get(vout_display_t *vd)
* Manage: handle dummy events
*****************************************************************************
* This function should be called regularly by video output thread. It manages
* console events. It returns a non null value on error.
*****************************************************************************/
static int Manage( vout_thread_t *p_vout )
{ {
VLC_UNUSED(p_vout); VLC_UNUSED(vd);
return( 0 ); return picture_NewFromFormat(&vd->fmt);
} }
static void Display(vout_display_t *vd, picture_t *picture)
/*****************************************************************************
* Render: render previously calculated output
*****************************************************************************/
static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{ {
VLC_UNUSED(p_vout); VLC_UNUSED(p_pic); VLC_UNUSED(vd);
/* No need to do anything, the fake direct buffers stay as they are */ picture_Release(picture);
} }
static int Control(vout_display_t *vd, int query, va_list args)
/*****************************************************************************
* Display: displays previously rendered output
*****************************************************************************/
static void Display( vout_thread_t *p_vout, picture_t *p_pic )
{ {
VLC_UNUSED(p_vout); VLC_UNUSED(p_pic); VLC_UNUSED(vd);
/* No need to do anything, the fake direct buffers stay as they are */ VLC_UNUSED(query);
VLC_UNUSED(args);
return VLC_SUCCESS;
} }
static void Manage(vout_display_t *vd)
/*****************************************************************************
* SetPalette: set the palette for the picture
*****************************************************************************/
static void SetPalette ( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{ {
VLC_UNUSED(p_vout); VLC_UNUSED(red); VLC_UNUSED(green); VLC_UNUSED(blue); VLC_UNUSED(vd);
/* No need to do anything, the fake direct buffers stay as they are */
} }
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