X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=dba906723a4f4be6c410918708fa93e6f0a3aa76;hb=3812518e39c0e8785146dac59e53ad4e177ebd92;hp=8830b9d6539e89c51a125c5d2f4f7d4916d639cb;hpb=b070df41f070f0a0971de8bfada029cff9c83101;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 8830b9d653..dba906723a 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -1,7 +1,7 @@ /***************************************************************************** * vout_intf.c : video output interface ***************************************************************************** - * Copyright (C) 2000-2004 VideoLAN + * Copyright (C) 2000-2004 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -28,19 +28,27 @@ #include #include +#include #include "vlc_video.h" #include "video_output.h" #include "vlc_image.h" #include "vlc_spu.h" +#include + /***************************************************************************** * 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 * ); +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 OnTopCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int FullscreenCallback( vlc_object_t *, char const *, @@ -172,16 +180,22 @@ int vout_ControlWindow( vout_thread_t *p_vout, void *p_window, void vout_IntfInit( vout_thread_t *p_vout ) { vlc_value_t val, text, old_val; + vlc_bool_t b_force_par = VLC_FALSE; /* Create a few object variables we'll need later on */ var_Create( p_vout, "snapshot-path", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "snapshot-format", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "snapshot-preview", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_vout, "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; + var_Create( p_vout, "video-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + /* Zoom object var */ var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); @@ -210,6 +224,103 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_AddCallback( p_vout, "zoom", ZoomCallback, NULL ); + /* Crop object var */ + var_Create( p_vout, "crop", VLC_VAR_STRING | + VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); + + text.psz_string = _("Crop"); + var_Change( p_vout, "crop", VLC_VAR_SETTEXT, &text, NULL ); + + val.psz_string = ""; + var_Change( p_vout, "crop", VLC_VAR_DELCHOICE, &val, 0 ); + val.psz_string = ""; text.psz_string = _("Default"); + var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "001:1"; text.psz_string = "1:1"; + var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "004:3"; text.psz_string = "4:3"; + var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "16:09"; 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 = "221:100"; text.psz_string = "221:100"; + 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 ); + + 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 ); + + /* Monitor pixel aspect-ratio */ + var_Create( p_vout, "monitor-par", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_vout, "monitor-par", &val ); + if( val.psz_string && *val.psz_string ) + { + char *psz_parser = strchr( val.psz_string, ':' ); + unsigned int i_aspect_num = 0, i_aspect_den = 0; + float i_aspect = 0; + if( psz_parser ) + { + i_aspect_num = strtol( val.psz_string, 0, 0 ); + i_aspect_den = strtol( ++psz_parser, 0, 0 ); + } + else + { + i_aspect = atof( val.psz_string ); + vlc_ureduce( &i_aspect_num, &i_aspect_den, + i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 ); + } + 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; + + vlc_ureduce( &p_vout->i_par_num, &p_vout->i_par_den, + p_vout->i_par_num, p_vout->i_par_den, 0 ); + + msg_Dbg( p_vout, "monitor pixel aspect-ratio overriding: %i:%i", + p_vout->i_par_num, p_vout->i_par_den ); + b_force_par = VLC_TRUE; + } + if( val.psz_string ) free( val.psz_string ); + + /* Aspect-ratio object var */ + var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | + 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 = ""; + var_Change( p_vout, "aspect-ratio", VLC_VAR_DELCHOICE, &val, 0 ); + val.psz_string = ""; text.psz_string = _("Default"); + var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "001:1"; text.psz_string = "1:1"; + var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "004:3"; text.psz_string = "4:3"; + var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "16:09"; 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 = "221:100"; + 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 ); + + 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 ); + + /* 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 ); text.psz_string = _("Always on top"); @@ -259,7 +370,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) char *psz_filename; subpicture_t *p_subpic; picture_t *p_pif; - vlc_value_t val; + vlc_value_t val, format; int i_ret; var_Get( p_vout, "snapshot-path", &val ); @@ -268,25 +379,191 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) 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_mutex_unlock( &p_dest->object_lock ); + 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_mutex_unlock( &p_dest->object_lock ); + 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_mutex_unlock( &p_dest->object_lock ); + vlc_object_release( p_dest ); + return VLC_ENOMEM; + } + memcpy( p_snapshot->p_data, p_block->p_buffer, p_block->i_buffer ); + + p_dest->p_private = p_snapshot; + + block_Release( p_block ); + + /* Unlock the object */ + vlc_cond_signal( &p_dest->object_wait ); + vlc_mutex_unlock( &p_dest->object_lock ); + vlc_object_release( p_dest ); + + image_HandlerDelete( p_image ); + return VLC_SUCCESS; + } + + +#if defined(__APPLE__) || defined(SYS_BEOS) + if( !val.psz_string && p_vout->p_vlc->psz_homedir ) + { + asprintf( &val.psz_string, "%s/Desktop", + p_vout->p_vlc->psz_homedir ); + } + +#elif defined(WIN32) && !defined(UNDER_CE) + if( !val.psz_string && p_vout->p_vlc->psz_homedir ) + { + /* Get the My Pictures folder path */ + + char *p_mypicturesdir = NULL; + typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD, + LPSTR ); + #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 ) + { + SHGetFolderPath = (void *)GetProcAddress( shfolder_dll, + _T("SHGetFolderPathA") ); + if( SHGetFolderPath != NULL ) + { + p_mypicturesdir = (char *)malloc( MAX_PATH ); + if( p_mypicturesdir ) + { + + if( S_OK != SHGetFolderPath( NULL, + CSIDL_MYPICTURES | CSIDL_FLAG_CREATE, + NULL, SHGFP_TYPE_CURRENT, + p_mypicturesdir ) ) + { + free( p_mypicturesdir ); + p_mypicturesdir = NULL; + } + } + } + FreeLibrary( shfolder_dll ); + } + + if( p_mypicturesdir == NULL ) + { + asprintf( &val.psz_string, "%s/" CONFIG_DIR, + p_vout->p_vlc->psz_homedir ); + } + else + { + asprintf( &val.psz_string, p_mypicturesdir ); + free( p_mypicturesdir ); + } + } + +#else if( !val.psz_string && p_vout->p_vlc->psz_homedir ) { asprintf( &val.psz_string, "%s/" CONFIG_DIR, p_vout->p_vlc->psz_homedir ); } +#endif + if( !val.psz_string ) { msg_Err( p_vout, "no directory 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" ); + } - asprintf( &psz_filename, "%s/vlcsnap-%u.png", val.psz_string, - (unsigned int)(p_pic->date / 100000) & 0xFFFFFF ); + asprintf( &psz_filename, "%s/vlcsnap-%u.%s", val.psz_string, + (unsigned int)(p_pic->date / 100000) & 0xFFFFFF, + format.psz_string ); free( val.psz_string ); + free( format.psz_string ); /* Save the snapshot */ - fmt_in.i_chroma = p_vout->render.i_chroma; - fmt_in.i_width = p_vout->render.i_width; - fmt_in.i_height = p_vout->render.i_height; + 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 ) { @@ -299,35 +576,41 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename ); free( psz_filename ); - /* Inject a subpicture with the snapshot */ - fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); - fmt_out.i_width = fmt_out.i_visible_width = p_vout->render.i_width; - fmt_out.i_height = fmt_out.i_visible_height = p_vout->render.i_height; - fmt_out.i_aspect = VOUT_ASPECT_FACTOR; - 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 ) + if( var_GetBool( p_vout, "snapshot-preview" ) ) { - p_pif->pf_release( p_pif ); - return VLC_EGENERIC; - } + /* Inject a subpicture with the snapshot */ + memset( &fmt_out, 0, sizeof(fmt_out) ); + fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); + p_pif = image_Convert( p_image, p_pic, &fmt_in, &fmt_out ); + image_HandlerDelete( p_image ); + if( !p_pif ) return VLC_EGENERIC; + + p_subpic = spu_CreateSubpicture( p_vout->p_spu ); + if( p_subpic == NULL ) + { + p_pif->pf_release( p_pif ); + return VLC_EGENERIC; + } - p_subpic->i_channel = 0; - p_subpic->i_start = mdate(); - p_subpic->i_stop = mdate() + 4000000; - p_subpic->b_ephemer = VLC_TRUE; - p_subpic->b_fade = VLC_TRUE; - p_subpic->i_original_picture_width = p_vout->render.i_width * 4; - p_subpic->i_original_picture_height = p_vout->render.i_height * 4; + p_subpic->i_channel = 0; + p_subpic->i_start = mdate(); + p_subpic->i_stop = mdate() + 4000000; + p_subpic->b_ephemer = VLC_TRUE; + p_subpic->b_fade = VLC_TRUE; + p_subpic->i_original_picture_width = p_vout->render.i_width * 4; + p_subpic->i_original_picture_height = p_vout->render.i_height * 4; - p_subpic->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 ); + p_subpic->p_region = spu_CreateRegion( p_vout->p_spu, &fmt_out ); + vout_CopyPicture( p_image->p_parent, &p_subpic->p_region->picture, + p_pif ); + p_pif->pf_release( p_pif ); - spu_DisplaySubpicture( p_vout->p_spu, p_subpic ); + spu_DisplaySubpicture( p_vout->p_spu, p_subpic ); + } + else + { + image_HandlerDelete( p_image ); + } return VLC_SUCCESS; } @@ -360,6 +643,73 @@ int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args ) } } +/***************************************************************************** + * 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 ) +{ + 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 ); + + 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 ) + { + *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( 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 ); + } + 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 ); + +#undef FP_FACTOR +} + /***************************************************************************** * Object variables callbacks *****************************************************************************/ @@ -367,7 +717,121 @@ 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; - vout_Control( p_vout, VOUT_SET_ZOOM, newval.f_float ); + 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; +} + +static int CropCallback( 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; + int64_t i_aspect_num, i_aspect_den; + unsigned int i_width, i_height; + + char *psz_end, *psz_parser = strchr( newval.psz_string, ':' ); + + /* Restore defaults */ + p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset; + p_vout->fmt_in.i_visible_width = p_vout->fmt_render.i_visible_width; + p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset; + p_vout->fmt_in.i_visible_height = p_vout->fmt_render.i_visible_height; + + if( !psz_parser ) goto crop_end; + + i_aspect_num = strtol( newval.psz_string, &psz_end, 0 ); + if( psz_end == newval.psz_string || !i_aspect_num ) goto crop_end; + + i_aspect_den = strtol( ++psz_parser, &psz_end, 0 ); + if( psz_end == psz_parser || !i_aspect_den ) goto crop_end; + + i_width = p_vout->fmt_in.i_sar_den * p_vout->fmt_render.i_visible_height * + i_aspect_num / i_aspect_den / p_vout->fmt_in.i_sar_num; + i_height = p_vout->fmt_render.i_visible_width * p_vout->fmt_in.i_sar_num * + i_aspect_den / i_aspect_num / p_vout->fmt_in.i_sar_den; + + if( i_width < p_vout->fmt_render.i_visible_width ) + { + p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset + + (p_vout->fmt_render.i_visible_width - i_width) / 2; + p_vout->fmt_in.i_visible_width = i_width; + } + else + { + p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset + + (p_vout->fmt_render.i_visible_height - i_height) / 2; + p_vout->fmt_in.i_visible_height = i_height; + } + + crop_end: + InitWindowSize( p_vout, &p_vout->i_window_width, + &p_vout->i_window_height ); + + p_vout->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, + p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset, + p_vout->fmt_in.i_visible_width, + p_vout->fmt_in.i_visible_height ); + + return VLC_SUCCESS; +} + +static int AspectCallback( 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; + unsigned int i_aspect_num, i_aspect_den, i_sar_num, i_sar_den; + vlc_value_t val; + + char *psz_end, *psz_parser = strchr( newval.psz_string, ':' ); + + /* 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; + + i_aspect_num = strtol( newval.psz_string, &psz_end, 0 ); + if( psz_end == newval.psz_string || !i_aspect_num ) goto aspect_end; + + i_aspect_den = strtol( ++psz_parser, &psz_end, 0 ); + if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end; + + i_sar_num = i_aspect_num * p_vout->fmt_render.i_visible_height; + i_sar_den = i_aspect_den * p_vout->fmt_render.i_visible_width; + 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->i_par_num && p_vout->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_aspect = p_vout->fmt_in.i_aspect * + p_vout->i_par_den / p_vout->i_par_num; + p_vout->render.i_aspect = p_vout->fmt_in.i_aspect; + } + + p_vout->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_sar_den ); + + var_Get( p_vout, "crop", &val ); + return CropCallback( p_this, 0, val, val, 0 ); + return VLC_SUCCESS; }