* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.185 2002/06/11 09:44:22 gbazin Exp $
+ * $Id: video_output.c,v 1.189 2002/08/08 00:35:11 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
#include "video.h"
#include "video_output.h"
+#if defined( SYS_DARWIN )
+#include "darwin_specific.h"
+#endif
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
*****************************************************************************/
vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
int i_width, int i_height,
- u32 i_chroma, int i_aspect )
+ vlc_fourcc_t i_chroma, int i_aspect )
{
vout_thread_t * p_vout; /* thread descriptor */
int i_index; /* loop variable */
p_vout->p_module = module_Need( p_vout,
( p_vout->psz_filter_chain ) ?
- MODULE_CAPABILITY_VOUT_FILTER :
- MODULE_CAPABILITY_VOUT,
- psz_plugin, (void *)p_vout );
+ "video filter" : "video output",
+ psz_plugin );
if( psz_plugin ) free( psz_plugin );
if( p_vout->p_module == NULL )
return( NULL );
}
-#define f p_vout->p_module->p_functions->vout.functions.vout
- p_vout->pf_create = f.pf_create;
- p_vout->pf_init = f.pf_init;
- p_vout->pf_end = f.pf_end;
- p_vout->pf_destroy = f.pf_destroy;
- p_vout->pf_manage = f.pf_manage;
- p_vout->pf_render = f.pf_render;
- p_vout->pf_display = f.pf_display;
-#undef f
-
/* Create thread and set locks */
vlc_mutex_init( p_vout, &p_vout->picture_lock );
vlc_mutex_init( p_vout, &p_vout->subpicture_lock );
if( vlc_thread_create( p_vout, "video output", RunThread, 0 ) )
{
msg_Err( p_vout, "%s", strerror(ENOMEM) );
- p_vout->pf_destroy( p_vout );
- module_Unneed( p_vout->p_module );
+ module_Unneed( p_vout, p_vout->p_module );
vlc_object_destroy( p_vout );
return NULL;
}
vlc_object_destroy( p_vout );
}
-/*****************************************************************************
- * vout_ChromaCmp: compare two chroma values
- *****************************************************************************
- * This function returns 1 if the two fourcc values given as argument are
- * the same format (eg. UYVY / UYNV) or almost the same format (eg. I420/YV12)
- *****************************************************************************/
-int vout_ChromaCmp( u32 i_chroma, u32 i_amorhc )
-{
- /* If they are the same, they are the same ! */
- if( i_chroma == i_amorhc )
- {
- return 1;
- }
-
- /* Check for equivalence classes */
- switch( i_chroma )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- switch( i_amorhc )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- return 1;
-
- default:
- return 0;
- }
-
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- switch( i_amorhc )
- {
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- return 1;
-
- default:
- return 0;
- }
-
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- switch( i_amorhc )
- {
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- return 1;
-
- default:
- return 0;
- }
-
- default:
- return 0;
- }
-}
-
/*****************************************************************************
* InitThread: initialize video output thread
*****************************************************************************
p_vout->b_direct = 0;
/* Choose the best module */
- p_vout->chroma.p_module =
- module_Need( p_vout, MODULE_CAPABILITY_CHROMA,
- NULL, (void *)p_vout );
+ p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL );
if( p_vout->chroma.p_module == NULL )
{
return( 1 );
}
-#define f p_vout->chroma.p_module->p_functions->chroma.functions.chroma
- p_vout->chroma.pf_init = f.pf_init;
- p_vout->chroma.pf_end = f.pf_end;
-#undef f
-
if( I_OUTPUTPICTURES < 2 * VOUT_MAX_PICTURES )
{
msg_Dbg( p_vout, "indirect render, mapping "
if( p_vout->b_error )
{
/* Destroy thread structures allocated by Create and InitThread */
- p_vout->pf_destroy( p_vout );
-
DestroyThread( p_vout );
return;
}
}
else
{
- //intf_WarnMsg( 6, "vout info: duplicating picture" );
+ /*intf_WarnMsg( 6, "vout info: duplicating picture" );*/
}
}
}
p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );
/*
- * Call the plugin-specific rendering method
+ * Call the plugin-specific rendering method if there is one
*/
- if( p_picture != NULL )
+ if( p_picture != NULL && p_vout->pf_render )
{
/* Render the direct buffer returned by vout_RenderPicture */
p_vout->pf_render( p_vout, p_directbuffer );
if( p_picture != NULL )
{
/* Display the direct buffer returned by vout_RenderPicture */
- p_vout->pf_display( p_vout, p_directbuffer );
+ if( p_vout->pf_display )
+ {
+ p_vout->pf_display( p_vout, p_directbuffer );
+ }
/* Reinitialize idle loop count */
i_idle_loops = 0;
/*
* Check events and manage thread
*/
- if( p_vout->pf_manage( p_vout ) )
+ if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) )
{
/* A fatal error occured, and the thread must terminate
* immediately, without displaying anything - setting b_error to 1
if( p_vout->pf_init( p_vout ) )
{
msg_Err( p_vout, "cannot resize display" );
- /* FixMe: p_vout->pf_end will be called again in EndThread() */
+ /* FIXME: pf_end will be called again in EndThread() */
p_vout->b_error = 1;
}
/* Need to reinitialise the chroma plugin */
- p_vout->chroma.pf_end( p_vout );
- p_vout->chroma.pf_init( p_vout );
+ p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
+ p_vout->chroma.p_module->pf_activate( VLC_OBJECT(p_vout) );
}
}
/* End of thread */
EndThread( p_vout );
- /* Destroy method-dependant resources */
- p_vout->pf_destroy( p_vout );
-
/* Destroy thread structures allocated by CreateThread */
DestroyThread( p_vout );
}
if( !p_vout->b_direct )
{
- p_vout->chroma.pf_end( p_vout );
- module_Unneed( p_vout->chroma.p_module );
+ module_Unneed( p_vout, p_vout->chroma.p_module );
}
/* Destroy all remaining pictures */
vlc_mutex_destroy( &p_vout->change_lock );
/* Release the module */
- module_Unneed( p_vout->p_module );
+ module_Unneed( p_vout, p_vout->p_module );
}
/* following functions are local */
projects / vlc / blobdiff