#include <sys/stat.h>
#include <dirent.h> /* opendir() */
#include <assert.h>
+#include <time.h> /* strftime */
#include <vlc_interface.h>
#include <vlc_block.h>
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,
+/**
+ * Creates a video output window.
+ * On Unix systems, this is an X11 drawable (handle).
+ * On Windows, this is a Win32 window (handle).
+ * Video output plugins are supposed to called this function and display the
+ * video within the resulting window, while in windowed mode.
+ *
+ * @param p_vout video output thread to create a window for
+ * @param pi_x_hint pointer to store the recommended horizontal position [OUT]
+ * @param pi_y_hint pointer to store the recommended vertical position [OUT]
+ * @param pi_width_hint pointer to store the recommended width [OUT]
+ * @param pi_height_hint pointer to store the recommended height [OUT]
+ *
+ * @return a vout_window_t object, or NULL in case of failure.
+ * The window is released with vout_ReleaseWindow().
+ */
+vout_window_t *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 )
{
- /* 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" );
wnd->pos_y = *pi_y_hint;
vlc_object_attach (wnd, p_vout);
- wnd->module = module_need (wnd, "vout window", 0, 0);
+ wnd->module = module_need (wnd, "vout_window", NULL, false);
if (wnd->module == NULL)
{
msg_Dbg (wnd, "no window provider available");
vlc_object_release (wnd);
return NULL;
}
- p_vout->p_window = wnd;
*pi_width_hint = wnd->width;
*pi_height_hint = wnd->height;
*pi_x_hint = wnd->pos_x;
*pi_y_hint = wnd->pos_y;
- return wnd->handle;
+ return wnd;
}
-void vout_ReleaseWindow( vout_thread_t *p_vout, void *dummy )
+/**
+ * Releases a window handle obtained with vout_RequestWindow().
+ * @param p_vout video output thread that allocated the window
+ * (if this is NULL; this fnction is a no-op).
+ */
+void vout_ReleaseWindow( vout_window_t *wnd )
{
- vout_window_t *wnd = p_vout->p_window;
-
if (wnd == NULL)
return;
- p_vout->p_window = NULL;
assert (wnd->module);
module_unneed (wnd, wnd->module);
vlc_object_release (wnd);
- (void)dummy;
}
-int vout_ControlWindow( vout_thread_t *p_vout, void *dummy,
- int i_query, va_list args )
+int vout_ControlWindow( vout_window_t *wnd, int i_query, va_list args )
{
- (void)dummy;
- vout_window_t *wnd = p_vout->p_window;
-
if (wnd == NULL)
return VLC_EGENERIC;
(mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" );
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 */
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 a variable to indicate if scaling video is activated or not */
+ var_Create( p_vout, "scaling", VLC_VAR_BOOL | VLC_VAR_DOINHERIT
+ | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Scaling video");
+ var_Change( p_vout, "scaling", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "scaling", ScalingCallback, NULL );
+ var_Get( p_vout, "scaling", &val );
+ p_vout->b_scale = val.b_bool;
+
/* 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 );
DIR *path;
int i_ret;
bool b_embedded_snapshot;
- uintmax_t i_id = (uintptr_t)NULL;
+ void *p_obj;
/* */
val.psz_string = var_GetNonEmptyString( p_vout, "snapshot-path" );
/* Embedded snapshot : if snapshot-path == object:object_ptr */
- if( val.psz_string && sscanf( val.psz_string, "object:%ju", &i_id ) > 0 )
+ if( val.psz_string && sscanf( val.psz_string, "object:%p", &p_obj ) > 0 )
b_embedded_snapshot = true;
else
b_embedded_snapshot = false;
*/
if( b_embedded_snapshot )
{
- vlc_object_t* p_dest = (vlc_object_t *)(uintptr_t)i_id;
block_t *p_block;
- snapshot_t *p_snapshot;
+ snapshot_t *p_snapshot = p_obj;
size_t i_size;
- /* Object must be locked. We will unlock it once we get the
- snapshot and written it to p_private */
- p_dest->p_private = NULL;
+ vlc_mutex_lock( &p_snapshot->p_mutex );
+ p_snapshot->p_data = NULL;
/* Save the snapshot to a memory zone */
p_block = image_Write( p_image, p_pic, &fmt_in, &fmt_out );
{
msg_Err( p_vout, "Could not get snapshot" );
image_HandlerDelete( p_image );
- vlc_object_signal_unlocked( p_dest );
- vlc_object_release( p_dest );
+ vlc_cond_signal( &p_snapshot->p_condvar );
+ vlc_mutex_unlock( &p_snapshot->p_mutex );
return VLC_EGENERIC;
}
- /* Copy the p_block data to a snapshot structure */
- /* FIXME: get the timestamp */
- p_snapshot = malloc( sizeof( snapshot_t ) );
- if( !p_snapshot )
- {
- block_Release( p_block );
- image_HandlerDelete( p_image );
- vlc_object_signal_unlocked( p_dest );
- vlc_object_release( p_dest );
- return VLC_ENOMEM;
- }
-
i_size = p_block->i_buffer;
p_snapshot->i_width = fmt_out.i_width;
if( !p_snapshot->p_data )
{
block_Release( p_block );
- free( p_snapshot );
image_HandlerDelete( p_image );
- vlc_object_signal_unlocked( p_dest );
- vlc_object_release( p_dest );
+ vlc_cond_signal( &p_snapshot->p_condvar );
+ vlc_mutex_unlock( &p_snapshot->p_mutex );
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_object_signal_unlocked( p_dest );
- vlc_object_release( p_dest );
+ vlc_cond_signal( &p_snapshot->p_condvar );
+ vlc_mutex_unlock( &p_snapshot->p_mutex );
image_HandlerDelete( p_image );
return VLC_SUCCESS;
}
else
{
- if( asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s",
+ struct tm curtime;
+ time_t lcurtime ;
+ lcurtime = time( NULL ) ;
+ if ( ( localtime_r( &lcurtime, &curtime ) == NULL ) )
+ {
+ msg_Warn( p_vout, "failed to get current time. Falling back to legacy snapshot naming" );
+ /* failed to get current time. Fallback to old format */
+ 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, "could not create snapshot" );
+ image_HandlerDelete( p_image );
+ return VLC_EGENERIC;
+ }
}
- }
-
+ else
+ {
+ char psz_curtime[15] ;
+ if( strftime( psz_curtime, 15, "%y%m%d-%H%M%S", &curtime ) == 0 )
+ {
+ msg_Warn( p_vout, "snapshot date string truncated" ) ;
+ }
+ if( asprintf( &psz_filename, "%s" DIR_SEP "%s%s%1u.%s",
+ val.psz_string, psz_prefix, psz_curtime,
+ /* suffix with the last decimal digit in 10s of seconds resolution */
+ (unsigned int)(p_pic->date / (100*1000)) & 0xFF,
+ format.psz_string ) == -1 )
+ {
+ msg_Err( p_vout, "could not create snapshot" );
+ image_HandlerDelete( p_image );
+ return VLC_EGENERIC;
+ }
+ } //end if time() < 0
+ } //end snapshot sequential
free( psz_prefix );
}
else // The user specified a full path name (including file name)
msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN,
"%s", 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*/
+ val.psz_string = psz_filename ;
+
+ var_Set( p_vout->p_libvlc, "vout-snapshottaken", val );
+ /* var_Set duplicates data for transport so we can free*/
free( psz_filename );
/* */
(void)args;
switch( i_query )
{
- case VOUT_REPARENT:
- case VOUT_CLOSE:
- vout_ReleaseWindow( p_vout, NULL );
- return VLC_SUCCESS;
-
case VOUT_SNAPSHOT:
p_vout->p->b_snapshot = true;
return VLC_SUCCESS;
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;
+
+ vlc_mutex_lock( &p_vout->change_lock );
+
+ p_vout->b_scale = newval.b_bool;
+ p_vout->i_changes |= VOUT_SIZE_CHANGE;
+
+ vlc_mutex_unlock( &p_vout->change_lock );
+}
+
static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
projects / vlc / blobdiff