/*****************************************************************************
* vout_intf.c : video output interface
*****************************************************************************
- * Copyright (C) 2000-2004 the VideoLAN team
+ * Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
* 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include "vlc_video.h"
-#include "video_output.h"
-#include "vlc_image.h"
-#include "vlc_spu.h"
+#include <stdio.h>
+#include <stdlib.h> /* free() */
+#include <sys/types.h> /* opendir() */
+#include <dirent.h> /* opendir() */
+
+#include <vlc_interface.h>
+#include <vlc_block.h>
+#include <vlc_playlist.h>
+
+#include <vlc_vout.h>
+#include <vlc_image.h>
+#include <vlc_osd.h>
+#include <vlc_charset.h>
+
+#include <vlc_strings.h>
+#include <vlc_charset.h>
+#include "../libvlc.h"
/*****************************************************************************
* Local prototypes
vlc_value_t, vlc_value_t, void * );
static int SnapshotCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int TitleCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/*****************************************************************************
* vout_RequestWindow: Create/Get a video window if possible.
*pi_height_hint = p_vout->i_window_height;
/* Check whether someone provided us with a window ID */
- var_Get( p_vout->p_vlc, "drawable", &val );
- if( val.i_int ) return (void *)val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable", &val );
+ if( val.i_int ) return (void *)(intptr_t)val.i_int;
/* Find if the main interface supports embedding */
p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE );
for( i = 0; i < p_list->i_count; i++ )
{
p_intf = (intf_thread_t *)p_list->p_values[i].p_object;
- if( p_intf->b_block && p_intf->pf_request_window ) break;
+ if( p_intf->pf_request_window ) break;
p_intf = NULL;
}
{
vlc_value_t val, text, old_val;
vlc_bool_t b_force_par = VLC_FALSE;
+ char *psz_buf;
/* Create a few object variables we'll need later on */
var_Create( p_vout, "snapshot-path", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "snapshot-prefix", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Create( p_vout, "snapshot-format", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "snapshot-preview", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "snapshot-sequential",
+ VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "snapshot-num", VLC_VAR_INTEGER );
+ var_SetInteger( p_vout, "snapshot-num", 1 );
+ var_Create( p_vout, "snapshot-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "snapshot-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "align", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "video-title-show", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "video-title-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "video-title-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+ p_vout->b_title_show = var_GetBool( p_vout, "video-title-show" );
+ p_vout->i_title_timeout = (mtime_t) var_GetInteger( p_vout, "video-title-timeout" );
+ p_vout->i_title_position = var_GetInteger( p_vout, "video-title-position" );
+
+ var_AddCallback( p_vout, "video-title-show", TitleCallback, NULL );
+ var_AddCallback( p_vout, "video-title-timeout", TitleCallback, NULL );
+ var_AddCallback( p_vout, "video-title-position", TitleCallback, NULL );
+
/* Zoom object var */
var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND |
VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
var_AddCallback( p_vout, "zoom", ZoomCallback, NULL );
+ /* Crop offset vars */
+ var_Create( p_vout, "crop-left", VLC_VAR_INTEGER );
+ var_Create( p_vout, "crop-top", VLC_VAR_INTEGER );
+ var_Create( p_vout, "crop-right", VLC_VAR_INTEGER );
+ var_Create( p_vout, "crop-bottom", VLC_VAR_INTEGER );
+
+ var_SetInteger( p_vout, "crop-left", 0 );
+ var_SetInteger( p_vout, "crop-top", 0 );
+ var_SetInteger( p_vout, "crop-right", 0 );
+ var_SetInteger( p_vout, "crop-bottom", 0 );
+
+ var_AddCallback( p_vout, "crop-left", CropCallback, NULL );
+ var_AddCallback( p_vout, "crop-top", CropCallback, NULL );
+ var_AddCallback( p_vout, "crop-right", CropCallback, NULL );
+ var_AddCallback( p_vout, "crop-bottom", CropCallback, NULL );
+
/* Crop object var */
var_Create( p_vout, "crop", VLC_VAR_STRING |
VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
var_Change( p_vout, "crop", VLC_VAR_DELCHOICE, &val, 0 );
val.psz_string = ""; text.psz_string = _("Default");
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "001:1"; text.psz_string = _("1:1");
+ val.psz_string = "1:1"; text.psz_string = "1:1";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "4:3"; text.psz_string = "4:3";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "16:9"; text.psz_string = "16:9";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "16:10"; text.psz_string = "16:10";
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "004:3"; text.psz_string = _("4:3");
+ val.psz_string = "5:4"; text.psz_string = "5:4";
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "16:10"; text.psz_string = _("16:10");
+ val.psz_string = "5:3"; text.psz_string = "5:3";
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "16:9"; text.psz_string = _("16:9");
+ val.psz_string = "1.85:1"; text.psz_string = "1.85:1";
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "221:100"; text.psz_string = _("221:100");
+ val.psz_string = "221:100"; text.psz_string = "2.21:1";
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "235:100"; text.psz_string = "2.35:1";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "239:100"; text.psz_string = "2.39:1";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+
+ /* Add custom crop ratios */
+ psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" );
+ if( psz_buf && *psz_buf )
+ {
+ char *psz_cur = psz_buf;
+ char *psz_next;
+ while( psz_cur && *psz_cur )
+ {
+ psz_next = strchr( psz_cur, ',' );
+ if( psz_next )
+ {
+ *psz_next = '\0';
+ psz_next++;
+ }
+ val.psz_string = strdup( psz_cur );
+ text.psz_string = strdup( psz_cur );
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text);
+ free( val.psz_string );
+ free( text.psz_string );
+ psz_cur = psz_next;
+ }
+ }
+ if( psz_buf ) free( psz_buf );
var_AddCallback( p_vout, "crop", CropCallback, NULL );
var_Get( p_vout, "crop", &old_val );
float i_aspect = 0;
if( psz_parser )
{
- i_aspect_num = strtol( val.psz_string, 0, 0 );
- i_aspect_den = strtol( ++psz_parser, 0, 0 );
+ i_aspect_num = strtol( val.psz_string, 0, 10 );
+ i_aspect_den = strtol( ++psz_parser, 0, 10 );
}
else
{
vlc_ureduce( &p_vout->i_par_num, &p_vout->i_par_den,
p_vout->i_par_num, p_vout->i_par_den, 0 );
- msg_Dbg( p_vout, "monitor pixel aspect-ratio overriding: %i:%i",
+ msg_Dbg( p_vout, "overriding monitor pixel aspect-ratio: %i:%i",
p_vout->i_par_num, p_vout->i_par_den );
b_force_par = VLC_TRUE;
}
var_Change( p_vout, "aspect-ratio", VLC_VAR_DELCHOICE, &val, 0 );
val.psz_string = ""; text.psz_string = _("Default");
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "001:1"; text.psz_string = _("1:1");
+ val.psz_string = "1:1"; text.psz_string = "1:1";
+ var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "4:3"; text.psz_string = "4:3";
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "004:3"; text.psz_string = _("4:3");
+ val.psz_string = "16:9"; text.psz_string = "16:9";
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "16:9"; text.psz_string = _("16:9");
+ val.psz_string = "16:10"; text.psz_string = "16:10";
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "221:100"; text.psz_string = _("221:100");
+ val.psz_string = "221:100"; text.psz_string = "2.21:1";
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "5:4"; text.psz_string = "5:4";
+ var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
+
+ /* Add custom aspect ratios */
+ psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" );
+ if( psz_buf && *psz_buf )
+ {
+ char *psz_cur = psz_buf;
+ char *psz_next;
+ while( psz_cur && *psz_cur )
+ {
+ psz_next = strchr( psz_cur, ',' );
+ if( psz_next )
+ {
+ *psz_next = '\0';
+ psz_next++;
+ }
+ val.psz_string = strdup( psz_cur );
+ text.psz_string = strdup( psz_cur );
+ var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text);
+ free( val.psz_string );
+ free( text.psz_string );
+ psz_cur = psz_next;
+ }
+ }
+ if( psz_buf ) free( psz_buf );
var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
var_Get( p_vout, "aspect-ratio", &old_val );
int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
{
image_handler_t *p_image = image_HandlerCreate( p_vout );
- video_format_t fmt_in = {0}, fmt_out = {0};
- char *psz_filename;
+ 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 )
{
val.psz_string = 0;
}
-#if defined(SYS_DARWIN) || defined(SYS_BEOS)
- if( !val.psz_string && p_vout->p_vlc->psz_homedir )
+ /* 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_current_object( 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;
+ /* FIXME: should not be hardcoded. We should be able to
+ specify the snapshot size (snapshot-width and snapshot-height). */
+ 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_cond_signal( &p_dest->object_wait );
+ 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_cond_signal( &p_dest->object_wait );
+ vlc_object_release( p_dest );
+ return VLC_ENOMEM;
+ }
+
+ i_size = p_block->i_buffer;
+
+ 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_cond_signal( &p_dest->object_wait );
+ vlc_object_release( p_dest );
+ return VLC_ENOMEM;
+ }
+ memcpy( p_snapshot->p_data, p_block->p_buffer, p_block->i_buffer );
+
+ p_dest->p_private = p_snapshot;
+
+ block_Release( p_block );
+
+ /* Unlock the object */
+ vlc_cond_signal( &p_dest->object_wait );
+ vlc_object_release( p_dest );
+
+ image_HandlerDelete( p_image );
+ return VLC_SUCCESS;
+ }
+
+#if defined(__APPLE__) || defined(SYS_BEOS)
+ if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
{
- asprintf( &val.psz_string, "%s/Desktop",
- p_vout->p_vlc->psz_homedir );
+ if( asprintf( &val.psz_string, "%s/Desktop",
+ p_vout->p_libvlc->psz_homedir ) == -1 )
+ val.psz_string = NULL;
}
#elif defined(WIN32) && !defined(UNDER_CE)
- if( !val.psz_string && p_vout->p_vlc->psz_homedir )
+ if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
{
/* Get the My Pictures folder path */
char *p_mypicturesdir = NULL;
typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPSTR );
+ LPWSTR );
#ifndef CSIDL_FLAG_CREATE
# define CSIDL_FLAG_CREATE 0x8000
#endif
/* load the shfolder dll to retrieve SHGetFolderPath */
if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
{
- SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- _T("SHGetFolderPathA") );
- if( SHGetFolderPath != NULL )
- {
- p_mypicturesdir = (char *)malloc( MAX_PATH );
- if( p_mypicturesdir )
- {
-
- if( S_OK != SHGetFolderPath( NULL,
- CSIDL_MYPICTURES | CSIDL_FLAG_CREATE,
- NULL, SHGFP_TYPE_CURRENT,
- p_mypicturesdir ) )
- {
- free( p_mypicturesdir );
- p_mypicturesdir = 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 );
}
if( p_mypicturesdir == NULL )
{
- asprintf( &val.psz_string, "%s/" CONFIG_DIR,
- p_vout->p_vlc->psz_homedir );
+ if( asprintf( &val.psz_string, "%s",
+ p_vout->p_libvlc->psz_homedir ) == -1 )
+ val.psz_string = NULL;
}
else
{
- asprintf( &val.psz_string, p_mypicturesdir );
+ if( asprintf( &val.psz_string, p_mypicturesdir ) == -1 )
+ val.psz_string = NULL;
free( p_mypicturesdir );
}
}
#else
- if( !val.psz_string && p_vout->p_vlc->psz_homedir )
+ /* XXX: This saves in the data directory. Shouldn't we try saving
+ * to psz_homedir/Desktop or something nicer ? */
+ if( !val.psz_string && p_vout->p_libvlc->psz_datadir )
{
- asprintf( &val.psz_string, "%s/" CONFIG_DIR,
- p_vout->p_vlc->psz_homedir );
+ if( asprintf( &val.psz_string, "%s",
+ p_vout->p_libvlc->psz_datadir ) == -1 )
+ val.psz_string = NULL;
}
#endif
if( !val.psz_string )
{
- msg_Err( p_vout, "no directory specified for snapshots" );
+ msg_Err( p_vout, "no path specified for snapshots" );
return VLC_EGENERIC;
}
var_Get( p_vout, "snapshot-format", &format );
format.psz_string = strdup( "png" );
}
- asprintf( &psz_filename, "%s/vlcsnap-%u.%s", val.psz_string,
- (unsigned int)(p_pic->date / 100000) & 0xFFFFFF,
- format.psz_string );
+ /*
+ * Did the user specify a directory? If not, path = NULL.
+ */
+ path = utf8_opendir ( (const char *)val.psz_string );
+ if ( path != NULL )
+ {
+ 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" ) == VLC_TRUE )
+ {
+ int i_num = var_GetInteger( p_vout, "snapshot-num" );
+ FILE *p_file;
+ do
+ {
+ asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s", val.psz_string,
+ psz_prefix, i_num++, format.psz_string );
+ }
+ while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
+ var_SetInteger( p_vout, "snapshot-num", i_num );
+ }
+ else
+ {
+ asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s", val.psz_string,
+ psz_prefix,
+ (unsigned int)(p_pic->date / 100000) & 0xFFFFFF,
+ format.psz_string );
+ }
+
+ 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 );
}
msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
+ vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN,
+ "%s", psz_filename );
free( psz_filename );
- /* 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;
+ if( var_GetBool( p_vout, "snapshot-preview" ) )
+ {
+ /* 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 = VLC_TRUE;
+ p_subpic->b_fade = VLC_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 = spu_CreateSubpicture( p_vout->p_spu );
- if( p_subpic == NULL )
+ 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 );
+ }
+ else
{
- p_pif->pf_release( p_pif );
- return VLC_EGENERIC;
+ image_HandlerDelete( p_image );
}
- p_subpic->i_channel = 0;
- p_subpic->i_start = mdate();
- p_subpic->i_stop = mdate() + 4000000;
- p_subpic->b_ephemer = VLC_TRUE;
- p_subpic->b_fade = VLC_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;
+ return VLC_SUCCESS;
+}
- 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 );
+/*****************************************************************************
+ * Handle filters
+ *****************************************************************************/
- spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
+void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name,
+ vlc_bool_t b_add, vlc_bool_t b_setconfig )
+{
+ char *psz_parser;
+ char *psz_string = config_GetPsz( p_vout, "vout-filter" );
- return VLC_SUCCESS;
+ /* Todo : Use some generic chain manipulation functions */
+ if( !psz_string ) psz_string = strdup("");
+
+ psz_parser = strstr( psz_string, psz_name );
+ if( b_add )
+ {
+ if( !psz_parser )
+ {
+ psz_parser = psz_string;
+ asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
+ psz_string, psz_name );
+ free( psz_parser );
+ }
+ else
+ return;
+ }
+ else
+ {
+ if( psz_parser )
+ {
+ memmove( psz_parser, psz_parser + strlen(psz_name) +
+ (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
+ strlen(psz_parser + strlen(psz_name)) + 1 );
+
+ /* Remove trailing : : */
+ if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
+ {
+ *(psz_string+strlen(psz_string ) -1 ) = '\0';
+ }
+ }
+ else
+ {
+ free( psz_string );
+ return;
+ }
+ }
+ if( b_setconfig )
+ config_PutPsz( p_vout, "vout-filter", psz_string );
+
+ var_SetString( p_vout, "vout-filter", psz_string );
+ free( psz_string );
}
/*****************************************************************************
*****************************************************************************/
int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args )
{
+ (void)args;
switch( i_query )
{
case VOUT_REPARENT:
goto initwsize_end;
}
- if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
+ if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) {
+ msg_Warn( p_vout, "fucked up aspect" );
+ *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);
+ }
+ else if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
{
*pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom
+ *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom
/ FP_FACTOR );
}
else
{
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom
+ *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 *
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,
+ msg_Dbg( p_vout, "window size: %dx%d", p_vout->i_window_width,
p_vout->i_window_height );
#undef FP_FACTOR
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
InitWindowSize( p_vout, &p_vout->i_window_width,
&p_vout->i_window_height );
- vout_Control( p_vout, VOUT_SET_ZOOM );
+ vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
+ p_vout->i_window_height );
return VLC_SUCCESS;
}
int64_t i_aspect_num, i_aspect_den;
unsigned int i_width, i_height;
- char *psz_end, *psz_parser = strchr( newval.psz_string, ':' );
+ (void)oldval; (void)p_data;
/* Restore defaults */
p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset;
p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset;
p_vout->fmt_in.i_visible_height = p_vout->fmt_render.i_visible_height;
- if( !psz_parser ) goto crop_end;
+ if( !strcmp( psz_cmd, "crop" ) )
+ {
+ char *psz_end = NULL, *psz_parser = strchr( newval.psz_string, ':' );
+ if( psz_parser )
+ {
+ /* We're using the 3:4 syntax */
+ i_aspect_num = strtol( newval.psz_string, &psz_end, 10 );
+ if( psz_end == newval.psz_string || !i_aspect_num ) goto crop_end;
- i_aspect_num = strtol( newval.psz_string, &psz_end, 0 );
- if( psz_end == newval.psz_string || !i_aspect_num ) goto crop_end;
+ i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
+ if( psz_end == psz_parser || !i_aspect_den ) goto crop_end;
- i_aspect_den = strtol( ++psz_parser, &psz_end, 0 );
- if( psz_end == psz_parser || !i_aspect_den ) goto crop_end;
+ i_width = p_vout->fmt_in.i_sar_den*p_vout->fmt_render.i_visible_height *
+ i_aspect_num / i_aspect_den / p_vout->fmt_in.i_sar_num;
+ i_height = p_vout->fmt_render.i_visible_width*p_vout->fmt_in.i_sar_num *
+ i_aspect_den / i_aspect_num / p_vout->fmt_in.i_sar_den;
- i_width = p_vout->fmt_in.i_sar_den * p_vout->fmt_render.i_visible_height *
- i_aspect_num / i_aspect_den / p_vout->fmt_in.i_sar_num;
- i_height = p_vout->fmt_render.i_visible_width * p_vout->fmt_in.i_sar_num *
- i_aspect_den / i_aspect_num / p_vout->fmt_in.i_sar_den;
+ if( i_width < p_vout->fmt_render.i_visible_width )
+ {
+ p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset +
+ (p_vout->fmt_render.i_visible_width - i_width) / 2;
+ p_vout->fmt_in.i_visible_width = i_width;
+ }
+ else
+ {
+ p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset +
+ (p_vout->fmt_render.i_visible_height - i_height) / 2;
+ p_vout->fmt_in.i_visible_height = i_height;
+ }
+ }
+ else
+ {
+ psz_parser = strchr( newval.psz_string, 'x' );
+ if( psz_parser )
+ {
+ /* Maybe we're using the <width>x<height>+<left>+<top> syntax */
+ unsigned int i_crop_width, i_crop_height, i_crop_top, i_crop_left;
- if( i_width < p_vout->fmt_render.i_visible_width )
- {
- p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset +
- (p_vout->fmt_render.i_visible_width - i_width) / 2;
- p_vout->fmt_in.i_visible_width = i_width;
+ i_crop_width = strtol( newval.psz_string, &psz_end, 10 );
+ if( psz_end != psz_parser ) goto crop_end;
+
+ psz_parser = strchr( ++psz_end, '+' );
+ i_crop_height = strtol( psz_end, &psz_end, 10 );
+ if( psz_end != psz_parser ) goto crop_end;
+
+ psz_parser = strchr( ++psz_end, '+' );
+ i_crop_left = strtol( psz_end, &psz_end, 10 );
+ if( psz_end != psz_parser ) goto crop_end;
+
+ psz_end++;
+ i_crop_top = strtol( psz_end, &psz_end, 10 );
+ if( *psz_end != '\0' ) goto crop_end;
+
+ i_width = i_crop_width;
+ p_vout->fmt_in.i_visible_width = i_width;
+
+ i_height = i_crop_height;
+ p_vout->fmt_in.i_visible_height = i_height;
+
+ p_vout->fmt_in.i_x_offset = i_crop_left;
+ p_vout->fmt_in.i_y_offset = i_crop_top;
+ }
+ else
+ {
+ /* Maybe we're using the <left>+<top>+<right>+<bottom> syntax */
+ unsigned int i_crop_top, i_crop_left, i_crop_bottom, i_crop_right;
+
+ psz_parser = strchr( newval.psz_string, '+' );
+ i_crop_left = strtol( newval.psz_string, &psz_end, 10 );
+ if( psz_end != psz_parser ) goto crop_end;
+
+ psz_parser = strchr( ++psz_end, '+' );
+ i_crop_top = strtol( psz_end, &psz_end, 10 );
+ if( psz_end != psz_parser ) goto crop_end;
+
+ psz_parser = strchr( ++psz_end, '+' );
+ i_crop_right = strtol( psz_end, &psz_end, 10 );
+ if( psz_end != psz_parser ) goto crop_end;
+
+ psz_end++;
+ i_crop_bottom = strtol( psz_end, &psz_end, 10 );
+ if( *psz_end != '\0' ) goto crop_end;
+
+ 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_height = p_vout->fmt_render.i_visible_height
+ - i_crop_top - i_crop_bottom;
+ p_vout->fmt_in.i_visible_height = i_height;
+
+ p_vout->fmt_in.i_x_offset = i_crop_left;
+ p_vout->fmt_in.i_y_offset = i_crop_top;
+ }
+ }
}
- else
+ else if( !strcmp( psz_cmd, "crop-top" )
+ || !strcmp( psz_cmd, "crop-left" )
+ || !strcmp( psz_cmd, "crop-bottom" )
+ || !strcmp( psz_cmd, "crop-right" ) )
{
- p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset +
- (p_vout->fmt_render.i_visible_height - i_height) / 2;
+ unsigned int i_crop_top, i_crop_left, i_crop_bottom, i_crop_right;
+
+ i_crop_top = var_GetInteger( p_vout, "crop-top" );
+ i_crop_left = var_GetInteger( p_vout, "crop-left" );
+ i_crop_right = var_GetInteger( p_vout, "crop-right" );
+ i_crop_bottom = var_GetInteger( p_vout, "crop-bottom" );
+
+ 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_height = p_vout->fmt_render.i_visible_height
+ - i_crop_top - i_crop_bottom;
p_vout->fmt_in.i_visible_height = i_height;
+
+ p_vout->fmt_in.i_x_offset = i_crop_left;
+ p_vout->fmt_in.i_y_offset = i_crop_top;
}
crop_end:
vlc_value_t val;
char *psz_end, *psz_parser = strchr( newval.psz_string, ':' );
+ (void)psz_cmd; (void)oldval; (void)p_data;
/* Restore defaults */
p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
if( !psz_parser ) goto aspect_end;
- i_aspect_num = strtol( newval.psz_string, &psz_end, 0 );
+ i_aspect_num = strtol( newval.psz_string, &psz_end, 10 );
if( psz_end == newval.psz_string || !i_aspect_num ) goto aspect_end;
- i_aspect_den = strtol( ++psz_parser, &psz_end, 0 );
+ i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end;
i_sar_num = i_aspect_num * p_vout->fmt_render.i_visible_height;
p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
var_Get( p_vout, "crop", &val );
- return CropCallback( p_this, 0, val, val, 0 );
+ return CropCallback( p_this, "crop", val, val, 0 );
return VLC_SUCCESS;
}
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;
+ 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;
- p_playlist = (playlist_t *)vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
- if( p_playlist )
- {
- /* 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 );
+ /* 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_object_release( p_playlist );
- }
+ pl_Release( p_this );
return VLC_SUCCESS;
}
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;
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;
- p_playlist = (playlist_t *)vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
- if( p_playlist )
- {
- /* 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 );
-
- vlc_object_release( p_playlist );
- }
-
- /* Disable "always on top" in fullscreen mode */
- var_Get( p_vout, "video-on-top", &val );
- if( newval.b_bool && val.b_bool )
- {
- val.b_bool = VLC_FALSE;
- vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, val.b_bool );
- }
- else if( !newval.b_bool && val.b_bool )
- {
- vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, val.b_bool );
- }
+ /* 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 );
val.b_bool = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_Control( p_vout, VOUT_SNAPSHOT );
+ (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
+ return VLC_SUCCESS;
+}
+
+static int TitleCallback( 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;
+
+ if( !strncmp( psz_cmd, "video-title-show", 16 ) )
+ p_vout->b_title_show = newval.b_bool;
+ else if( !strncmp( psz_cmd, "video-title-timeout", 19 ) )
+ p_vout->i_title_timeout = (mtime_t) newval.i_int;
+ else if( !strncmp( psz_cmd, "video-title-position", 20 ) )
+ p_vout->i_title_position = newval.i_int;
return VLC_SUCCESS;
}
projects / vlc / blobdiff