X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvideo_output%2Fvout_intf.c;h=969597f246d0e2f705c63348eb9c45cecf9d9f13;hb=f0040526943e9b664ffcd8f3ed551f1029fe2dc5;hp=4610a6a66e69e0c396ad856719aaa77414270ee2;hpb=6b057b5e0dc46f3761e675fbce1b8b955e37096e;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 4610a6a66e..969597f246 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -43,7 +43,6 @@ #include #include -#include #include #include #include @@ -81,86 +80,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. *****************************************************************************/ @@ -210,24 +129,23 @@ static const struct 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; } } @@ -325,9 +243,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 +271,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 +307,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 ); @@ -481,187 +405,6 @@ static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic ) 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) - - /* 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 ? */ - psz_path = config_GetUserDataDir(); - -#endif - - 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 ) - { - /* 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 ) - { - psz_prefix = strdup( "vlcsnap-" ); - if( !psz_prefix ) - goto error; - } - - if( var_GetBool( p_vout, "snapshot-sequential" ) ) - { - int i_num = var_GetInteger( p_vout, "snapshot-num" ); - for( ; ; i_num++ ) - { - 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 ); - } - - var_SetInteger( p_vout, "snapshot-num", i_num ); - } - else - { - 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) */ - psz_filename = str_format( p_vout, psz_path ); - path_sanitize( psz_filename ); - } - - if( !psz_filename ) - goto error; - - /* Save the snapshot */ - FILE *p_file = utf8_fopen( psz_filename, "wb" ); - if( !p_file ) - { - msg_Err( p_vout, "Failed to open '%s'", psz_filename ); - free( psz_filename ); - 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 @@ -684,26 +427,7 @@ int vout_GetSnapshot( vout_thread_t *p_vout, video_format_t *p_fmt, const char *psz_format, mtime_t i_timeout ) { - vout_thread_sys_t *p_sys = p_vout->p; - - vlc_mutex_lock( &p_sys->snapshot.lock ); - p_sys->snapshot.i_request++; - - const mtime_t i_deadline = mdate() + i_timeout; - while( p_sys->snapshot.b_available && !p_sys->snapshot.p_picture ) - { - if( vlc_cond_timedwait( &p_sys->snapshot.wait, &p_sys->snapshot.lock, - i_deadline ) ) - break; - } - - 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 ); - + picture_t *p_picture = vout_snapshot_Get( &p_vout->p->snapshot, i_timeout ); if( !p_picture ) { msg_Err( p_vout, "Failed to grab a snapshot" ); @@ -759,7 +483,7 @@ static void VoutSaveSnapshot( vout_thread_t *p_vout ) if( !psz_path ) { - psz_path = VoutSnapshotGetDefaultDirectory(); + psz_path = vout_snapshot_GetDirectory(); if( !psz_path ) { msg_Err( p_vout, "no path specified for snapshots" ); @@ -767,18 +491,27 @@ static void VoutSaveSnapshot( vout_thread_t *p_vout ) } } + vout_snapshot_save_cfg_t cfg; + memset( &cfg, 0, sizeof(cfg) ); + cfg.is_sequential = var_GetBool( p_vout, "snapshot-sequential" ); + cfg.sequence = var_GetInteger( p_vout, "snapshot-num" ); + cfg.path = psz_path; + cfg.format = psz_format; + cfg.prefix_fmt = psz_prefix; + char *psz_filename; - if( VoutWriteSnapshot( p_vout, &psz_filename, - p_image, - psz_path, psz_format, psz_prefix ) ) + int i_sequence; + if (vout_snapshot_SaveImage( &psz_filename, &i_sequence, + p_image, VLC_OBJECT(p_vout), &cfg ) ) goto exit; + if( cfg.is_sequential ) + var_SetInteger( p_vout, "snapshot-num", i_sequence + 1 ); VoutOsdSnapshot( p_vout, p_picture, psz_filename ); - /* Generate a media player event - Right now just trigger a global libvlc var - CHECK: Could not find a more local object. The goal is to communicate - vout_thread with libvlc_media_player or its input_thread */ - var_SetString( p_vout->p_libvlc, "vout-snapshottaken", psz_filename ); + /* signal creation of a new snapshot file */ + var_SetString( p_vout->p_libvlc, "snapshot-file", psz_filename ); + free( psz_filename ); exit: @@ -1144,7 +877,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; }