/*****************************************************************************
* video_output.c : video output thread
- * (c)2000 VideoLAN
- *****************************************************************************
* This module describes the programming interface for video output threads.
* It includes functions allowing to open a new thread, send pictures to a
- * thread, and destroy a previously oppenned video output thread.
+ * thread, and destroy a previously oppened video output thread.
+ *****************************************************************************
+ * Copyright (C) 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <errno.h> /* ENOMEM */
+#include <stdlib.h> /* free() */
+#include <stdio.h> /* sprintf() */
+#include <string.h> /* strerror() */
#include "common.h"
#include "config.h"
#include "mtime.h"
-#include "vlc_thread.h"
+#include "threads.h"
+#include "plugins.h"
#include "video.h"
#include "video_output.h"
#include "video_text.h"
-#include "video_sys.h"
#include "video_yuv.h"
+
#include "intf_msg.h"
#include "main.h"
vout_thread_t * p_vout; /* thread descriptor */
int i_status; /* thread status */
int i_index; /* index for array initialization */
+ char * psz_method;
/* Allocate descriptor */
intf_DbgMsg("\n");
p_vout = (vout_thread_t *) malloc( sizeof(vout_thread_t) );
if( p_vout == NULL )
{
- intf_ErrMsg("error: %s\n", strerror(ENOMEM));
+ intf_ErrMsg( "error: %s\n", strerror(ENOMEM) );
return( NULL );
}
- /* Sets method-specific functions */
- switch( i_method )
+ /* Request an interface plugin */
+ psz_method = main_GetPszVariable( VOUT_METHOD_VAR, VOUT_DEFAULT_METHOD );
+ p_vout->p_vout_plugin = RequestPlugin( "vout", psz_method );
+
+ if( !p_vout->p_vout_plugin )
{
-#ifdef VIDEO_DUMMY
- case VOUT_DUMMY_METHOD:
- p_vout->p_sys_create = vout_DummySysCreate;
- p_vout->p_sys_init = vout_DummySysInit;
- p_vout->p_sys_end = vout_DummySysEnd;
- p_vout->p_sys_destroy = vout_DummySysDestroy;
- p_vout->p_sys_manage = vout_DummySysManage;
- p_vout->p_sys_display = vout_DummySysDisplay;
- break;
-#endif
-#ifdef VIDEO_X11
- case VOUT_X11_METHOD:
- p_vout->p_sys_create = vout_X11SysCreate;
- p_vout->p_sys_init = vout_X11SysInit;
- p_vout->p_sys_end = vout_X11SysEnd;
- p_vout->p_sys_destroy = vout_X11SysDestroy;
- p_vout->p_sys_manage = vout_X11SysManage;
- p_vout->p_sys_display = vout_X11SysDisplay;
- break;
-#endif
-#ifdef VIDEO_FB
- case VOUT_FB_METHOD:
- p_vout->p_sys_create = vout_FBSysCreate;
- p_vout->p_sys_init = vout_FBSysInit;
- p_vout->p_sys_end = vout_FBSysEnd;
- p_vout->p_sys_destroy = vout_FBSysDestroy;
- p_vout->p_sys_manage = vout_FBSysManage;
- p_vout->p_sys_display = vout_FBSysDisplay;
- break;
-#endif
-#ifdef VIDEO_GLIDE
- case VOUT_GLIDE_METHOD:
- p_vout->p_sys_create = vout_GlideSysCreate;
- p_vout->p_sys_init = vout_GlideSysInit;
- p_vout->p_sys_end = vout_GlideSysEnd;
- p_vout->p_sys_destroy = vout_GlideSysDestroy;
- p_vout->p_sys_manage = vout_GlideSysManage;
- p_vout->p_sys_display = vout_GlideSysDisplay;
- break;
-#endif
-#ifdef VIDEO_DGA
- case VOUT_DGA_METHOD:
- p_vout->p_sys_create = vout_DGASysCreate;
- p_vout->p_sys_init = vout_DGASysInit;
- p_vout->p_sys_end = vout_DGASysEnd;
- p_vout->p_sys_destroy = vout_DGASysDestroy;
- p_vout->p_sys_manage = vout_DGASysManage;
- p_vout->p_sys_display = vout_DGASysDisplay;
- break;
-#endif
-#ifdef VIDEO_GGI
- case VOUT_GGI_METHOD:
- p_vout->p_sys_create = vout_GGISysCreate;
- p_vout->p_sys_init = vout_GGISysInit;
- p_vout->p_sys_end = vout_GGISysEnd;
- p_vout->p_sys_destroy = vout_GGISysDestroy;
- p_vout->p_sys_manage = vout_GGISysManage;
- p_vout->p_sys_display = vout_GGISysDisplay;
- break;
-#endif
-#ifdef VIDEO_BEOS
- case VOUT_BEOS_METHOD:
- p_vout->p_sys_create = vout_BSysCreate;
- p_vout->p_sys_init = vout_BSysInit;
- p_vout->p_sys_end = vout_BSysEnd;
- p_vout->p_sys_destroy = vout_BSysDestroy;
- p_vout->p_sys_manage = vout_BSysManage;
- p_vout->p_sys_display = vout_BSysDisplay;
- break;
-#endif
- default:
- intf_ErrMsg( "error: video output method not available\n" );
- free( p_vout );
- return( NULL );
+ intf_ErrMsg( "error: could not open video plugin vout_%s.so\n", psz_method );
+ free( p_vout );
+ return( NULL );
}
+ /* Get plugins */
+ p_vout->p_sys_create = GetPluginFunction( p_vout->p_vout_plugin, "vout_SysCreate" );
+ p_vout->p_sys_init = GetPluginFunction( p_vout->p_vout_plugin, "vout_SysInit" );
+ p_vout->p_sys_end = GetPluginFunction( p_vout->p_vout_plugin, "vout_SysEnd" );
+ p_vout->p_sys_destroy = GetPluginFunction( p_vout->p_vout_plugin, "vout_SysDestroy" );
+ p_vout->p_sys_manage = GetPluginFunction( p_vout->p_vout_plugin, "vout_SysManage" );
+ p_vout->p_sys_display = GetPluginFunction( p_vout->p_vout_plugin, "vout_SysDisplay" );
+
/* Initialize thread properties - thread id and locks will be initialized
* later */
p_vout->b_die = 0;
p_vout->p_subpicture[i_index].i_type = EMPTY_SUBPICTURE;
p_vout->p_subpicture[i_index].i_status= FREE_SUBPICTURE;
}
- p_vout->i_pictures = 0;
+ p_vout->i_pictures = 0;
/* Initialize synchronization informations */
p_vout->i_synchro_level = VOUT_SYNCHRO_LEVEL_START;
* own error messages */
if( p_vout->p_sys_create( p_vout, psz_display, i_root_window ) )
{
- free( p_vout );
- return( NULL );
+ TrashPlugin( p_vout->p_vout_plugin );
+ free( p_vout );
+ return( NULL );
}
intf_DbgMsg("actual configuration: %dx%d, %d/%d bpp (%d Bpl), masks: 0x%x/0x%x/0x%x\n",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
if( p_vout->p_default_font == NULL )
{
p_vout->p_sys_destroy( p_vout );
+ TrashPlugin( p_vout->p_vout_plugin );
free( p_vout );
return( NULL );
}
{
vout_UnloadFont( p_vout->p_default_font );
p_vout->p_sys_destroy( p_vout );
+ TrashPlugin( p_vout->p_vout_plugin );
free( p_vout );
return( NULL );
}
vout_UnloadFont( p_vout->p_default_font );
vout_UnloadFont( p_vout->p_large_font );
p_vout->p_sys_destroy( p_vout );
+ TrashPlugin( p_vout->p_vout_plugin );
free( p_vout );
return( NULL );
}
* can end immediately - this is the best possible case, since no
* memory allocation needs to be done */
p_vout->p_picture[i_picture].i_status = RESERVED_PICTURE;
- p_vout->i_pictures++;
+ p_vout->i_pictures++;
#ifdef DEBUG_VIDEO
intf_DbgMsg("picture %p (in destroyed picture slot)\n",
&p_vout->p_picture[i_picture] );
p_free_picture->i_display_height = i_height;
p_free_picture->i_aspect_ratio = AR_SQUARE_PICTURE;
p_free_picture->i_refcount = 0;
- p_vout->i_pictures++;
+ p_vout->i_pictures++;
}
else
{
*****************************************************************************/
void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
- vlc_mutex_lock( &p_vout->picture_lock );
+ vlc_mutex_lock( &p_vout->picture_lock );
#ifdef DEBUG
/* Check if picture status is valid */
#endif
p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_pictures--;
+ p_vout->i_pictures--;
#ifdef DEBUG_VIDEO
intf_DbgMsg("picture %p\n", p_pic);
#endif
- vlc_mutex_unlock( &p_vout->picture_lock );
+ vlc_mutex_unlock( &p_vout->picture_lock );
}
/*****************************************************************************
if( (p_pic->i_refcount == 0) && (p_pic->i_status == DISPLAYED_PICTURE) )
{
p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_pictures--;
+ p_vout->i_pictures--;
}
#ifdef DEBUG_VIDEO
*****************************************************************************/
static void RunThread( vout_thread_t *p_vout)
{
- //?? welcome to gore land
+ /* XXX?? welcome to gore land */
static int i_trash_count = 0;
static mtime_t last_display_date = 0;
-
+
int i_index; /* index in heap */
mtime_t current_date; /* current date */
mtime_t display_date; /* display date */
/* Computes FPS rate */
p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date;
#endif
-// ???
+/* XXX?? */
i_trash_count++;
-fprintf( stderr, "gap : %Ld\n", display_date-last_display_date );
+//fprintf( stderr, "gap : %Ld\n", display_date-last_display_date );
last_display_date = display_date;
#if 1
if( display_date < current_date && i_trash_count > 4 )
vlc_mutex_lock( &p_vout->picture_lock );
if( p_pic->i_refcount )
{
- p_pic->i_status = DISPLAYED_PICTURE;
+ p_pic->i_status = DISPLAYED_PICTURE;
}
else
{
p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_pictures--;
+ p_vout->i_pictures--;
}
intf_DbgMsg( "warning: late picture %p skipped refcount=%d\n", p_pic, p_pic->i_refcount );
vlc_mutex_unlock( &p_vout->picture_lock );
- /* Update synchronization information as if display delay
+ /* Update synchronization information as if display delay
* was 0 */
Synchronize( p_vout, display_date - current_date );
-
+
p_pic = NULL;
display_date = 0;
i_trash_count = 0;
}
- else
-#endif
+ else
+#endif
if( display_date > current_date + VOUT_DISPLAY_DELAY )
{
/* A picture is ready to be rendered, but its rendering date is
}
else
{
- /* Picture will be displayed, update synchronization
+ /* Picture will be displayed, update synchronization
* information */
Synchronize( p_vout, display_date - current_date );
}
* only READY_SUBPICTURES are handled. If no picture has been selected,
* display_date will depend on the subpicture
*/
- //??
+ /* XXX?? */
/*
* Perform rendering, sleep and display rendered picture
vlc_mutex_lock( &p_vout->picture_lock );
if( p_pic->i_refcount )
{
- p_pic->i_status = DISPLAYED_PICTURE;
+ p_pic->i_status = DISPLAYED_PICTURE;
}
else
{
p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_pictures--;
+ p_vout->i_pictures--;
}
vlc_mutex_unlock( &p_vout->picture_lock );
}
else if( p_vout->b_active ) /* idle or interface screen alone */
{
- if( p_vout->b_interface && 0 /* && ?? intf_change */ )
+ if( p_vout->b_interface && 0 /* && XXX?? intf_change */ )
{
/* Interface has changed, so a new rendering is required - force
* it by setting last idle date to 0 */
vout_UnloadFont( p_vout->p_default_font );
vout_UnloadFont( p_vout->p_large_font );
p_vout->p_sys_destroy( p_vout );
+
+ /* Close plugin */
+ TrashPlugin( p_vout->p_vout_plugin );
+
+ /* Free structure */
free( p_vout );
*pi_status = i_status;
}
i_byte < p_vout->i_height * p_vout->i_bytes_per_line;
i_byte++ )
{
- //?? noooo !
+ /* XXX?? noooo ! */
p_vout->p_buffer[ p_vout->i_buffer_index ].p_data[ i_byte ] = p_vout->i_blue_pixel;
}
static void Synchronize( vout_thread_t *p_vout, s64 i_delay )
{
int i_synchro_inc = 0;
- //???? gore following
+ /* XXX?? gore following */
static int i_panic_count = 0;
static int i_last_synchro_inc = 0;
static float r_synchro_level = VOUT_SYNCHRO_LEVEL_START;
if( i_delay < 0 )
{
- fprintf( stderr, "PANIC %d\n", i_panic_count );
+ //fprintf( stderr, "PANIC %d\n", i_panic_count );
i_panic_count++;
}
-
+
i_truc *= 2;
-
+
if( p_vout->i_pictures > VOUT_SYNCHRO_HEAP_IDEAL_SIZE+1 )
{
i_truc = 40;
i_synchro_inc += p_vout->i_pictures - VOUT_SYNCHRO_HEAP_IDEAL_SIZE - 1;
-
+
}
- else
+ else
{
if( p_vout->i_pictures < VOUT_SYNCHRO_HEAP_IDEAL_SIZE )
{
i_truc = 32;
- //i_synchro_inc += p_vout->i_pictures - VOUT_SYNCHRO_HEAP_IDEAL_SIZE;
- }
-
- if( i_delay < 1000 )
- {
- //i_truc = 4;
+ i_synchro_inc += p_vout->i_pictures - VOUT_SYNCHRO_HEAP_IDEAL_SIZE;
}
}
-
- if( i_truc > VOUT_SYNCHRO_LEVEL_MAX*2*2*2*2*2 ||
+
+ if( i_truc > VOUT_SYNCHRO_LEVEL_MAX*2*2*2*2*2 ||
i_synchro_inc*i_last_synchro_inc < 0 )
{
i_truc = 32;
}
-
+
if( i_delay < 6000 )
{
i_truc = 16;
if( i_truc < 16 )
i_truc = 16;
i_synchro_inc -= 1+(5*(70000-i_delay))/70000;
- }
+ }
else if( i_delay > 100000 )
{
r_synchro_level += 1;
if( i_delay > 130000 )
r_synchro_level += 1;
}
-
+
r_synchro_level += (float)i_synchro_inc / i_truc;
p_vout->i_synchro_level = (int)(r_synchro_level+0.5);
-
+
if( r_synchro_level > VOUT_SYNCHRO_LEVEL_MAX )
{
r_synchro_level = VOUT_SYNCHRO_LEVEL_MAX;
}
- fprintf( stderr, "synchro level : %d, heap : %d (%d, %d) (%d, %f) - %Ld\n", p_vout->i_synchro_level,
- p_vout->i_pictures, i_last_synchro_inc, i_synchro_inc, i_truc, r_synchro_level, i_delay );
- i_last_synchro_inc = i_synchro_inc;
+ //fprintf( stderr, "synchro level : %d, heap : %d (%d, %d) (%d, %f) - %Ld\n", p_vout->i_synchro_level,
+ // p_vout->i_pictures, i_last_synchro_inc, i_synchro_inc, i_truc, r_synchro_level, i_delay );
+ i_last_synchro_inc = i_synchro_inc;
}
/*****************************************************************************
projects / vlc / blobdiff