X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=1f889eb2f45f45665d9d534afe38482761b0cfc6;hb=7ea9a56dee592c4a8fb072e04730307a7c25b00f;hp=d61684fca147e968443811006693250f572126b8;hpb=e0fb922045f7db738fd960373cd4261ea8e35a9b;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index d61684fca1..1f889eb2f4 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -33,7 +33,6 @@ #include #include /* free() */ #include /* opendir() */ -#include #include /* opendir() */ #include #include /* strftime */ @@ -43,11 +42,8 @@ #include #include -#include #include #include -#include - #include #include #include "../libvlc.h" @@ -56,8 +52,6 @@ /***************************************************************************** * Local prototypes *****************************************************************************/ -static void InitWindowSize( vout_thread_t *, unsigned *, unsigned * ); - /* Object variables callbacks */ static int ZoomCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); @@ -81,86 +75,6 @@ static int TitleTimeoutCallback( vlc_object_t *, char const *, 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 ) -{ - /* 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; - - vout_window_t *wnd = vlc_custom_create (VLC_OBJECT(p_vout), sizeof (*wnd), - VLC_OBJECT_GENERIC, "window"); - if (wnd == NULL) - return 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); - - wnd->module = module_need (wnd, psz_cap, NULL, false); - if (wnd->module == NULL) - { - msg_Dbg (wnd, "no \"%s\" window provider available", psz_cap); - vlc_object_release (wnd); - return NULL; - } - *pi_width_hint = wnd->width; - *pi_height_hint = wnd->height; - *pi_x_hint = wnd->pos_x; - *pi_y_hint = wnd->pos_y; - return wnd; -} - -/** - * 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 ) -{ - if (wnd == NULL) - return; - - assert (wnd->module); - module_unneed (wnd, wnd->module); - - vlc_object_release (wnd); -} - -int vout_ControlWindow( vout_window_t *wnd, int i_query, va_list args ) -{ - if (wnd == NULL) - return VLC_EGENERIC; - - assert (wnd->control); - return wnd->control (wnd, i_query, args); -} - /***************************************************************************** * vout_IntfInit: called during the vout creation to initialise misc things. *****************************************************************************/ @@ -204,30 +118,31 @@ static const struct { "16:9", "16:9" }, { "16:10", "16:10" }, { "221:100", "2.21:1" }, + { "235:100", "2.35:1" }, + { "239:100", "2.39: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 ) + assert( psz_list ); + + char *psz_cur = psz_list; + char *psz_next; + while( psz_cur && *psz_cur ) { - 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 ) { - 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; + *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; } } @@ -252,7 +167,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - p_vout->i_alignment = var_CreateGetInteger( p_vout, "align" ); + 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 ); @@ -260,12 +175,12 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Create( p_vout, "mouse-hide-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - 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; + p_vout->p->title.show = var_CreateGetBool( p_vout, "video-title-show" ); + p_vout->p->title.timeout = var_CreateGetInteger( p_vout, + "video-title-timeout" ); + p_vout->p->title.position = var_CreateGetInteger( p_vout, + "video-title-position" ); + p_vout->p->title.value = NULL; var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL ); var_AddCallback( p_vout, "video-title-timeout", TitleTimeoutCallback, NULL ); @@ -325,9 +240,12 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 ); + psz_buf = var_CreateGetNonEmptyString( p_vout, "custom-crop-ratios" ); + if( psz_buf ) + { + AddCustomRatios( p_vout, "crop", psz_buf ); + free( psz_buf ); + } var_AddCallback( p_vout, "crop", CropCallback, NULL ); var_Get( p_vout, "crop", &old_val ); @@ -350,7 +268,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) } else { - i_aspect = atof( val.psz_string ); + i_aspect = us_atof( val.psz_string ); vlc_ureduce( &i_aspect_num, &i_aspect_den, i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 ); } @@ -386,9 +304,12 @@ void vout_IntfInit( vout_thread_t *p_vout ) } /* Add custom aspect ratios */ - psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" ); - AddCustomRatios( p_vout, "aspect-ratio", psz_buf ); - free( psz_buf ); + psz_buf = var_CreateGetNonEmptyString( p_vout, "custom-aspect-ratios" ); + if( psz_buf ) + { + 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 ); @@ -402,18 +323,12 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 @@ -429,7 +344,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) ) { /* user requested fullscreen */ - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + p_vout->p->i_changes |= VOUT_FULLSCREEN_CHANGE; } text.psz_string = _("Fullscreen"); var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL ); @@ -442,11 +357,10 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_AddCallback( p_vout, "video-snapshot", SnapshotCallback, NULL ); /* Mouse coordinates */ - var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER ); - 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_BOOL ); + var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS ); + var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS ); + var_Create( p_vout, "mouse-object", VLC_VAR_BOOL ); var_Create( p_vout, "intf-change", VLC_VAR_BOOL ); var_SetBool( p_vout, "intf-change", true ); @@ -459,397 +373,198 @@ void vout_IntfInit( vout_thread_t *p_vout ) * This function will inject a subpicture into the vout with the provided * picture */ -static int VoutSnapshotPip( vout_thread_t *p_vout, image_handler_t *p_image, picture_t *p_pic, const video_format_t *p_fmt_in ) +static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic ) { - video_format_t fmt_in = *p_fmt_in; - video_format_t fmt_out; - picture_t *p_pip; - subpicture_t *p_subpic; - - /* */ - memset( &fmt_out, 0, sizeof(fmt_out) ); - fmt_out = fmt_in; - fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); - - /* */ - p_pip = image_Convert( p_image, p_pic, &fmt_in, &fmt_out ); - if( !p_pip ) + subpicture_t *p_subpic = subpicture_NewFromPicture( VLC_OBJECT(p_vout), + p_pic, VLC_CODEC_YUVA ); + if( !p_subpic ) return VLC_EGENERIC; - p_subpic = subpicture_New(); - if( p_subpic == NULL ) - { - picture_Release( p_pip ); - return VLC_EGENERIC; - } - + /* 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 = mdate() + 4000000; + p_subpic->i_stop = p_subpic->i_start + 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 - { - picture_Release( p_pip ); - } - spu_DisplaySubpicture( p_vout->p_spu, p_subpic ); + /* Reduce the picture to 1/4^2 of the screen */ + p_subpic->i_original_picture_width *= 4; + p_subpic->i_original_picture_height *= 4; + + spu_DisplaySubpicture( vout_GetSpu( p_vout ), p_subpic ); return VLC_SUCCESS; } + /** - * This function will return the default directory used for snapshots + * This function will display the name and a PIP of the provided snapshot */ -static char *VoutSnapshotGetDefaultDirectory( void ) +static void VoutOsdSnapshot( vout_thread_t *p_vout, picture_t *p_pic, const char *psz_filename ) { - 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) - - /* 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 + msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename ); + vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN, "%s", psz_filename ); - /* 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( psz_datadir ) + if( var_GetBool( p_vout, "snapshot-preview" ) ) { - if( asprintf( &psz_path, "%s", psz_datadir ) == -1 ) - psz_path = NULL; - free( psz_datadir ); + if( VoutSnapshotPip( p_vout, p_pic ) ) + msg_Warn( p_vout, "Failed to display snapshot" ); } - -#endif - - return psz_path; } -int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) +/* */ +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 ) { - image_handler_t *p_image = image_HandlerCreate( p_vout ); - video_format_t fmt_in, fmt_out; - char *psz_filename = NULL; - vlc_value_t val, format; - DIR *path; - int i_ret; - bool b_embedded_snapshot; - 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:%p", &p_obj ) > 0 ) - b_embedded_snapshot = true; - else - b_embedded_snapshot = false; - - /* */ - memset( &fmt_in, 0, sizeof(video_format_t) ); - fmt_in = p_vout->fmt_out; - if( fmt_in.i_sar_num <= 0 || fmt_in.i_sar_den <= 0 ) - { - fmt_in.i_sar_num = - fmt_in.i_sar_den = 1; - } - - /* */ - memset( &fmt_out, 0, sizeof(video_format_t) ); - fmt_out.i_sar_num = - fmt_out.i_sar_den = 1; - fmt_out.i_chroma = b_embedded_snapshot ? VLC_FOURCC('p','n','g',' ') : 0; - fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" ); - fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" ); - - if( b_embedded_snapshot && - fmt_out.i_width == 0 && fmt_out.i_height == 0 ) - { - /* If snapshot-width and/or snapshot height were not specified, - use a default snapshot width of 320 */ - fmt_out.i_width = 320; - } - - if( fmt_out.i_height == 0 && fmt_out.i_width > 0 ) - { - fmt_out.i_height = fmt_in.i_height * fmt_out.i_width / fmt_in.i_width; - const int i_height = fmt_out.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num; - if( i_height > 0 ) - fmt_out.i_height = i_height; - } - else + picture_t *p_picture = vout_snapshot_Get( &p_vout->p->snapshot, i_timeout ); + if( !p_picture ) { - 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 - { - fmt_out.i_width = fmt_in.i_width; - fmt_out.i_height = fmt_in.i_height; - } - const int i_width = fmt_out.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den; - if( i_width > 0 ) - fmt_out.i_width = i_width; + msg_Err( p_vout, "Failed to grab a snapshot" ); + return VLC_EGENERIC; } - /* Embedded snapshot - create a snapshot_t* and store it in - object_ptr->p_private, then unlock and signal the - waiting object. - */ - if( b_embedded_snapshot ) + if( pp_image ) { - block_t *p_block; - snapshot_t *p_snapshot = p_obj; - size_t i_size; + vlc_fourcc_t i_format = VLC_CODEC_PNG; + if( psz_format && image_Type2Fourcc( psz_format ) ) + i_format = image_Type2Fourcc( psz_format ); - vlc_mutex_lock( &p_snapshot->p_mutex ); - p_snapshot->p_data = NULL; + const int i_override_width = var_GetInteger( p_vout, "snapshot-width" ); + const int i_override_height = var_GetInteger( p_vout, "snapshot-height" ); - /* Save the snapshot to a memory zone */ - p_block = image_Write( p_image, p_pic, &fmt_in, &fmt_out ); - if( !p_block ) + 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, "Could not get snapshot" ); - image_HandlerDelete( p_image ); - vlc_cond_signal( &p_snapshot->p_condvar ); - vlc_mutex_unlock( &p_snapshot->p_mutex ); + msg_Err( p_vout, "Failed to convert image for snapshot" ); + picture_Release( p_picture ); return VLC_EGENERIC; } - - 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 = malloc( i_size ); - if( !p_snapshot->p_data ) - { - block_Release( p_block ); - image_HandlerDelete( p_image ); - 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 ); - - block_Release( p_block ); - - /* Unlock the object */ - vlc_cond_signal( &p_snapshot->p_condvar ); - vlc_mutex_unlock( &p_snapshot->p_mutex ); - - image_HandlerDelete( p_image ); - return VLC_SUCCESS; } + if( pp_picture ) + *pp_picture = p_picture; + else + picture_Release( p_picture ); + return VLC_SUCCESS; +} - /* Get default directory if none provided */ - if( !val.psz_string ) - val.psz_string = VoutSnapshotGetDefaultDirectory( ); - if( !val.psz_string ) - { - msg_Err( p_vout, "no path specified for snapshots" ); - image_HandlerDelete( p_image ); - return VLC_EGENERIC; - } +/** + * 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; - /* Get snapshot format, default being "png" */ - format.psz_string = var_GetNonEmptyString( p_vout, "snapshot-format" ); - if( !format.psz_string ) - format.psz_string = strdup( "png" ); - if( !format.psz_string ) + /* 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( val.psz_string ); - image_HandlerDelete( p_image ); - return VLC_ENOMEM; + 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 + psz_path = vout_snapshot_GetDirectory(); + if( !psz_path ) { - char *psz_tmp = str_format( p_vout, psz_prefix ); - filename_sanitize( psz_tmp ); - free( psz_prefix ); - psz_prefix = psz_tmp; + msg_Err( p_vout, "no path specified for snapshots" ); + goto exit; } - - closedir( path ); - if( var_GetBool( p_vout, "snapshot-sequential" ) == true ) - { - int i_num = var_GetInteger( p_vout, "snapshot-num" ); - struct stat st; - - do - { - free( psz_filename ); - 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( utf8_stat( psz_filename, &st ) == 0 ); - - var_SetInteger( p_vout, "snapshot-num", i_num ); - } - else - { - 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; - } - } - 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) - { - 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; - /* Save the snapshot */ - i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename ); - if( i_ret != VLC_SUCCESS ) - { - msg_Err( p_vout, "could not create snapshot %s", psz_filename ); - free( psz_filename ); - image_HandlerDelete( p_image ); - return VLC_EGENERIC; - } + 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 ); - /* */ - msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename ); - vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN, - "%s", psz_filename ); + 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*/ - val.psz_string = psz_filename ; + /* signal creation of a new snapshot file */ + var_SetString( p_vout->p_libvlc, "snapshot-file", psz_filename ); - var_Set( p_vout->p_libvlc, "vout-snapshottaken", val ); - /* var_Set duplicates data for transport so we can free*/ free( psz_filename ); - /* */ - if( var_GetBool( p_vout, "snapshot-preview" ) ) - { - if( VoutSnapshotPip( p_vout, p_image, p_pic, &fmt_in ) ) - msg_Warn( p_vout, "Failed to display snapshot" ); - } - image_HandlerDelete( p_image ); - - return VLC_SUCCESS; +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, +void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name, bool b_add, bool b_setconfig ) { char *psz_parser; - char *psz_string = config_GetPsz( p_vout, "vout-filter" ); + 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 ) + { + msg_Err( p_vout, "Unable to find filter module \"%s\".", psz_name ); + return; + } + + if( module_provides( p_obj, "video filter" ) ) + { + psz_filter_type = "vout-filter"; + } + else if( module_provides( p_obj, "video filter2" ) ) + { + psz_filter_type = "video-filter"; + } + else if( module_provides( p_obj, "sub filter" ) ) + { + psz_filter_type = "sub-filter"; + } + else + { + module_release( p_obj ); + msg_Err( p_vout, "Unknown video filter type." ); + return; + } + module_release( p_obj ); + + 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(""); @@ -891,77 +606,21 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, return; } } - if( b_setconfig ) - config_PutPsz( p_vout, "vout-filter", psz_string ); - var_SetString( p_vout, "vout-filter", psz_string ); - free( psz_string ); -} - -/***************************************************************************** - * InitWindowSize: find the initial dimensions the video window should have. - ***************************************************************************** - * This function will check the "width", "height" and "zoom" config options and - * will calculate the size that the video window should have. - *****************************************************************************/ -static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width, - unsigned *pi_height ) -{ -#define FP_FACTOR 1000 /* our fixed point factor */ - - 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_width = (int)( i_width * ll_zoom / FP_FACTOR ); - *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 ) + if( b_setconfig ) { - *pi_height = (int)( i_height * ll_zoom / FP_FACTOR ); - *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( !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 ); } - 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); - } - 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 - / FP_FACTOR ); - } + if( !strcmp( psz_filter_type, "sub-filter") ) + var_SetString( vout_GetSpu( p_vout ), psz_filter_type, psz_string ); else - { - *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 ); + var_SetString( p_vout, psz_filter_type, psz_string ); -#undef FP_FACTOR + free( psz_string ); } /***************************************************************************** @@ -970,13 +629,9 @@ initwsize_end: static int ZoomCallback( 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)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_SIZE, p_vout->i_window_width, - p_vout->i_window_height ); - return VLC_SUCCESS; + (void)psz_cmd; (void)oldval; (void)p_data; + + return var_SetFloat( p_this, "scale", newval.f_float ); } static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, @@ -1047,6 +702,13 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, 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; @@ -1077,6 +739,13 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, 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; @@ -1102,6 +771,13 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, 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; @@ -1115,10 +791,7 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, } crop_end: - InitWindowSize( p_vout, &p_vout->i_window_width, - &p_vout->i_window_height ); - - p_vout->i_changes |= VOUT_CROP_CHANGE; + p_vout->p->i_changes |= VOUT_CROP_CHANGE; msg_Dbg( p_vout, "cropping picture %ix%i to %i,%i,%ix%i", p_vout->fmt_in.i_width, p_vout->fmt_in.i_height, @@ -1126,7 +799,7 @@ 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" ); + var_TriggerCallback( p_vout, "crop-update" ); return VLC_SUCCESS; } @@ -1144,8 +817,6 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, /* Restore defaults */ p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num; p_vout->fmt_in.i_sar_den = p_vout->fmt_render.i_sar_den; - p_vout->fmt_in.i_aspect = p_vout->fmt_render.i_aspect; - p_vout->render.i_aspect = p_vout->fmt_render.i_aspect; if( !psz_parser ) goto aspect_end; @@ -1160,25 +831,19 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_ureduce( &i_sar_num, &i_sar_den, i_sar_num, i_sar_den, 0 ); p_vout->fmt_in.i_sar_num = i_sar_num; p_vout->fmt_in.i_sar_den = i_sar_den; - p_vout->fmt_in.i_aspect = i_aspect_num * VOUT_ASPECT_FACTOR / i_aspect_den; - p_vout->render.i_aspect = p_vout->fmt_in.i_aspect; aspect_end: if( p_vout->p->i_par_num && p_vout->p->i_par_den ) { 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->p->i_par_den / p_vout->p->i_par_num; - p_vout->render.i_aspect = p_vout->fmt_in.i_aspect; } - p_vout->i_changes |= VOUT_ASPECT_CHANGE; + p_vout->p->i_changes |= VOUT_ASPECT_CHANGE; - vlc_ureduce( &i_aspect_num, &i_aspect_den, - p_vout->fmt_in.i_aspect, VOUT_ASPECT_FACTOR, 0 ); msg_Dbg( p_vout, "new aspect-ratio %i:%i, sample aspect-ratio %i:%i", - i_aspect_num, i_aspect_den, + p_vout->fmt_in.i_sar_num * p_vout->fmt_in.i_width, + p_vout->fmt_in.i_sar_den * p_vout->fmt_in.i_height, p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den ); if( var_Get( p_vout, "crop", &val ) ) @@ -1195,18 +860,18 @@ static int ScalingCallback( vlc_object_t *p_this, char const *psz_cmd, vout_thread_t *p_vout = (vout_thread_t *)p_this; (void)oldval; (void)newval; (void)p_data; - vlc_mutex_lock( &p_vout->change_lock ); + vlc_mutex_lock( &p_vout->p->change_lock ); if( !strcmp( psz_cmd, "autoscale" ) ) { - p_vout->i_changes |= VOUT_SCALE_CHANGE; + p_vout->p->i_changes |= VOUT_SCALE_CHANGE; } else if( !strcmp( psz_cmd, "scale" ) ) { - p_vout->i_changes |= VOUT_ZOOM_CHANGE; + p_vout->p->i_changes |= VOUT_ZOOM_CHANGE; } - vlc_mutex_unlock( &p_vout->change_lock ); + vlc_mutex_unlock( &p_vout->p->change_lock ); return VLC_SUCCESS; } @@ -1216,14 +881,10 @@ static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd, { vout_thread_t *p_vout = (vout_thread_t *)p_this; - 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 ); + vlc_mutex_lock( &p_vout->p->change_lock ); + p_vout->p->i_changes |= VOUT_ON_TOP_CHANGE; + p_vout->p->b_on_top = newval.b_bool; + vlc_mutex_unlock( &p_vout->p->change_lock ); (void)psz_cmd; (void)oldval; (void)p_data; return VLC_SUCCESS; @@ -1234,13 +895,11 @@ 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; - (void)psz_cmd; (void)oldval; (void)p_data; + (void)psz_cmd; (void)p_data; - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - - /* 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 ); + if( oldval.b_bool == newval.b_bool ) + return VLC_SUCCESS; /* no-op */ + p_vout->p->i_changes |= VOUT_FULLSCREEN_CHANGE; val.b_bool = true; var_Set( p_vout, "intf-change", val ); @@ -1251,11 +910,10 @@ 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; - - /* FIXME: this is definitely not thread-safe */ - p_vout->p->b_snapshot = true; VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(p_data); + + VoutSaveSnapshot( p_vout ); return VLC_SUCCESS; } @@ -1265,7 +923,7 @@ static int TitleShowCallback( vlc_object_t *p_this, char const *psz_cmd, 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; + p_vout->p->title.show = newval.b_bool; return VLC_SUCCESS; } @@ -1274,7 +932,7 @@ static int TitleTimeoutCallback( vlc_object_t *p_this, char const *psz_cmd, { 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; + p_vout->p->title.timeout = (mtime_t) newval.i_int; return VLC_SUCCESS; } @@ -1284,6 +942,6 @@ static int TitlePositionCallback( vlc_object_t *p_this, char const *psz_cmd, 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; + p_vout->p->title.position = newval.i_int; return VLC_SUCCESS; }