X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=04570c983b66744245bd7da6fbab532aab02b011;hb=03ba016ded2965e4b44a96f53580f49a1bfa3c01;hp=444c160aceb9f3d622862cd9f825d50bd1e1a962;hpb=16f32e1500887c0dcd33cb06ad71759a81a52878;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 444c160ace..04570c983b 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -2,7 +2,6 @@ * vout_intf.c : video output interface ***************************************************************************** * Copyright (C) 2000-2007 the VideoLAN team - * $Id$ * * Authors: Gildas Bazin * @@ -25,18 +24,26 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include /* free() */ #include /* opendir() */ +#include #include /* opendir() */ +#include +#include /* strftime */ #include #include #include #include +#include #include #include #include @@ -44,6 +51,7 @@ #include #include #include "../libvlc.h" +#include "vout_internal.h" /***************************************************************************** * Local prototypes @@ -57,141 +65,178 @@ static int CropCallback( vlc_object_t *, char const *, 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 *, 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. - ***************************************************************************** - * 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, +static int TitleShowCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int TitleTimeoutCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int TitlePositionCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + +/** + * 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 psz_cap VLC module capability (window system type) + * @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, const char *psz_cap, 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 */ - var_Get( p_vout, "video-x", &val ); - *pi_x_hint = val.i_int ; - var_Get( p_vout, "video-y", &val ); - *pi_y_hint = val.i_int; + *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 */ - 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 ); - if( !p_list ) return NULL; + vout_window_t *wnd = vlc_custom_create (VLC_OBJECT(p_vout), sizeof (*wnd), + VLC_OBJECT_GENERIC, "window"); + if (wnd == NULL) + 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->b_block && p_intf->pf_request_window ) break; - p_intf = NULL; - } + wnd->vout = p_vout; + wnd->width = *pi_width_hint; + wnd->height = *pi_height_hint; + wnd->pos_x = *pi_x_hint; + wnd->pos_y = *pi_y_hint; + vlc_object_attach (wnd, p_vout); - if( !p_intf ) + wnd->module = module_need (wnd, psz_cap, NULL, false); + if (wnd->module == NULL) { - vlc_list_release( p_list ); + msg_Dbg (wnd, "no \"%s\" window provider available", psz_cap); + vlc_object_release (wnd); 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; + *pi_width_hint = wnd->width; + *pi_height_hint = wnd->height; + *pi_x_hint = wnd->pos_x; + *pi_y_hint = wnd->pos_y; + return wnd; } -void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window ) +/** + * 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 ) { - intf_thread_t *p_intf = p_vout->p_parent_intf; - - if( !p_intf ) return; - - vlc_mutex_lock( &p_intf->object_lock ); - if( p_intf->b_dead ) - { - vlc_mutex_unlock( &p_intf->object_lock ); - return; - } - - if( !p_intf->pf_release_window ) - { - msg_Err( p_vout, "no pf_release_window"); - vlc_mutex_unlock( &p_intf->object_lock ); - vlc_object_release( p_intf ); + if (wnd == NULL) return; - } - p_intf->pf_release_window( p_intf, p_window ); + assert (wnd->module); + module_unneed (wnd, wnd->module); - p_vout->p_parent_intf = NULL; - vlc_mutex_unlock( &p_intf->object_lock ); - vlc_object_release( p_intf ); + vlc_object_release (wnd); } -int vout_ControlWindow( vout_thread_t *p_vout, void *p_window, - int i_query, va_list args ) +int vout_ControlWindow( vout_window_t *wnd, 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_mutex_lock( &p_intf->object_lock ); - if( p_intf->b_dead ) - { - vlc_mutex_unlock( &p_intf->object_lock ); - return VLC_EGENERIC; - } - - if( !p_intf->pf_control_window ) - { - msg_Err( p_vout, "no pf_control_window"); - vlc_mutex_unlock( &p_intf->object_lock ); + if (wnd == NULL) return VLC_EGENERIC; - } - i_ret = p_intf->pf_control_window( p_intf, p_window, i_query, args ); - vlc_mutex_unlock( &p_intf->object_lock ); - return i_ret; + assert (wnd->control); + return wnd->control (wnd, i_query, args); } /***************************************************************************** * vout_IntfInit: called during the vout creation to initialise misc things. *****************************************************************************/ +static const struct +{ + double f_value; + const char *psz_label; +} p_zoom_values[] = { + { 0.25, N_("1:4 Quarter") }, + { 0.5, N_("1:2 Half") }, + { 1, N_("1:1 Original") }, + { 2, N_("2:1 Double") }, + { 0, NULL } }; + +static const struct +{ + const char *psz_value; + const char *psz_label; +} p_crop_values[] = { + { "", N_("Default") }, + { "16:10", "16:10" }, + { "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 +{ + const char *psz_value; + const char *psz_label; +} p_aspect_ratio_values[] = { + { "", N_("Default") }, + { "1:1", "1:1" }, + { "4:3", "4:3" }, + { "16:9", "16:9" }, + { "16:10", "16:10" }, + { "221:100", "2.21:1" }, + { "5:4", "5:4" }, + { NULL, NULL } }; + +static void AddCustomRatios( vout_thread_t *p_vout, const char *psz_var, + char *psz_list ) +{ + if( psz_list && *psz_list ) + { + char *psz_cur = psz_list; + char *psz_next; + while( psz_cur && *psz_cur ) + { + vlc_value_t val, text; + psz_next = strchr( psz_cur, ',' ); + if( psz_next ) + { + *psz_next = '\0'; + psz_next++; + } + val.psz_string = psz_cur; + text.psz_string = psz_cur; + var_Change( p_vout, psz_var, VLC_VAR_ADDCHOICE, &val, &text); + psz_cur = psz_next; + } + } +} + void vout_IntfInit( vout_thread_t *p_vout ) { vlc_value_t val, text, old_val; - vlc_bool_t b_force_par = VLC_FALSE; + bool b_force_par = false; char *psz_buf; + int i; /* Create a few object variables we'll need later on */ var_Create( p_vout, "snapshot-path", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -202,27 +247,29 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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_Get( p_vout, "align", &val ); - p_vout->i_alignment = val.i_int; + p_vout->i_alignment = var_CreateGetInteger( p_vout, "align" ); 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 ); + var_Create( p_vout, "mouse-hide-timeout", + 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" ); + 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->p->i_title_position = + var_CreateGetInteger( p_vout, "video-title-position" ); + p_vout->p->psz_title = NULL; - 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 ); + var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL ); + var_AddCallback( p_vout, "video-title-timeout", TitleTimeoutCallback, NULL ); + var_AddCallback( p_vout, "video-title-position", TitlePositionCallback, NULL ); /* Zoom object var */ var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND | @@ -232,37 +279,25 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Change( p_vout, "zoom", VLC_VAR_SETTEXT, &text, NULL ); var_Get( p_vout, "zoom", &old_val ); - if( old_val.f_float == 0.25 || - old_val.f_float == 0.5 || - old_val.f_float == 1 || - old_val.f_float == 2 ) + + for( i = 0; p_zoom_values[i].f_value; i++ ) { - var_Change( p_vout, "zoom", VLC_VAR_DELCHOICE, &old_val, NULL ); + if( old_val.f_float == p_zoom_values[i].f_value ) + var_Change( p_vout, "zoom", VLC_VAR_DELCHOICE, &old_val, NULL ); + val.f_float = p_zoom_values[i].f_value; + text.psz_string = _( p_zoom_values[i].psz_label ); + var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); } - val.f_float = 0.25; text.psz_string = _("1:4 Quarter"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - val.f_float = 0.5; text.psz_string = _("1:2 Half"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - val.f_float = 1; text.psz_string = _("1:1 Original"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - val.f_float = 2; text.psz_string = _("2:1 Double"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - - var_Set( p_vout, "zoom", old_val ); + var_Set( p_vout, "zoom", old_val ); /* Is this really needed? */ 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_Create( p_vout, "crop-left", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); + var_Create( p_vout, "crop-top", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); + var_Create( p_vout, "crop-right", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); + var_Create( p_vout, "crop-bottom", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); var_AddCallback( p_vout, "crop-left", CropCallback, NULL ); var_AddCallback( p_vout, "crop-top", CropCallback, NULL ); @@ -270,66 +305,35 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_AddCallback( p_vout, "crop-bottom", CropCallback, NULL ); /* Crop object var */ - var_Create( p_vout, "crop", VLC_VAR_STRING | + var_Create( p_vout, "crop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); text.psz_string = _("Crop"); var_Change( p_vout, "crop", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = ""; + val.psz_string = (char*)""; 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 = "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 = "5:4"; text.psz_string = "5:4"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "5:3"; text.psz_string = "5:3"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - 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 = "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 ) + for( i = 0; p_crop_values[i].psz_value; i++ ) { - 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; - } + val.psz_string = (char*)p_crop_values[i].psz_value; + text.psz_string = _( p_crop_values[i].psz_label ); + var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); } - if( psz_buf ) free( psz_buf ); + + /* update triggered every time the vout's crop parameters are changed */ + var_Create( p_vout, "crop-update", VLC_VAR_VOID ); + + /* Add custom crop ratios */ + psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" ); + AddCustomRatios( p_vout, "crop", psz_buf ); + free( psz_buf ); 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 ); - if( old_val.psz_string ) free( old_val.psz_string ); + var_TriggerCallback( p_vout, "crop" ); + free( old_val.psz_string ); /* Monitor pixel aspect-ratio */ var_Create( p_vout, "monitor-par", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -352,78 +356,68 @@ void vout_IntfInit( vout_thread_t *p_vout ) } 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 ); - b_force_par = VLC_TRUE; + p_vout->p->i_par_num, p_vout->p->i_par_den ); + b_force_par = true; } - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); /* Aspect-ratio object var */ - var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | + var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); text.psz_string = _("Aspect-ratio"); var_Change( p_vout, "aspect-ratio", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = ""; + val.psz_string = (char*)""; 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 = "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 = "16:9"; text.psz_string = "16:9"; - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - 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 = "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 ) + for( i = 0; p_aspect_ratio_values[i].psz_value; i++ ) { - 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; - } + val.psz_string = (char*)p_aspect_ratio_values[i].psz_value; + text.psz_string = _( p_aspect_ratio_values[i].psz_label ); + var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); } - if( psz_buf ) free( psz_buf ); + + /* Add custom aspect ratios */ + psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" ); + AddCustomRatios( p_vout, "aspect-ratio", psz_buf ); + free( psz_buf ); 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 ); - if( old_val.psz_string ) free( old_val.psz_string ); + 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 ); /* Add a variable to indicate if the window should be on top of others */ - var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT + | VLC_VAR_ISCOMMAND ); text.psz_string = _("Always on top"); var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL ); var_AddCallback( p_vout, "video-on-top", OnTopCallback, NULL ); @@ -432,15 +426,13 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Create( p_vout, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); /* Add a fullscreen variable */ - var_Create( p_vout, "fullscreen", VLC_VAR_BOOL ); - text.psz_string = _("Fullscreen"); - var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL ); - var_Change( p_vout, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL ); - if( val.b_bool ) + if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) ) { /* user requested fullscreen */ p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; } + text.psz_string = _("Fullscreen"); + var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL ); var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL ); /* Add a snapshot variable */ @@ -454,317 +446,397 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 ); - val.b_bool = VLC_TRUE; - var_Set( p_vout, "intf-change", val ); + 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; + video_format_t fmt_in = p_pic->format; + video_format_t fmt_out; + picture_t *p_pip; 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)); + /* */ + memset( &fmt_out, 0, sizeof(fmt_out) ); + fmt_out = fmt_in; + fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); - 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_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 = 320; - fmt_out.i_height = 200; - 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 ); + /* */ + image_handler_t *p_image = image_HandlerCreate( p_vout ); + if( !p_image ) + return VLC_EGENERIC; - p_dest->p_private = p_snapshot; + p_pip = image_Convert( p_image, p_pic, &fmt_in, &fmt_out ); - block_Release( p_block ); + image_HandlerDelete( p_image ); - /* Unlock the object */ - vlc_cond_signal( &p_dest->object_wait ); - vlc_object_release( p_dest ); + if( !p_pip ) + return VLC_EGENERIC; - image_HandlerDelete( p_image ); - return VLC_SUCCESS; + p_subpic = subpicture_New(); + if( !p_subpic ) + { + picture_Release( p_pip ); + return VLC_EGENERIC; } - -#if defined(__APPLE__) || defined(SYS_BEOS) - if( !val.psz_string && p_vout->p_libvlc->psz_homedir ) + 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 = fmt_out.i_width * 4; + p_subpic->i_original_picture_height = fmt_out.i_height * 4; + fmt_out.i_aspect = 0; + fmt_out.i_sar_num = + fmt_out.i_sar_den = 0; + + p_subpic->p_region = subpicture_region_New( &fmt_out ); + if( p_subpic->p_region ) + { + picture_Release( p_subpic->p_region->p_picture ); + p_subpic->p_region->p_picture = p_pip; + } + else { - if( asprintf( &val.psz_string, "%s/Desktop", - p_vout->p_libvlc->psz_homedir ) == -1 ) - val.psz_string = NULL; + picture_Release( p_pip ); } + spu_DisplaySubpicture( p_vout->p_spu, p_subpic ); + return VLC_SUCCESS; +} +/** + * This function will return the default directory used for snapshots + */ +static char *VoutSnapshotGetDefaultDirectory( void ) +{ + char *psz_path = NULL; +#if defined(__APPLE__) || defined(SYS_BEOS) + + if( asprintf( &psz_path, "%s/Desktop", + config_GetHomeDir() ) == -1 ) + psz_path = NULL; + #elif defined(WIN32) && !defined(UNDER_CE) - 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, - 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 ); - } - if( p_mypicturesdir == NULL ) - { - if( asprintf( &val.psz_string, "%s", - p_vout->p_libvlc->psz_homedir ) == -1 ) - val.psz_string = NULL; - } - else - { - if( asprintf( &val.psz_string, p_mypicturesdir ) == -1 ) - val.psz_string = NULL; - free( p_mypicturesdir ); - } + /* 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 ); } + if( p_mypicturesdir == NULL ) + psz_path = strdup( config_GetHomeDir() ); + else + psz_path = p_mypicturesdir; + #else + /* 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 ) + char *psz_datadir = config_GetUserDataDir(); + if( psz_datadir ) { - if( asprintf( &val.psz_string, "%s", - p_vout->p_libvlc->psz_datadir ) == -1 ) - val.psz_string = NULL; + if( asprintf( &psz_path, "%s", psz_datadir ) == -1 ) + psz_path = NULL; + free( psz_datadir ); } -#endif - if( !val.psz_string ) - { - msg_Err( p_vout, "no path specified for snapshots" ); - return VLC_EGENERIC; - } - var_Get( p_vout, "snapshot-format", &format ); - if( !format.psz_string || !*format.psz_string ) - { - if( format.psz_string ) free( format.psz_string ); - format.psz_string = strdup( "png" ); - } - - /* - * Did the user specify a directory? If not, path = NULL. - */ - path = utf8_opendir ( (const char *)val.psz_string ); +#endif - if ( path != NULL ) + return psz_path; +} +/** + * This function will save a video snapshot to a file + */ +static int VoutWriteSnapshot( vout_thread_t *p_vout, char **ppsz_filename, + const block_t *p_image, + const char *psz_path, + const char *psz_format, + const char *psz_prefix_fmt ) +{ + /* */ + char *psz_filename; + DIR *p_path = utf8_opendir( psz_path ); + if( p_path != NULL ) { - char *psz_prefix = var_GetString( p_vout, "snapshot-prefix" ); - if( !psz_prefix ) psz_prefix = strdup( "vlcsnap-" ); - else + /* The use specified a directory path */ + closedir( p_path ); + + /* */ + char *psz_prefix = NULL; + if( psz_prefix_fmt ) + psz_prefix = str_format( p_vout, psz_prefix_fmt ); + if( !psz_prefix ) { - char *psz_tmp = str_format( p_vout, psz_prefix ); - filename_sanitize( psz_tmp ); - free( psz_prefix ); - psz_prefix = psz_tmp; + psz_prefix = strdup( "vlcsnap-" ); + if( !psz_prefix ) + goto error; } - closedir( path ); - if( var_GetBool( p_vout, "snapshot-sequential" ) == VLC_TRUE ) + if( var_GetBool( p_vout, "snapshot-sequential" ) ) { int i_num = var_GetInteger( p_vout, "snapshot-num" ); - FILE *p_file; - do + for( ; ; i_num++ ) { - asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s", val.psz_string, - psz_prefix, i_num++, format.psz_string ); + struct stat st; + + if( asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s", + psz_path, psz_prefix, i_num++, psz_format ) < 0 ) + { + free( psz_prefix ); + goto error; + } + if( utf8_stat( psz_filename, &st ) ) + break; + free( psz_filename ); } - 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 ); - } + struct tm curtime; + time_t lcurtime = time( NULL ) ; + + if( !localtime_r( &lcurtime, &curtime ) ) + { + const unsigned int i_id = (p_image->i_pts / 100000) & 0xFFFFFF; + + msg_Warn( p_vout, "failed to get current time. Falling back to legacy snapshot naming" ); + + if( asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s", + psz_path, psz_prefix, i_id, psz_format ) < 0 ) + psz_filename = NULL; + } + else + { + /* suffix with the last decimal digit in 10s of seconds resolution + * FIXME gni ? */ + const int i_id = (p_image->i_pts / (100*1000)) & 0xFF; + char psz_curtime[128]; + if( !strftime( psz_curtime, sizeof(psz_curtime), "%Y-%m-%d-%Hh%Mm%Ss", &curtime ) ) + strcpy( psz_curtime, "error" ); + + if( asprintf( &psz_filename, "%s" DIR_SEP "%s%s%1u.%s", + psz_path, psz_prefix, psz_curtime, i_id, psz_format ) < 0 ) + psz_filename = NULL; + } + } free( psz_prefix ); } - else // The user specified a full path name (including file name) + else { - psz_filename = str_format( p_vout, val.psz_string ); + /* The user specified a full path name (including file name) */ + psz_filename = str_format( p_vout, psz_path ); path_sanitize( psz_filename ); } - free( val.psz_string ); - free( format.psz_string ); + if( !psz_filename ) + goto error; /* Save the snapshot */ - fmt_in = p_vout->fmt_in; - 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 ) + FILE *p_file = utf8_fopen( psz_filename, "wb" ); + if( !p_file ) { - msg_Err( p_vout, "could not create snapshot %s", psz_filename ); + msg_Err( p_vout, "Failed to open '%s'", psz_filename ); free( psz_filename ); - image_HandlerDelete( p_image ); - return VLC_EGENERIC; + goto error; } + if( fwrite( p_image->p_buffer, p_image->i_buffer, 1, p_file ) != 1 ) + { + msg_Err( p_vout, "Failed to write to '%s'", psz_filename ); + fclose( p_file ); + free( psz_filename ); + goto error; + } + fclose( p_file ); + /* */ + if( ppsz_filename ) + *ppsz_filename = psz_filename; + else + free( psz_filename ); + + return VLC_SUCCESS; + +error: + msg_Err( p_vout, "could not save snapshot" ); + return VLC_EGENERIC; +} + +/** + * 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 ); - free( psz_filename ); + vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN, "%s", psz_filename ); 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; - } + if( VoutSnapshotPip( p_vout, p_pic ) ) + msg_Warn( p_vout, "Failed to display snapshot" ); + } +} - 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; +/* */ +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 ) +{ + vout_thread_sys_t *p_sys = p_vout->p; - 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 ); + vlc_mutex_lock( &p_sys->snapshot.lock ); + p_sys->snapshot.i_request++; - spu_DisplaySubpicture( p_vout->p_spu, p_subpic ); + const mtime_t i_deadline = mdate() + i_timeout; + while( p_sys->snapshot.b_available && !p_sys->snapshot.p_picture && + mdate() < i_deadline ) + { + vlc_cond_timedwait( &p_sys->snapshot.wait, &p_sys->snapshot.lock, + i_timeout ); } - else + + picture_t *p_picture = p_sys->snapshot.p_picture; + if( p_picture ) + p_sys->snapshot.p_picture = p_picture->p_next; + else if( p_sys->snapshot.i_request > 0 ) + p_sys->snapshot.i_request--; + vlc_mutex_unlock( &p_sys->snapshot.lock ); + + if( !p_picture ) { - image_HandlerDelete( p_image ); + msg_Err( p_vout, "Failed to grab a snapshot" ); + return VLC_EGENERIC; } + if( pp_image ) + { + vlc_fourcc_t i_format = VLC_FOURCC('p','n','g',' '); + if( psz_format && image_Ext2Fourcc( psz_format ) ) + i_format = image_Ext2Fourcc( psz_format ); + + const int i_override_width = var_GetInteger( p_vout, "snapshot-width" ); + const int 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 ) ) + { + 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; } +/** + * 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 ) ) + { + p_picture = NULL; + p_image = NULL; + goto exit; + } + + if( !psz_path ) + { + psz_path = VoutSnapshotGetDefaultDirectory(); + if( !psz_path ) + { + msg_Err( p_vout, "no path specified for snapshots" ); + goto exit; + } + } + + char *psz_filename; + if( VoutWriteSnapshot( p_vout, &psz_filename, + p_image, + psz_path, psz_format, psz_prefix ) ) + goto exit; + + 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 ); + +exit: + if( p_image ) + block_Release( p_image ); + if( p_picture ) + picture_Release( p_picture ); + free( psz_prefix ); + free( psz_format ); + free( psz_path ); +} + /***************************************************************************** * Handle filters *****************************************************************************/ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, - vlc_bool_t b_add, vlc_bool_t b_setconfig ) + bool b_add, bool b_setconfig ) { char *psz_parser; char *psz_string = config_GetPsz( p_vout, "vout-filter" ); @@ -778,8 +850,12 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, if( !psz_parser ) { psz_parser = psz_string; - asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s", - psz_string, psz_name ); + if( asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s", + psz_string, psz_name ) == -1 ) + { + free( psz_parser ); + return; + } free( psz_parser ); } else @@ -812,35 +888,6 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, 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 ) - { - 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; - - case VOUT_SNAPSHOT: - p_vout->b_snapshot = VLC_TRUE; - return VLC_SUCCESS; - break; - - default: - msg_Dbg( p_vout, "control query not supported" ); - return VLC_EGENERIC; - } -} - /***************************************************************************** * InitWindowSize: find the initial dimensions the video window should have. ***************************************************************************** @@ -850,24 +897,17 @@ int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args ) 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 ) { @@ -875,7 +915,6 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width, *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 ) { @@ -883,11 +922,10 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width, *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); } @@ -895,20 +933,18 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width, { *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, - p_vout->i_window_height ); + msg_Dbg( p_vout, "window size: %ux%u", *pi_width, *pi_height ); #undef FP_FACTOR } @@ -1075,6 +1111,8 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, p_vout->fmt_in.i_visible_width, p_vout->fmt_in.i_visible_height ); + var_SetVoid( p_vout, "crop-update" ); + return VLC_SUCCESS; } @@ -1111,12 +1149,12 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, 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; } @@ -1128,8 +1166,32 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, 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; } @@ -1138,15 +1200,17 @@ 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 ); - pl_Release( p_this ); + /* 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 ); + + (void)psz_cmd; (void)oldval; (void)p_data; return VLC_SUCCESS; } @@ -1155,17 +1219,15 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd, { 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 = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "intf-change", val ); return VLC_SUCCESS; } @@ -1174,22 +1236,38 @@ 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; - vout_Control( p_vout, VOUT_SNAPSHOT ); - (void)psz_cmd; (void)oldval; (void)newval; (void)p_data; + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(newval); VLC_UNUSED(p_data); + + VoutSaveSnapshot( p_vout ); return VLC_SUCCESS; } -static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd, +static int TitleShowCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(p_data); vout_thread_t *p_vout = (vout_thread_t *)p_this; + p_vout->p->b_title_show = newval.b_bool; + return VLC_SUCCESS; +} - 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; +static int TitleTimeoutCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); + vout_thread_t *p_vout = (vout_thread_t *)p_this; + p_vout->p->i_title_timeout = (mtime_t) newval.i_int; return VLC_SUCCESS; } +static int TitlePositionCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(p_data); + vout_thread_t *p_vout = (vout_thread_t *)p_this; + p_vout->p->i_title_position = newval.i_int; + return VLC_SUCCESS; +}