* vout_intf.c : video output interface
*****************************************************************************
* Copyright (C) 2000-2007 the VideoLAN team
- * $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
#include <stdio.h>
#include <stdlib.h> /* free() */
#include <sys/types.h> /* opendir() */
+#include <sys/stat.h>
#include <dirent.h> /* opendir() */
+#include <assert.h>
+#include <time.h> /* strftime */
#include <vlc_interface.h>
#include <vlc_block.h>
#include <vlc_strings.h>
#include <vlc_charset.h>
#include "../libvlc.h"
+#include "vout_internal.h"
/*****************************************************************************
* Local prototypes
vlc_value_t, vlc_value_t, void * );
static int AspectCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int ScalingCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
static int OnTopCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int FullscreenCallback( vlc_object_t *, char const *,
static int TitlePositionCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-/*****************************************************************************
- * vout_RequestWindow: Create/Get a video window if possible.
- *****************************************************************************
- * This function looks for the main interface and tries to request
- * a new video window. If it fails then the vout will still need to create the
- * window by itself.
- *****************************************************************************/
-void *vout_RequestWindow( vout_thread_t *p_vout,
- int *pi_x_hint, int *pi_y_hint,
- unsigned int *pi_width_hint,
- unsigned int *pi_height_hint )
-{
- intf_thread_t *p_intf = NULL;
- vlc_list_t *p_list;
- void *p_window;
- vlc_value_t val;
- int i;
-
- /* Small kludge */
- if( !var_Type( p_vout, "aspect-ratio" ) ) vout_IntfInit( p_vout );
-
- /* Get requested coordinates */
- *pi_x_hint = var_GetInteger( p_vout, "video-x" );
- *pi_y_hint = var_GetInteger( p_vout, "video-y" );
-
- *pi_width_hint = p_vout->i_window_width;
- *pi_height_hint = p_vout->i_window_height;
-
- /* Check whether someone provided us with a window ID */
- int drawable = var_CreateGetInteger( p_vout, "drawable" );
- if( drawable ) return (void *)(intptr_t)drawable;
-
-#if 0
- /* FIXME:
- * This code is utter crap w.r.t. threading. And it has always been.
- * First, one cannot invoke callbacks from another thread's object.
- * Not without a well-defined locking convention.
- *
- * Second, this would need to "wait" for the interface to be ready.
- * Otherwise, the availability of the embded window would become
- * time-dependent.
- *
- * In the past, this kind of things worked by accident. This time is over.
- * -- Courmisch, 12 Jun 2008
- */
- /* Find if the main interface supports embedding */
- p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE );
- if( !p_list ) return NULL;
-
- for( i = 0; i < p_list->i_count; i++ )
- {
- p_intf = (intf_thread_t *)p_list->p_values[i].p_object;
- if( p_intf->pf_request_window ) break;
- p_intf = NULL;
- }
-
- if( !p_intf )
- {
- vlc_list_release( p_list );
- return NULL;
- }
-
- vlc_object_yield( p_intf );
- vlc_list_release( p_list );
-
- p_window = p_intf->pf_request_window( p_intf, p_vout, pi_x_hint, pi_y_hint,
- pi_width_hint, pi_height_hint );
-
- if( !p_window ) vlc_object_release( p_intf );
- else p_vout->p_parent_intf = p_intf;
-
- return p_window;
-#else
- return NULL;
-#endif
-}
-
-void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window )
-{
- intf_thread_t *p_intf = p_vout->p_parent_intf;
-
- if( !p_intf ) return;
-
- vlc_object_lock( p_intf );
- if( p_intf->b_dead )
- {
- vlc_object_unlock( p_intf );
- return;
- }
-
- if( !p_intf->pf_release_window )
- {
- msg_Err( p_vout, "no pf_release_window");
- vlc_object_unlock( p_intf );
- vlc_object_release( p_intf );
- return;
- }
-
- p_intf->pf_release_window( p_intf, p_window );
-
- p_vout->p_parent_intf = NULL;
- vlc_object_unlock( p_intf );
- vlc_object_release( p_intf );
-}
-
-int vout_ControlWindow( vout_thread_t *p_vout, void *p_window,
- int i_query, va_list args )
-{
- intf_thread_t *p_intf = p_vout->p_parent_intf;
- int i_ret;
-
- if( !p_intf ) return VLC_EGENERIC;
-
- vlc_object_lock( p_intf );
- if( p_intf->b_dead )
- {
- vlc_object_unlock( p_intf );
- return VLC_EGENERIC;
- }
-
- if( !p_intf->pf_control_window )
- {
- msg_Err( p_vout, "no pf_control_window");
- vlc_object_unlock( p_intf );
- return VLC_EGENERIC;
- }
-
- i_ret = p_intf->pf_control_window( p_intf, p_window, i_query, args );
- vlc_object_unlock( p_intf );
- return i_ret;
-}
-
/*****************************************************************************
* vout_IntfInit: called during the vout creation to initialise misc things.
*****************************************************************************/
const char *psz_label;
} p_crop_values[] = {
{ "", N_("Default") },
- { "1:1", "1:1" },
- { "4:3", "4:3" },
- { "16:9", "16:9" },
{ "16:10", "16:10" },
- { "5:4", "5:4" },
- { "5:3", "5:3" },
- { "1.85:1", "1.85:1" },
+ { "16:9", "16:9" },
+ { "185:100", "1.85:1" },
{ "221:100", "2.21:1" },
{ "235:100", "2.35:1" },
{ "239:100", "2.39:1" },
+ { "5:3", "5:3" },
+ { "4:3", "4:3" },
+ { "5:4", "5:4" },
+ { "1:1", "1:1" },
{ NULL, NULL } };
static const struct
var_Create( p_vout, "mouse-hide-timeout",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- p_vout->b_title_show = var_CreateGetBool( p_vout, "video-title-show" );
- p_vout->i_title_timeout =
+ p_vout->p->b_title_show = var_CreateGetBool( p_vout, "video-title-show" );
+ p_vout->p->i_title_timeout =
(mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" );
- p_vout->i_title_position =
+ p_vout->p->i_title_position =
var_CreateGetInteger( p_vout, "video-title-position" );
+ p_vout->p->psz_title = NULL;
var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL );
var_AddCallback( p_vout, "video-title-timeout", TitleTimeoutCallback, NULL );
var_AddCallback( p_vout, "crop", CropCallback, NULL );
var_Get( p_vout, "crop", &old_val );
if( old_val.psz_string && *old_val.psz_string )
- var_Change( p_vout, "crop", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 );
+ var_TriggerCallback( p_vout, "crop" );
free( old_val.psz_string );
/* Monitor pixel aspect-ratio */
}
if( !i_aspect_num || !i_aspect_den ) i_aspect_num = i_aspect_den = 1;
- p_vout->i_par_num = i_aspect_num;
- p_vout->i_par_den = i_aspect_den;
+ p_vout->p->i_par_num = i_aspect_num;
+ p_vout->p->i_par_den = i_aspect_den;
- vlc_ureduce( &p_vout->i_par_num, &p_vout->i_par_den,
- p_vout->i_par_num, p_vout->i_par_den, 0 );
+ vlc_ureduce( &p_vout->p->i_par_num, &p_vout->p->i_par_den,
+ p_vout->p->i_par_num, p_vout->p->i_par_den, 0 );
msg_Dbg( p_vout, "overriding monitor pixel aspect-ratio: %i:%i",
- p_vout->i_par_num, p_vout->i_par_den );
+ p_vout->p->i_par_num, p_vout->p->i_par_den );
b_force_par = true;
}
free( val.psz_string );
var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
var_Get( p_vout, "aspect-ratio", &old_val );
if( (old_val.psz_string && *old_val.psz_string) || b_force_par )
- var_Change( p_vout, "aspect-ratio", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 );
+ var_TriggerCallback( p_vout, "aspect-ratio" );
free( old_val.psz_string );
+ /* Add variables to manage scaling video */
+ var_Create( p_vout, "autoscale", VLC_VAR_BOOL | VLC_VAR_DOINHERIT
+ | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Autoscale video");
+ var_Change( p_vout, "autoscale", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "autoscale", ScalingCallback, NULL );
+ p_vout->b_autoscale = var_GetBool( p_vout, "autoscale" );
+
+ var_Create( p_vout, "scale", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT
+ | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Scale factor");
+ var_Change( p_vout, "scale", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "scale", ScalingCallback, NULL );
+ p_vout->i_zoom = (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) );
+
/* Initialize the dimensions of the video window */
InitWindowSize( p_vout, &p_vout->i_window_width,
&p_vout->i_window_height );
var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
- var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
+ var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
var_SetBool( p_vout, "intf-change", true );
/*****************************************************************************
* vout_Snapshot: generates a snapshot.
*****************************************************************************/
-int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
+/**
+ * This function will inject a subpicture into the vout with the provided
+ * picture
+ */
+static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic )
{
- image_handler_t *p_image = image_HandlerCreate( p_vout );
- video_format_t fmt_in, fmt_out;
- char *psz_filename = NULL;
- subpicture_t *p_subpic;
- picture_t *p_pif;
- vlc_value_t val, format;
- DIR *path;
- int i_ret;
-
- memset( &fmt_in, 0, sizeof(video_format_t) );
- memset( &fmt_out, 0, sizeof(video_format_t) );
-
- var_Get( p_vout, "snapshot-path", &val );
- if( val.psz_string && !*val.psz_string )
- {
- free( val.psz_string );
- val.psz_string = 0;
- }
-
- /* Embedded snapshot : if snapshot-path == object:object-id, then
- create a snapshot_t* and store it in
- object(object-id)->p_private, then unlock and signal the
- waiting object.
- */
- if( val.psz_string && !strncmp( val.psz_string, "object:", 7 ) )
- {
- int i_id;
- vlc_object_t* p_dest;
- block_t *p_block;
- snapshot_t *p_snapshot;
- int i_size;
-
- /* Destination object-id is following object: */
- i_id = atoi( &val.psz_string[7] );
- p_dest = ( vlc_object_t* )vlc_object_get( i_id );
- if( !p_dest )
- {
- msg_Err( p_vout, "Cannot find calling object" );
- image_HandlerDelete( p_image );
- return VLC_EGENERIC;
- }
- /* Object must be locked. We will unlock it once we get the
- snapshot and written it to p_private */
- p_dest->p_private = NULL;
-
- /* Save the snapshot to a memory zone */
- fmt_in = p_vout->fmt_in;
- fmt_out.i_sar_num = fmt_out.i_sar_den = 1;
- fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" );
- fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" );
- fmt_out.i_chroma = VLC_FOURCC( 'p','n','g',' ' );
-
- p_block = ( block_t* ) image_Write( p_image, p_pic, &fmt_in, &fmt_out );
- if( !p_block )
- {
- msg_Err( p_vout, "Could not get snapshot" );
- image_HandlerDelete( p_image );
- vlc_object_signal_maybe( VLC_OBJECT(p_dest) );
- vlc_object_release( p_dest );
- return VLC_EGENERIC;
- }
-
- /* Copy the p_block data to a snapshot structure */
- /* FIXME: get the timestamp */
- p_snapshot = ( snapshot_t* ) malloc( sizeof( snapshot_t ) );
- if( !p_snapshot )
- {
- block_Release( p_block );
- image_HandlerDelete( p_image );
- vlc_object_signal_maybe( VLC_OBJECT(p_dest) );
- vlc_object_release( p_dest );
- return VLC_ENOMEM;
- }
-
- i_size = p_block->i_buffer;
+ subpicture_t *p_subpic = subpicture_NewFromPicture( VLC_OBJECT(p_vout),
+ p_pic, VLC_CODEC_YUVA );
+ if( !p_subpic )
+ return VLC_EGENERIC;
- p_snapshot->i_width = fmt_out.i_width;
- p_snapshot->i_height = fmt_out.i_height;
- p_snapshot->i_datasize = i_size;
- p_snapshot->date = p_block->i_pts; /* FIXME ?? */
- p_snapshot->p_data = ( char* ) malloc( i_size );
- if( !p_snapshot->p_data )
- {
- block_Release( p_block );
- free( p_snapshot );
- image_HandlerDelete( p_image );
- vlc_object_signal_maybe( VLC_OBJECT(p_dest) );
- vlc_object_release( p_dest );
- return VLC_ENOMEM;
- }
- memcpy( p_snapshot->p_data, p_block->p_buffer, p_block->i_buffer );
+ /* FIXME DEFAULT_CHAN is not good (used by the text) but
+ * hardcoded 0 doesn't seem right */
+ p_subpic->i_channel = 0;
+ p_subpic->i_start = mdate();
+ p_subpic->i_stop = p_subpic->i_start + 4000000;
+ p_subpic->b_ephemer = true;
+ p_subpic->b_fade = true;
- p_dest->p_private = p_snapshot;
+ /* Reduce the picture to 1/4^2 of the screen */
+ p_subpic->i_original_picture_width *= 4;
+ p_subpic->i_original_picture_height *= 4;
- block_Release( p_block );
+ spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
+ return VLC_SUCCESS;
+}
- /* Unlock the object */
- vlc_object_signal_maybe( VLC_OBJECT(p_dest) );
- vlc_object_release( p_dest );
+/**
+ * This function will display the name and a PIP of the provided snapshot
+ */
+static void VoutOsdSnapshot( vout_thread_t *p_vout, picture_t *p_pic, const char *psz_filename )
+{
+ msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
+ vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN, "%s", psz_filename );
- image_HandlerDelete( p_image );
- return VLC_SUCCESS;
+ if( var_GetBool( p_vout, "snapshot-preview" ) )
+ {
+ if( VoutSnapshotPip( p_vout, p_pic ) )
+ msg_Warn( p_vout, "Failed to display snapshot" );
}
+}
-#if defined(__APPLE__) || defined(SYS_BEOS)
- if( !val.psz_string )
+/* */
+int vout_GetSnapshot( vout_thread_t *p_vout,
+ block_t **pp_image, picture_t **pp_picture,
+ video_format_t *p_fmt,
+ const char *psz_format, mtime_t i_timeout )
+{
+ picture_t *p_picture = vout_snapshot_Get( &p_vout->p->snapshot, i_timeout );
+ if( !p_picture )
{
- if( asprintf( &val.psz_string, "%s/Desktop",
- config_GetHomeDir() ) == -1 )
- val.psz_string = NULL;
+ msg_Err( p_vout, "Failed to grab a snapshot" );
+ return VLC_EGENERIC;
}
-#elif defined(WIN32) && !defined(UNDER_CE)
- if( !val.psz_string )
+ if( pp_image )
{
- /* Get the My Pictures folder path */
-
- char *p_mypicturesdir = NULL;
- typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPWSTR );
- #ifndef CSIDL_FLAG_CREATE
- # define CSIDL_FLAG_CREATE 0x8000
- #endif
- #ifndef CSIDL_MYPICTURES
- # define CSIDL_MYPICTURES 0x27
- #endif
- #ifndef SHGFP_TYPE_CURRENT
- # define SHGFP_TYPE_CURRENT 0
- #endif
-
- HINSTANCE shfolder_dll;
- SHGETFOLDERPATH SHGetFolderPath ;
-
- /* load the shfolder dll to retrieve SHGetFolderPath */
- if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
- {
- wchar_t wdir[PATH_MAX];
- SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- _T("SHGetFolderPathW") );
- if ((SHGetFolderPath != NULL )
- && SUCCEEDED (SHGetFolderPath (NULL,
- CSIDL_MYPICTURES | CSIDL_FLAG_CREATE,
- NULL, SHGFP_TYPE_CURRENT,
- wdir)))
- p_mypicturesdir = FromWide (wdir);
-
- FreeLibrary( shfolder_dll );
- }
+ vlc_fourcc_t i_format = VLC_CODEC_PNG;
+ if( psz_format && image_Type2Fourcc( psz_format ) )
+ i_format = image_Type2Fourcc( psz_format );
- if( p_mypicturesdir == NULL )
- {
- if( asprintf( &val.psz_string, "%s", config_GetHomeDir() ) == -1 )
- val.psz_string = NULL;
- }
- else
+ const unsigned i_override_width = var_GetInteger( p_vout, "snapshot-width" );
+ const unsigned i_override_height = var_GetInteger( p_vout, "snapshot-height" );
+
+ if( picture_Export( VLC_OBJECT(p_vout), pp_image, p_fmt,
+ p_picture, i_format, i_override_width, i_override_height ) )
{
- if( asprintf( &val.psz_string, p_mypicturesdir ) == -1 )
- val.psz_string = NULL;
- free( p_mypicturesdir );
+ msg_Err( p_vout, "Failed to convert image for snapshot" );
+ picture_Release( p_picture );
+ return VLC_EGENERIC;
}
}
+ if( pp_picture )
+ *pp_picture = p_picture;
+ else
+ picture_Release( p_picture );
+ return VLC_SUCCESS;
+}
-#else
- /* XXX: This saves in the data directory. Shouldn't we try saving
- * to psz_homedir/Desktop or something nicer ? */
- char *psz_datadir = config_GetUserDataDir();
- if( !val.psz_string && psz_datadir )
- {
- if( asprintf( &val.psz_string, "%s", psz_datadir ) == -1 )
- val.psz_string = NULL;
- }
- free( psz_datadir );
-#endif
-
- if( !val.psz_string )
- {
- msg_Err( p_vout, "no path specified for snapshots" );
- image_HandlerDelete( p_image );
- return VLC_EGENERIC;
- }
- var_Get( p_vout, "snapshot-format", &format );
- if( !format.psz_string || !*format.psz_string )
+/**
+ * This function will handle a snapshot request
+ */
+static void VoutSaveSnapshot( vout_thread_t *p_vout )
+{
+ char *psz_path = var_GetNonEmptyString( p_vout, "snapshot-path" );
+ char *psz_format = var_GetNonEmptyString( p_vout, "snapshot-format" );
+ char *psz_prefix = var_GetNonEmptyString( p_vout, "snapshot-prefix" );
+
+ /* */
+ picture_t *p_picture;
+ block_t *p_image;
+ video_format_t fmt;
+
+ /* 500ms timeout
+ * XXX it will cause trouble with low fps video (< 2fps) */
+ if( vout_GetSnapshot( p_vout, &p_image, &p_picture, &fmt, psz_format, 500*1000 ) )
{
- free( format.psz_string );
- format.psz_string = strdup( "png" );
+ p_picture = NULL;
+ p_image = NULL;
+ goto exit;
}
- /*
- * Did the user specify a directory? If not, path = NULL.
- */
- path = utf8_opendir ( (const char *)val.psz_string );
- if( path != NULL )
+ if( !psz_path )
{
- char *psz_prefix = var_GetNonEmptyString( p_vout, "snapshot-prefix" );
- if( psz_prefix == NULL )
- psz_prefix = strdup( "vlcsnap-" );
- else
- {
- char *psz_tmp = str_format( p_vout, psz_prefix );
- filename_sanitize( psz_tmp );
- free( psz_prefix );
- psz_prefix = psz_tmp;
- }
-
- closedir( path );
- if( var_GetBool( p_vout, "snapshot-sequential" ) == true )
- {
- int i_num = var_GetInteger( p_vout, "snapshot-num" );
- FILE *p_file;
- do
- {
- if( asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s",
- val.psz_string, psz_prefix, i_num++,
- format.psz_string ) == -1 )
- {
- msg_Err( p_vout, "could not create snapshot" );
- image_HandlerDelete( p_image );
- return VLC_EGENERIC;
- }
- }
- while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
- var_SetInteger( p_vout, "snapshot-num", i_num );
- }
- else
+ psz_path = vout_snapshot_GetDirectory();
+ if( !psz_path )
{
- if( asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s",
- val.psz_string, psz_prefix,
- (unsigned int)(p_pic->date / 100000) & 0xFFFFFF,
- format.psz_string ) == -1 )
- {
- msg_Err( p_vout, "could not create snapshot" );
- image_HandlerDelete( p_image );
- return VLC_EGENERIC;
- }
+ msg_Err( p_vout, "no path specified for snapshots" );
+ goto exit;
}
-
- free( psz_prefix );
- }
- else // The user specified a full path name (including file name)
- {
- psz_filename = str_format( p_vout, val.psz_string );
- path_sanitize( psz_filename );
}
- free( val.psz_string );
- free( format.psz_string );
+ vout_snapshot_save_cfg_t cfg;
+ memset( &cfg, 0, sizeof(cfg) );
+ cfg.is_sequential = var_GetBool( p_vout, "snapshot-sequential" );
+ cfg.sequence = var_GetInteger( p_vout, "snapshot-num" );
+ cfg.path = psz_path;
+ cfg.format = psz_format;
+ cfg.prefix_fmt = psz_prefix;
+
+ char *psz_filename;
+ int i_sequence;
+ if (vout_snapshot_SaveImage( &psz_filename, &i_sequence,
+ p_image, VLC_OBJECT(p_vout), &cfg ) )
+ goto exit;
+ if( cfg.is_sequential )
+ var_SetInteger( p_vout, "snapshot-num", i_sequence + 1 );
+
+ VoutOsdSnapshot( p_vout, p_picture, psz_filename );
+
+ /* Generate a media player event - Right now just trigger a global libvlc var
+ CHECK: Could not find a more local object. The goal is to communicate
+ vout_thread with libvlc_media_player or its input_thread */
+ var_SetString( p_vout->p_libvlc, "vout-snapshottaken", psz_filename );
+ free( psz_filename );
- fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" );
- fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" );
+exit:
+ if( p_image )
+ block_Release( p_image );
+ if( p_picture )
+ picture_Release( p_picture );
+ free( psz_prefix );
+ free( psz_format );
+ free( psz_path );
+}
- fmt_in = p_vout->fmt_in;
+/*****************************************************************************
+ * Handle filters
+ *****************************************************************************/
- if( fmt_out.i_width == 0 && fmt_out.i_height > 0 )
- {
- fmt_out.i_width = (fmt_in.i_width * fmt_out.i_height) / fmt_in.i_height;
- }
- else if( fmt_out.i_height == 0 && fmt_out.i_width > 0 )
+void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name,
+ bool b_add, bool b_setconfig )
+{
+ char *psz_parser;
+ char *psz_string;
+ const char *psz_filter_type;
+
+ /* FIXME temporary hack */
+ const char *psz_module_name = psz_name;
+ if( !strcmp( psz_name, "magnify" ) ||
+ !strcmp( psz_name, "puzzle" ) ||
+ !strcmp( psz_name, "logo" ) ||
+ !strcmp( psz_name, "wall" ) ||
+ !strcmp( psz_name, "clone" ) )
+ psz_module_name = "video_filter_wrapper";
+
+ module_t *p_obj = module_find( psz_module_name );
+ if( !p_obj )
{
- fmt_out.i_height = (fmt_in.i_height * fmt_out.i_width) / fmt_in.i_width;
+ msg_Err( p_vout, "Unable to find filter module \"%s\".", psz_name );
+ return;
}
- else
+
+ if( module_provides( p_obj, "video filter" ) )
{
- fmt_out.i_width = fmt_in.i_width;
- fmt_out.i_height = fmt_in.i_height;
+ psz_filter_type = "vout-filter";
}
-
- /* Save the snapshot */
- fmt_out.i_sar_num = fmt_out.i_sar_den = 1;
- i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename );
- if( i_ret != VLC_SUCCESS )
+ else if( module_provides( p_obj, "video filter2" ) )
{
- msg_Err( p_vout, "could not create snapshot %s", psz_filename );
- free( psz_filename );
- image_HandlerDelete( p_image );
- return VLC_EGENERIC;
+ psz_filter_type = "video-filter";
}
-
- msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
- vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN,
- "%s", psz_filename );
- free( psz_filename );
-
- if( var_GetBool( p_vout, "snapshot-preview" ) )
+ else if( module_provides( p_obj, "sub filter" ) )
{
- /* Inject a subpicture with the snapshot */
- memset( &fmt_out, 0, sizeof(fmt_out) );
- fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
- p_pif = image_Convert( p_image, p_pic, &fmt_in, &fmt_out );
- image_HandlerDelete( p_image );
- if( !p_pif ) return VLC_EGENERIC;
-
- p_subpic = spu_CreateSubpicture( p_vout->p_spu );
- if( p_subpic == NULL )
- {
- p_pif->pf_release( p_pif );
- return VLC_EGENERIC;
- }
-
- p_subpic->i_channel = 0;
- p_subpic->i_start = mdate();
- p_subpic->i_stop = mdate() + 4000000;
- p_subpic->b_ephemer = true;
- p_subpic->b_fade = true;
- p_subpic->i_original_picture_width = p_vout->render.i_width * 4;
- p_subpic->i_original_picture_height = p_vout->render.i_height * 4;
-
- p_subpic->p_region = spu_CreateRegion( p_vout->p_spu, &fmt_out );
- vout_CopyPicture( p_image->p_parent, &p_subpic->p_region->picture,
- p_pif );
- p_pif->pf_release( p_pif );
-
- spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
+ psz_filter_type = "sub-filter";
}
else
{
- image_HandlerDelete( p_image );
+ module_release( p_obj );
+ msg_Err( p_vout, "Unknown video filter type." );
+ return;
}
+ module_release( p_obj );
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Handle filters
- *****************************************************************************/
-
-void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name,
- bool b_add, bool b_setconfig )
-{
- char *psz_parser;
- char *psz_string = config_GetPsz( p_vout, "vout-filter" );
+ if( !strcmp( psz_filter_type, "sub-filter") )
+ psz_string = var_GetString( vout_GetSpu( p_vout ), psz_filter_type );
+ else
+ psz_string = var_GetString( p_vout, psz_filter_type );
/* Todo : Use some generic chain manipulation functions */
if( !psz_string ) psz_string = strdup("");
return;
}
}
- if( b_setconfig )
- config_PutPsz( p_vout, "vout-filter", psz_string );
-
- var_SetString( p_vout, "vout-filter", psz_string );
- free( psz_string );
-}
-/*****************************************************************************
- * vout_ControlDefault: default methods for video output control.
- *****************************************************************************/
-int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args )
-{
- (void)args;
- switch( i_query )
+ if( b_setconfig )
{
- case VOUT_REPARENT:
- case VOUT_CLOSE:
- if( p_vout->p_parent_intf )
- {
- vlc_object_release( p_vout->p_parent_intf );
- p_vout->p_parent_intf = NULL;
- }
- return VLC_SUCCESS;
- break;
+ if( !strcmp( psz_filter_type, "sub-filter") )
+ config_PutPsz( vout_GetSpu( p_vout ), psz_filter_type, psz_string );
+ else
+ config_PutPsz( p_vout, psz_filter_type, psz_string );
+ }
- case VOUT_SNAPSHOT:
- p_vout->b_snapshot = true;
- return VLC_SUCCESS;
- break;
+ if( !strcmp( psz_filter_type, "sub-filter") )
+ var_SetString( vout_GetSpu( p_vout ), psz_filter_type, psz_string );
+ else
+ var_SetString( p_vout, psz_filter_type, psz_string );
- default:
- msg_Dbg( p_vout, "control query not supported" );
- return VLC_EGENERIC;
- }
+ free( psz_string );
}
/*****************************************************************************
static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
unsigned *pi_height )
{
- vlc_value_t val;
- int i_width, i_height;
- uint64_t ll_zoom;
-
#define FP_FACTOR 1000 /* our fixed point factor */
- var_Get( p_vout, "width", &val );
- i_width = val.i_int;
- var_Get( p_vout, "height", &val );
- i_height = val.i_int;
- var_Get( p_vout, "zoom", &val );
- ll_zoom = (uint64_t)( FP_FACTOR * val.f_float );
+ int i_width = var_GetInteger( p_vout, "width" );
+ int i_height = var_GetInteger( p_vout, "height" );
+ float f_zoom = var_GetFloat( p_vout, "zoom" );
+ uint64_t ll_zoom = (uint64_t)( FP_FACTOR * f_zoom );
if( i_width > 0 && i_height > 0)
{
*pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
*pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
- goto initwsize_end;
}
else if( i_width > 0 )
{
*pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom *
p_vout->fmt_in.i_sar_den * i_width / p_vout->fmt_in.i_sar_num /
FP_FACTOR / p_vout->fmt_in.i_visible_width );
- goto initwsize_end;
}
else if( i_height > 0 )
{
*pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
p_vout->fmt_in.i_sar_num * i_height / p_vout->fmt_in.i_sar_den /
FP_FACTOR / p_vout->fmt_in.i_visible_height );
- goto initwsize_end;
}
-
- if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) {
- msg_Warn( p_vout, "fucked up aspect" );
+ else if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 )
+ {
+ msg_Warn( p_vout, "aspect ratio screwed up" );
*pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom / FP_FACTOR );
*pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom /FP_FACTOR);
}
p_vout->fmt_in.i_sar_den / p_vout->fmt_in.i_sar_num / FP_FACTOR );
}
-initwsize_end:
- msg_Dbg( p_vout, "window size: %dx%d", p_vout->i_window_width,
- p_vout->i_window_height );
+ msg_Dbg( p_vout, "window size: %ux%u", *pi_width, *pi_height );
#undef FP_FACTOR
}
i_crop_top = strtol( psz_end, &psz_end, 10 );
if( *psz_end != '\0' ) goto crop_end;
+ if( i_crop_top + i_crop_height >= p_vout->fmt_render.i_visible_height ||
+ i_crop_left + i_crop_width >= p_vout->fmt_render.i_visible_width )
+ {
+ msg_Err( p_vout, "Unable to crop over picture boundaries");
+ return VLC_EGENERIC;
+ }
+
i_width = i_crop_width;
p_vout->fmt_in.i_visible_width = i_width;
i_crop_bottom = strtol( psz_end, &psz_end, 10 );
if( *psz_end != '\0' ) goto crop_end;
+ if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height ||
+ i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width )
+ {
+ msg_Err( p_vout, "Unable to crop over picture boundaries" );
+ return VLC_EGENERIC;
+ }
+
i_width = p_vout->fmt_render.i_visible_width
- i_crop_left - i_crop_right;
p_vout->fmt_in.i_visible_width = i_width;
i_crop_right = var_GetInteger( p_vout, "crop-right" );
i_crop_bottom = var_GetInteger( p_vout, "crop-bottom" );
+ if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height ||
+ i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width )
+ {
+ msg_Err( p_vout, "Unable to crop over picture boundaries" );
+ return VLC_EGENERIC;
+ }
+
i_width = p_vout->fmt_render.i_visible_width
- i_crop_left - i_crop_right;
p_vout->fmt_in.i_visible_width = i_width;
p_vout->fmt_in.i_visible_width,
p_vout->fmt_in.i_visible_height );
- var_SetVoid( p_vout, "crop-update" );
+ var_TriggerCallback( p_vout, "crop-update" );
return VLC_SUCCESS;
}
p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
aspect_end:
- if( p_vout->i_par_num && p_vout->i_par_den )
+ if( p_vout->p->i_par_num && p_vout->p->i_par_den )
{
- p_vout->fmt_in.i_sar_num *= p_vout->i_par_den;
- p_vout->fmt_in.i_sar_den *= p_vout->i_par_num;
+ p_vout->fmt_in.i_sar_num *= p_vout->p->i_par_den;
+ p_vout->fmt_in.i_sar_den *= p_vout->p->i_par_num;
p_vout->fmt_in.i_aspect = p_vout->fmt_in.i_aspect *
- p_vout->i_par_den / p_vout->i_par_num;
+ p_vout->p->i_par_den / p_vout->p->i_par_num;
p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
}
i_aspect_num, i_aspect_den,
p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
- var_Get( p_vout, "crop", &val );
- return CropCallback( p_this, "crop", val, val, 0 );
+ if( var_Get( p_vout, "crop", &val ) )
+ return VLC_EGENERIC;
+
+ int i_ret = CropCallback( p_this, "crop", val, val, 0 );
+ free( val.psz_string );
+ return i_ret;
+}
+
+static int ScalingCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ (void)oldval; (void)newval; (void)p_data;
+
+ vlc_mutex_lock( &p_vout->change_lock );
+
+ if( !strcmp( psz_cmd, "autoscale" ) )
+ {
+ p_vout->i_changes |= VOUT_SCALE_CHANGE;
+ }
+ else if( !strcmp( psz_cmd, "scale" ) )
+ {
+ p_vout->i_changes |= VOUT_ZOOM_CHANGE;
+ }
+
+ vlc_mutex_unlock( &p_vout->change_lock );
+
+ return VLC_SUCCESS;
}
static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- playlist_t *p_playlist = pl_Yield( p_this );
- vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool );
- (void)psz_cmd; (void)oldval; (void)p_data;
- /* Modify playlist as well because the vout might have to be restarted */
- var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
- var_Set( p_playlist, "video-on-top", newval );
+ vlc_mutex_lock( &p_vout->change_lock );
+ p_vout->i_changes |= VOUT_ON_TOP_CHANGE;
+ p_vout->b_on_top = newval.b_bool;
+ vlc_mutex_unlock( &p_vout->change_lock );
+
+ /* Modify libvlc as well because the vout might have to be restarted */
+ var_Create( p_vout->p_libvlc, "video-on-top", VLC_VAR_BOOL );
+ var_Set( p_vout->p_libvlc, "video-on-top", newval );
- pl_Release( p_playlist );
+ (void)psz_cmd; (void)oldval; (void)p_data;
return VLC_SUCCESS;
}
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vlc_value_t val;
- playlist_t *p_playlist = pl_Yield( p_this );
(void)psz_cmd; (void)oldval; (void)p_data;
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- /* Modify playlist as well because the vout might have to be restarted */
- var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL );
- var_Set( p_playlist, "fullscreen", newval );
- pl_Release( p_playlist );
+ /* Modify libvlc as well because the vout might have to be restarted */
+ var_Create( p_vout->p_libvlc, "fullscreen", VLC_VAR_BOOL );
+ var_Set( p_vout->p_libvlc, "fullscreen", newval );
val.b_bool = true;
var_Set( p_vout, "intf-change", val );
static int SnapshotCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
VLC_UNUSED(newval); VLC_UNUSED(p_data);
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- vout_Control( p_vout, VOUT_SNAPSHOT );
+
+ VoutSaveSnapshot( p_vout );
return VLC_SUCCESS;
}
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->b_title_show = newval.b_bool;
+ p_vout->p->b_title_show = newval.b_bool;
return VLC_SUCCESS;
}
{
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->i_title_timeout = (mtime_t) newval.i_int;
+ p_vout->p->i_title_timeout = (mtime_t) newval.i_int;
return VLC_SUCCESS;
}
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->i_title_position = newval.i_int;
+ p_vout->p->i_title_position = newval.i_int;
return VLC_SUCCESS;
}
projects / vlc / blobdiff