Skip to content

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

Merged back stat vout with dummy vout. 

The name might be ill chosen, but duplicated code is worse.
parent c041217f
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 240 deletions
modules/misc/dummy/dummy.c
View file @ 8e8bb586
......@@ -103,6 +103,12 @@ vlc_module_begin ()
set_subcategory( SUBCAT_VIDEO_VOUT )
add_category_hint( N_("Video"), NULL, false )
add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
add_submodule ()
set_section( N_( "Stats video output" ), NULL )
set_description( N_("Stats video output function") )
set_capability( "vout display", 0 )
add_shortcut( "stats" )
set_callbacks( OpenVideoStat, NULL )
add_submodule ()
set_description( N_("Dummy font renderer function") )
set_capability( "text renderer", 1 )
......
modules/misc/dummy/dummy.h
View file @ 8e8bb586
......@@ -39,5 +39,6 @@ void CloseEncoder ( vlc_object_t * );
int OpenAudio ( vlc_object_t * );
int OpenVideo ( vlc_object_t * );
int OpenVideoStat( vlc_object_t * );
int OpenRenderer ( vlc_object_t * );
modules/misc/dummy/vout.c
View file @ 8e8bb586
......@@ -38,13 +38,14 @@
*****************************************************************************/
static picture_t *Get(vout_display_t *);
static void Display(vout_display_t *, picture_t *);
static void DisplayStat(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
static void Manage(vout_display_t *);
static void Manage (vout_display_t *);
/*****************************************************************************
* OpenVideo: activates dummy vout display method
*****************************************************************************/
int OpenVideo(vlc_object_t *object)
static int OpenVideoCommon(vlc_object_t *object, bool display_stat)
{
vout_display_t *vd = (vout_display_t *)object;
......@@ -61,23 +62,45 @@ int OpenVideo(vlc_object_t *object)
}
vd->get = Get;
vd->prepare = NULL;
vd->display = Display;
vd->display = display_stat ? DisplayStat : Display;
vd->control = Control;
vd->manage = Manage;
return VLC_SUCCESS;
}
int OpenVideo(vlc_object_t *object)
{
return OpenVideoCommon(object, false);
}
int OpenVideoStat(vlc_object_t *object)
{
return OpenVideoCommon(object, true);
}
static picture_t *Get(vout_display_t *vd)
{
VLC_UNUSED(vd);
return picture_NewFromFormat(&vd->fmt);
}
static void Display(vout_display_t *vd, picture_t *picture)
{
VLC_UNUSED(vd);
picture_Release(picture);
}
static void DisplayStat(vout_display_t *vd, picture_t *picture)
{
VLC_UNUSED(vd);
if (vd->fmt.i_width*vd->fmt.i_height >= sizeof(mtime_t)) {
mtime_t date;
memcpy(&date, picture->p->p_pixels, sizeof(date));
msg_Dbg(vd, "VOUT got %"PRIu64" ms offset",
(mdate() - date) / 1000 );
}
picture_Release(picture);
}
static int Control(vout_display_t *vd, int query, va_list args)
{
VLC_UNUSED(vd);
......@@ -85,6 +108,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
VLC_UNUSED(args);
return VLC_SUCCESS;
}
static void Manage(vout_display_t *vd)
{
VLC_UNUSED(vd);
......
modules/misc/stats/Modules.am
View file @ 8e8bb586
......@@ -4,7 +4,6 @@ SOURCES_stats = \
decoder.c \
demux.c \
encoder.c \
vout.c \
$(NULL)
libvlc_LTLIBRARIES += libstats_plugin.la
modules/misc/stats/stats.c
View file @ 8e8bb586
......@@ -62,11 +62,5 @@ vlc_module_begin ()
set_capability( "demux", 0 )
add_shortcut( "stats" )
set_callbacks( OpenDemux, CloseDemux )
add_submodule ()
set_section( N_( "Stats video output" ), NULL )
set_description( N_("Stats video output function") )
set_capability( "video output", 0 )
add_shortcut( "stats" )
set_callbacks( OpenVideo, NULL )
vlc_module_end ()
modules/misc/stats/stats.h
View file @ 8e8bb586
......@@ -34,6 +34,4 @@ void CloseEncoder ( vlc_object_t * );
int OpenDemux ( vlc_object_t * );
void CloseDemux ( vlc_object_t * );
int OpenVideo ( vlc_object_t * );
#define kBufferSize 0x500
modules/misc/stats/vout.c deleted 100644 → 0
View file @ c041217f
/*****************************************************************************
* vout.c: video output display for stats purpose
*****************************************************************************
* Copyright (C) 2000-2008 the VideoLAN team
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre d'Herbemont <pdherbemont@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
* 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 <vlc_common.h>
#include <vlc_vout.h>
#define DUMMY_WIDTH 16
#define DUMMY_HEIGHT 16
#define DUMMY_MAX_DIRECTBUFFERS 10
#include "stats.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Init ( vout_thread_t * );
static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_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
*****************************************************************************/
static int Control( vout_thread_t *p_vout, int i_query, va_list args )
{
(void) p_vout; (void) i_query; (void) args;
return VLC_EGENERIC;
}
/*****************************************************************************
* Init: initialize dummy video thread output method
*****************************************************************************/
static int Init( vout_thread_t *p_vout )
{
int i_index, i_chroma;
char *psz_chroma;
picture_t *p_pic;
bool b_chroma = 0;
psz_chroma = config_GetPsz( p_vout, "dummy-chroma" );
if( psz_chroma )
{
if( strlen( psz_chroma ) >= 4 )
{
i_chroma = VLC_FOURCC( psz_chroma[0], psz_chroma[1],
psz_chroma[2], psz_chroma[3] );
b_chroma = 1;
}
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;
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
}
else
{
/* Use same chroma as input */
p_vout->output.i_chroma = p_vout->render.i_chroma;
p_vout->output.i_rmask = p_vout->render.i_rmask;
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 */
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 );
}
}
/*****************************************************************************
* 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);
return( 0 );
}
/*****************************************************************************
* 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);
/* No need to do anything, the fake direct buffers stay as they are */
}
/*****************************************************************************
* Display: displays previously rendered output
*****************************************************************************/
static void Display( vout_thread_t *p_vout, picture_t *p_pic )
{
msg_Dbg( p_vout, "VOUT got %"PRIu64" ms offset",
(mdate() - *(mtime_t *)p_pic->p->p_pixels) / 1000 );
/* No need to do anything, the fake direct buffers stay as they are */
}
/*****************************************************************************
* 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);
/* 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