X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fvideo.c;h=90b6d8c89a8d6f26ea079789f7a2676ed8a28a0c;hb=6643b4ab3d08e83ab87f3f27c51538fd9253f546;hp=16dcc07655a512c586667232aaa4eaf2ce0c8e87;hpb=a2d6f90b134fd103d890da2caf902a4ce743efff;p=vlc diff --git a/src/control/video.c b/src/control/video.c index 16dcc07655..90b6d8c89a 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -7,6 +7,8 @@ * * Authors: Cl�ent Stenac * Filippo Carone + * Jean-Paul Saman + * Damien Fouilleul * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,47 +34,33 @@ * Remember to release the returned vout_thread_t since it is locked at * the end of this function. */ -static vout_thread_t *GetVout( libvlc_input_t *p_input, +static vout_thread_t *GetVout( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_exception ) { - input_thread_t *p_input_thread; - vout_thread_t *p_vout; + input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_exception ); + vout_thread_t *p_vout = NULL; - if( !p_input ) - { - libvlc_exception_raise( p_exception, "Input is NULL" ); - return NULL; - } - - p_input_thread = (input_thread_t*)vlc_object_get( - p_input->p_instance->p_libvlc_int, - p_input->i_input_id ); - if( !p_input_thread ) - { - libvlc_exception_raise( p_exception, "Input does not exist" ); - return NULL; - } - - p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); - if( !p_vout ) + if( p_input_thread ) { + p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); + if( !p_vout ) + { + libvlc_exception_raise( p_exception, "No active video output" ); + } vlc_object_release( p_input_thread ); - libvlc_exception_raise( p_exception, "No active video output" ); - return NULL; } - vlc_object_release( p_input_thread ); - return p_vout; } + /********************************************************************** * Exported functions **********************************************************************/ -void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen, +void libvlc_set_fullscreen( libvlc_media_instance_t *p_mi, int b_fullscreen, libvlc_exception_t *p_e ) { /* We only work on the first vout */ - vout_thread_t *p_vout1 = GetVout( p_input, p_e ); + vout_thread_t *p_vout1 = GetVout( p_mi, p_e ); vlc_value_t val; int i_ret; /* GetVout will raise the exception for us */ @@ -92,11 +80,11 @@ void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen, vlc_object_release( p_vout1 ); } -int libvlc_get_fullscreen( libvlc_input_t *p_input, +int libvlc_get_fullscreen( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { /* We only work on the first vout */ - vout_thread_t *p_vout1 = GetVout( p_input, p_e ); + vout_thread_t *p_vout1 = GetVout( p_mi, p_e ); vlc_value_t val; int i_ret; /* GetVout will raise the exception for us */ @@ -111,11 +99,11 @@ int libvlc_get_fullscreen( libvlc_input_t *p_input, return val.b_bool == VLC_TRUE ? 1 : 0; } -void libvlc_toggle_fullscreen( libvlc_input_t *p_input, +void libvlc_toggle_fullscreen( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { /* We only work on the first vout */ - vout_thread_t *p_vout1 = GetVout( p_input, p_e ); + vout_thread_t *p_vout1 = GetVout( p_mi, p_e ); vlc_value_t val; int i_ret; /* GetVout will raise the exception for us */ @@ -137,31 +125,35 @@ void libvlc_toggle_fullscreen( libvlc_input_t *p_input, } void -libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath, +libvlc_video_take_snapshot( libvlc_media_instance_t *p_mi, char *psz_filepath, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); input_thread_t *p_input_thread; - char path[256]; - /* GetVout will raise the exception for us */ if( !p_vout ) { return; } + if( !psz_filepath ) + { + libvlc_exception_raise( p_e, "filepath is null" ); + return; + } + + p_input_thread = (input_thread_t*)vlc_object_get( - p_input->p_instance->p_libvlc_int, - p_input->i_input_id ); + p_mi->p_libvlc_instance->p_libvlc_int, + p_mi->i_input_id ); if( !p_input_thread ) { libvlc_exception_raise( p_e, "Input does not exist" ); return; } - snprintf( path, 255, "%s", psz_filepath ); - var_SetString( p_vout, "snapshot-path", path ); + var_SetString( p_vout, "snapshot-path", psz_filepath ); var_SetString( p_vout, "snapshot-format", "png" ); vout_Control( p_vout, VOUT_SNAPSHOT ); @@ -169,10 +161,10 @@ libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath, vlc_object_release( p_input_thread ); } -int libvlc_video_get_height( libvlc_input_t *p_input, +int libvlc_video_get_height( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout1 = GetVout( p_input, p_e ); + vout_thread_t *p_vout1 = GetVout( p_mi, p_e ); if( !p_vout1 ) return 0; @@ -181,10 +173,10 @@ int libvlc_video_get_height( libvlc_input_t *p_input, return p_vout1->i_window_height; } -int libvlc_video_get_width( libvlc_input_t *p_input, +int libvlc_video_get_width( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout1 = GetVout( p_input, p_e ); + vout_thread_t *p_vout1 = GetVout( p_mi, p_e ); if( !p_vout1 ) return 0; @@ -193,46 +185,67 @@ int libvlc_video_get_width( libvlc_input_t *p_input, return p_vout1->i_window_width; } -vlc_bool_t libvlc_input_has_vout( libvlc_input_t *p_input, +vlc_bool_t libvlc_media_instance_has_vout( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); - if ( libvlc_exception_raised( p_e ) ) + input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi, p_e); + vlc_bool_t has_vout = VLC_FALSE; + + if( p_input_thread ) { - if ( strcmp( "No active video output", libvlc_exception_get_message( p_e ) ) == 0 ) + vout_thread_t *p_vout; + + p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); + if( p_vout ) { - libvlc_exception_clear( p_e ); + has_vout = VLC_TRUE; + vlc_object_release( p_vout ); } - return VLC_FALSE; + vlc_object_release( p_input_thread ); } - - vlc_object_release( p_vout ); - - return VLC_TRUE; + return has_vout; } -int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d, +int libvlc_video_reparent( libvlc_media_instance_t *p_mi, libvlc_drawable_t d, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if ( p_vout == NULL) + if( p_vout ) { - /// \todo: set exception - return 0; + vout_Control( p_vout , VOUT_REPARENT, d); + vlc_object_release( p_vout ); } - - vout_Control( p_vout , VOUT_REPARENT, d); - vlc_object_release( p_vout ); - return 0; } -void libvlc_video_resize( libvlc_input_t *p_input, int width, int height, libvlc_exception_t *p_e ) +void libvlc_video_resize( libvlc_media_instance_t *p_mi, int width, int height, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); - vout_Control( p_vout, VOUT_SET_SIZE, width, height ); - vlc_object_release( p_vout ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); + if( p_vout ) + { + vout_Control( p_vout, VOUT_SET_SIZE, width, height ); + vlc_object_release( p_vout ); + } +} + +void libvlc_video_redraw_rectangle( libvlc_media_instance_t *p_mi, + const libvlc_rectangle_t *area, + libvlc_exception_t *p_e ) +{ + if( (NULL != area) + && ((area->bottom - area->top) > 0) + && ((area->right - area->left) > 0) ) + { + vout_thread_t *p_vout = GetVout( p_mi, p_e ); + if( p_vout ) + { + /* tell running vout to redraw area */ + vout_Control( p_vout , VOUT_REDRAW_RECT, + area->top, area->left, area->bottom, area->right ); + vlc_object_release( p_vout ); + } + } } /* global video settings */ @@ -245,21 +258,31 @@ void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d if( libvlc_playlist_isplaying(p_instance, p_e) ) { - libvlc_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e); - if( p_input ) + libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e); + if( p_mi ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); if( p_vout ) { /* tell running vout to re-parent */ vout_Control( p_vout , VOUT_REPARENT, d); vlc_object_release( p_vout ); } - libvlc_input_free(p_input); + libvlc_media_instance_release(p_mi); } } } +libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) +{ + libvlc_drawable_t result; + + result = var_GetInteger( p_instance->p_libvlc_int, "drawable" ); + + return result; +} + + void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height, libvlc_exception_t *p_e ) { @@ -269,17 +292,17 @@ void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height if( libvlc_playlist_isplaying(p_instance, p_e) ) { - libvlc_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e); - if( p_input ) + libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e); + if( p_mi ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); if( p_vout ) { /* tell running vout to re-size */ vout_Control( p_vout , VOUT_SET_SIZE, width, height); vlc_object_release( p_vout ); } - libvlc_input_free(p_input); + libvlc_media_instance_release(p_mi); } } } @@ -309,10 +332,10 @@ void libvlc_video_set_viewport( libvlc_instance_t *p_instance, if( libvlc_playlist_isplaying(p_instance, p_e) ) { - libvlc_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e); - if( p_input ) + libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e); + if( p_mi ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); if( p_vout ) { /* change viewport for running vout */ @@ -321,16 +344,16 @@ void libvlc_video_set_viewport( libvlc_instance_t *p_instance, clip->top, clip->left, clip->bottom, clip->right ); vlc_object_release( p_vout ); } - libvlc_input_free(p_input); + libvlc_media_instance_release(p_mi); } } } -char *libvlc_video_get_aspect_ratio( libvlc_input_t *p_input, - libvlc_exception_t *p_e ) +char *libvlc_video_get_aspect_ratio( libvlc_media_instance_t *p_mi, + libvlc_exception_t *p_e ) { char *psz_aspect = 0; - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); if( !p_vout ) return 0; @@ -340,10 +363,10 @@ char *libvlc_video_get_aspect_ratio( libvlc_input_t *p_input, return psz_aspect; } -void libvlc_video_set_aspect_ratio( libvlc_input_t *p_input, +void libvlc_video_set_aspect_ratio( libvlc_media_instance_t *p_mi, char *psz_aspect, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); int i_ret = -1; if( !p_vout ) @@ -357,11 +380,79 @@ void libvlc_video_set_aspect_ratio( libvlc_input_t *p_input, vlc_object_release( p_vout ); } -char *libvlc_video_get_crop_geometry( libvlc_input_t *p_input, +int libvlc_video_get_spu( libvlc_media_instance_t *p_mi, + libvlc_exception_t *p_e ) +{ + input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + vlc_value_t val_list; + vlc_value_t val; + int i_spu = -1; + int i_ret = -1; + int i; + + if( !p_input_thread ) + return -1; + + i_ret = var_Get( p_input_thread, "spu-es", &val ); + if( i_ret < 0 ) + { + libvlc_exception_raise( p_e, "Getting subtitle information failed" ); + vlc_object_release( p_input_thread ); + return i_ret; + } + + var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + for( i = 0; i < val_list.p_list->i_count; i++ ) + { + vlc_value_t spu_val = val_list.p_list->p_values[i]; + if( val.i_int == spu_val.i_int ) + { + i_spu = i; + break; + } + } + vlc_object_release( p_input_thread ); + return i_spu; +} + +void libvlc_video_set_spu( libvlc_media_instance_t *p_mi, int i_spu, + libvlc_exception_t *p_e ) +{ + input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + vlc_value_t val_list; + int i_ret = -1; + int i; + + if( !p_input_thread ) + return; + + var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + for( i = 0; i < val_list.p_list->i_count; i++ ) + { + vlc_value_t val = val_list.p_list->p_values[i]; + if( i_spu == i ) + { + vlc_value_t new_val; + + new_val.i_int = val.i_int; + i_ret = var_Set( p_input_thread, "spu-es", new_val ); + if( i_ret < 0 ) + { + libvlc_exception_raise( p_e, "Setting subtitle value failed" ); + } + vlc_object_release( p_input_thread ); + return; + } + } + libvlc_exception_raise( p_e, "Subtitle value out of range" ); + vlc_object_release( p_input_thread ); +} + +char *libvlc_video_get_crop_geometry( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { char *psz_geometry = 0; - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); if( !p_vout ) return 0; @@ -371,10 +462,10 @@ char *libvlc_video_get_crop_geometry( libvlc_input_t *p_input, return psz_geometry; } -void libvlc_video_set_crop_geometry( libvlc_input_t *p_input, +void libvlc_video_set_crop_geometry( libvlc_media_instance_t *p_mi, char *psz_geometry, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); int i_ret = -1; if( !p_vout ) @@ -388,10 +479,40 @@ void libvlc_video_set_crop_geometry( libvlc_input_t *p_input, vlc_object_release( p_vout ); } -int libvlc_video_destroy( libvlc_input_t *p_input, +int libvlc_video_get_teletext( libvlc_media_instance_t *p_mi, + libvlc_exception_t *p_e ) +{ + vout_thread_t *p_vout = GetVout( p_mi, p_e ); + int i_ret = -1; + + if( !p_vout ) + return i_ret; + + i_ret = var_GetInteger( p_vout, "vbi-page" ); + vlc_object_release( p_vout ); + return i_ret; +} + +void libvlc_video_set_teletext( libvlc_media_instance_t *p_mi, int i_page, + libvlc_exception_t *p_e ) +{ + vout_thread_t *p_vout = GetVout( p_mi, p_e ); + int i_ret = -1; + + if( !p_vout ) + return; + + i_ret = var_SetInteger( p_vout, "vbi-page", i_page ); + if( i_ret ) + libvlc_exception_raise( p_e, + "Unexpected error while setting teletext page" ); + vlc_object_release( p_vout ); +} + +int libvlc_video_destroy( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_input, p_e ); + vout_thread_t *p_vout = GetVout( p_mi, p_e ); vlc_object_detach( p_vout ); vlc_object_release( p_vout ); vout_Destroy( p_vout );