From bdab92b9d508e438c1fe9a94402829f9a790f12e Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 1 Feb 2010 19:47:45 +0200 Subject: [PATCH] libvlc_video_*: rewrite - enable (non-ES) settings even if no output is present - best effort at handling multiple outputs - remove exceptions - libvlc_video_get_size returns both dimensions - libvlc_video_take_snapshot takes a parameter to select the output --- include/vlc/libvlc_media_player.h | 113 ++++---- src/control/media_player.c | 12 +- src/control/video.c | 449 +++++++++++++----------------- src/libvlc.sym | 1 + 4 files changed, 272 insertions(+), 303 deletions(-) diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index fd97ff30b2..178b01d7b2 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -444,11 +444,12 @@ VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t * ); /** end bug */ /** - * Does this media player have a video output? + * How many video outputs does this media player have? * * \param p_md the media player + * \return the number of video outputs */ -VLC_PUBLIC_API int libvlc_media_player_has_vout( libvlc_media_player_t * ); +VLC_PUBLIC_API unsigned libvlc_media_player_has_vout( libvlc_media_player_t * ); /** * Is this media player seekable? @@ -488,18 +489,17 @@ VLC_PUBLIC_API void libvlc_track_description_release( libvlc_track_description_t */ /** - * Toggle fullscreen status on a non-embedded video output. + * Toggle fullscreen status on non-embedded video outputs. * * @warning The same limitations applies to this function * as to libvlc_set_fullscreen(). * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer */ -VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_player_t * ); /** - * Enable or disable fullscreen on a non-embedded video output. + * Enable or disable fullscreen on non-embedded video outputs. * * @warning With most window managers, only a top-level windows can switch to * full-screen mode. Hence, this function will not operate properly if @@ -511,18 +511,16 @@ VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_player_t *, libvlc_ex * * \param p_mediaplayer the media player * \param b_fullscreen boolean for fullscreen status - * \param p_e an initialized exception pointer */ -VLC_PUBLIC_API void libvlc_set_fullscreen( libvlc_media_player_t *, int, libvlc_exception_t * ); +VLC_PUBLIC_API void libvlc_set_fullscreen( libvlc_media_player_t *, int ); /** * Get current fullscreen status. * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer * \return the fullscreen status (boolean) */ -VLC_PUBLIC_API int libvlc_get_fullscreen( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_PUBLIC_API int libvlc_get_fullscreen( libvlc_media_player_t * ); /** * Enable or disable key press events handling, according to the LibVLC hotkeys @@ -557,35 +555,48 @@ void libvlc_video_set_key_input( libvlc_media_player_t *mp, unsigned on ); VLC_PUBLIC_API void libvlc_video_set_mouse_input( libvlc_media_player_t *mp, unsigned on ); +/** + * Get the pixel dimensions of a video. + * + * \param mp media player + * \param num number of the video (starting from, and most commonly 0) + * \param px pointer to get the pixel width [OUT] + * \param py pointer to get the pixel height [OUT] + * \return 0 on success, -1 if the specified video does not exist + */ +VLC_PUBLIC_API +int libvlc_video_get_size( libvlc_media_player_t *mp, unsigned num, + unsigned *px, unsigned *py ); + /** * Get current video height. + * You should use libvlc_video_get_size() instead. * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer - * \return the video height + * \return the video pixel height or 0 if not applicable */ -VLC_PUBLIC_API int libvlc_video_get_height( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_DEPRECATED_API +int libvlc_video_get_height( libvlc_media_player_t * ); /** * Get current video width. + * You should use libvlc_video_get_size() instead. * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer - * \return the video width + * \return the video pixel width or 0 if not applicable */ -VLC_PUBLIC_API int libvlc_video_get_width( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_DEPRECATED_API +int libvlc_video_get_width( libvlc_media_player_t * ); /** * Get the current video scaling factor. * See also libvlc_video_set_scale(). * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer * \return the currently configured zoom factor, or 0. if the video is set * to fit to the output window/drawable automatically. */ -VLC_PUBLIC_API float libvlc_video_get_scale( libvlc_media_player_t *, - libvlc_exception_t *p_e ); +VLC_PUBLIC_API float libvlc_video_get_scale( libvlc_media_player_t * ); /** * Set the video scaling factor. That is the ratio of the number of pixels on @@ -597,46 +608,42 @@ VLC_PUBLIC_API float libvlc_video_get_scale( libvlc_media_player_t *, * * \param p_mediaplayer the media player * \param i_factor the scaling factor, or zero - * \param p_e an initialized exception pointer */ -VLC_PUBLIC_API void libvlc_video_set_scale( libvlc_media_player_t *, float, - libvlc_exception_t *p_e ); +VLC_PUBLIC_API void libvlc_video_set_scale( libvlc_media_player_t *, float ); /** * Get current video aspect ratio. * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer - * \return the video aspect ratio + * \return the video aspect ratio or NULL if unspecified + * (the result must be released with free() or libvlc_free()). */ -VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t * ); /** * Set new video aspect ratio. * * \param p_mediaplayer the media player - * \param psz_aspect new video aspect-ratio - * \param p_e an initialized exception pointer + * \param psz_aspect new video aspect-ratio or NULL to reset to default + * \note Invalid aspect ratios are ignored. */ -VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *, const char *, libvlc_exception_t * ); +VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *, const char * ); /** * Get current video subtitle. * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer - * \return the video subtitle selected + * \return the video subtitle selected, or -1 if none */ -VLC_PUBLIC_API int libvlc_video_get_spu( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_PUBLIC_API int libvlc_video_get_spu( libvlc_media_player_t * ); /** * Get the number of available video subtitles. * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer * \return the number of available video subtitles */ -VLC_PUBLIC_API int libvlc_video_get_spu_count( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_PUBLIC_API int libvlc_video_get_spu_count( libvlc_media_player_t * ); /** * Get the description of available video subtitles. @@ -653,9 +660,9 @@ VLC_PUBLIC_API libvlc_track_description_t * * * \param p_mediaplayer the media player * \param i_spu new video subtitle to select - * \param p_e an initialized exception pointer + * \return 0 on success, -1 if out of range */ -VLC_PUBLIC_API void libvlc_video_set_spu( libvlc_media_player_t *, int , libvlc_exception_t * ); +VLC_PUBLIC_API int libvlc_video_set_spu( libvlc_media_player_t *, unsigned ); /** * Set new video subtitle file. @@ -692,19 +699,18 @@ VLC_PUBLIC_API libvlc_track_description_t * * Get current crop filter geometry. * * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer - * \return the crop filter geometry + * \return the crop filter geometry or NULL if unset */ -VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t * ); /** * Set new crop filter geometry. * * \param p_mediaplayer the media player - * \param psz_geometry new crop filter geometry - * \param p_e an initialized exception pointer + * \param psz_geometry new crop filter geometry (NULL to unset) */ -VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, const char *, libvlc_exception_t * ); +VLC_PUBLIC_API +void libvlc_video_set_crop_geometry( libvlc_media_player_t *, const char * ); /** * Toggle teletext transparent status on video output. @@ -726,7 +732,6 @@ VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t * ); * Get the description of available video tracks. * * \param p_mi media player - * \param p_e an initialized exception * \return list with description of available video tracks, or NULL on error */ VLC_PUBLIC_API libvlc_track_description_t * @@ -736,19 +741,19 @@ VLC_PUBLIC_API libvlc_track_description_t * * Get current video track. * * \param p_mi media player - * \param p_e an initialized exception pointer - * \return the video track (int) + * \return the video track (int) or -1 if none */ -VLC_PUBLIC_API int libvlc_video_get_track( libvlc_media_player_t *, libvlc_exception_t * ); +VLC_PUBLIC_API int libvlc_video_get_track( libvlc_media_player_t * ); /** * Set video track. * * \param p_mi media player * \param i_track the track (int) - * \param p_e an initialized exception pointer + * \return 0 on success, -1 if out of range */ -VLC_PUBLIC_API void libvlc_video_set_track( libvlc_media_player_t *, int, libvlc_exception_t * ); +VLC_PUBLIC_API +int libvlc_video_set_track( libvlc_media_player_t *, int ); /** * Take a snapshot of the current video window. @@ -757,24 +762,24 @@ VLC_PUBLIC_API void libvlc_video_set_track( libvlc_media_player_t *, int, libvlc * If i_width XOR i_height is 0, original aspect-ratio is preserved. * * \param p_mi media player instance + * \param num number of video output (typically 0 for the first/only one) * \param psz_filepath the path where to save the screenshot to * \param i_width the snapshot's width * \param i_height the snapshot's height - * \param p_e an initialized exception pointer + * \return 0 on success, -1 if the video was not found */ -VLC_PUBLIC_API void libvlc_video_take_snapshot( libvlc_media_player_t *, const char *,unsigned int, unsigned int, libvlc_exception_t * ); +VLC_PUBLIC_API +int libvlc_video_take_snapshot( libvlc_media_player_t *, unsigned num, + const char *,unsigned int, unsigned int ); /** * Enable or disable deinterlace filter * * \param p_mi libvlc media player - * \param b_enable boolean to enable or disable deinterlace filter - * \param psz_mode type of deinterlace filter to use - * \param p_e an initialized exception pointer + * \param psz_mode type of deinterlace filter, NULL to disable */ VLC_PUBLIC_API void libvlc_video_set_deinterlace( libvlc_media_player_t *, - int , const char *, - libvlc_exception_t *); + const char * ); /** * Get an integer marquee option value diff --git a/src/control/media_player.c b/src/control/media_player.c index d26e7c6c99..116064243a 100644 --- a/src/control/media_player.c +++ b/src/control/media_player.c @@ -356,7 +356,17 @@ libvlc_media_player_new( libvlc_instance_t *instance ) var_Create (mp, "mouse-events", VLC_VAR_BOOL); var_SetBool (mp, "mouse-events", true); - /* Audio */ + var_Create (mp, "fullscreen", VLC_VAR_BOOL); + var_Create (mp, "autoscale", VLC_VAR_BOOL); + var_SetBool (mp, "autoscale", true); + var_Create (mp, "scale", VLC_VAR_FLOAT); + var_SetFloat (mp, "scale", 1.); + var_Create (mp, "aspect-ratio", VLC_VAR_STRING); + var_Create (mp, "crop", VLC_VAR_STRING); + var_Create (mp, "deinterlace", VLC_VAR_INTEGER); + var_Create (mp, "deinterlace-mode", VLC_VAR_STRING); + + /* Audio */ var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT); mp->p_md = NULL; diff --git a/src/control/video.c b/src/control/video.c index 12d365f97c..8956c23b3b 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -44,27 +44,41 @@ /* * Remember to release the returned vout_thread_t. */ -static vout_thread_t *GetVout( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_exception ) +static vout_thread_t **GetVouts( libvlc_media_player_t *p_mi, size_t *n ) { input_thread_t *p_input = libvlc_get_input_thread( p_mi ); - vout_thread_t *p_vout = NULL; + if( !p_input ) + return NULL; - if( p_input ) - { - p_vout = input_GetVout( p_input ); - if( !p_vout ) - { - libvlc_exception_raise( p_exception ); - libvlc_printerr( "No active video output" ); - } - vlc_object_release( p_input ); - } - else + vout_thread_t **pp_vouts; + if (input_Control( p_input, INPUT_GET_VOUTS, &pp_vouts, n)) { - libvlc_exception_raise( p_exception ); - libvlc_printerr( "No active input" ); + *n = 0; + pp_vouts = NULL; } + vlc_object_release (p_input); + return pp_vouts; +} + +static vout_thread_t *GetVout (libvlc_media_player_t *mp, size_t num) +{ + vout_thread_t *p_vout = NULL; + size_t n; + vout_thread_t **pp_vouts = GetVouts (mp, &n); + if (pp_vouts == NULL) + goto err; + + if (num < n) + p_vout = pp_vouts[num]; + + for (size_t i = 0; i < n; i++) + if (i != num) + vlc_object_release (pp_vouts[i]); + free (pp_vouts); + + if (p_vout == NULL) +err: + libvlc_printerr ("Video output not active"); return p_vout; } @@ -72,49 +86,43 @@ static vout_thread_t *GetVout( libvlc_media_player_t *p_mi, * Exported functions **********************************************************************/ -void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen, - libvlc_exception_t *p_e ) +void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen ) { - /* We only work on the first vout */ - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - - /* GetVout will raise the exception for us */ - if( !p_vout ) return; + /* This will work even if the video is not currently active */ + var_SetBool (p_mi, "fullscreen", !!b_fullscreen); - var_SetBool( p_vout, "fullscreen", b_fullscreen ); - - vlc_object_release( p_vout ); + /* Apply to current video outputs (if any) */ + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mi, &n); + for (size_t i = 0; i < n; i++) + { + var_SetBool (pp_vouts[i], "fullscreen", b_fullscreen); + vlc_object_release (pp_vouts[i]); + } + free (pp_vouts); } -int libvlc_get_fullscreen( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_get_fullscreen( libvlc_media_player_t *p_mi ) { - /* We only work on the first vout */ - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - int i_ret; - - /* GetVout will raise the exception for us */ - if( !p_vout ) return 0; - - i_ret = var_GetBool( p_vout, "fullscreen" ); - - vlc_object_release( p_vout ); - - return i_ret; + return var_GetBool (p_mi, "fullscreen"); } -void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi ) { - /* We only work on the first vout */ - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - - /* GetVout will raise the exception for us */ - if( !p_vout ) return; + var_ToggleBool (p_mi, "fullscreen"); + bool b_fullscreen = var_GetBool (p_mi, "fullscreen"); - var_ToggleBool( p_vout, "fullscreen" ); + /* Apply to current video outputs (if any) */ + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mi, &n); + for (size_t i = 0; i < n; i++) + { + vout_thread_t *p_vout = pp_vouts[i]; - vlc_object_release( p_vout ); + var_SetBool (p_vout, "fullscreen", b_fullscreen); + vlc_object_release (p_vout); + } + free (pp_vouts); } void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on ) @@ -127,145 +135,122 @@ void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on ) var_SetBool (p_mi, "mouse-events", !!on); } -void -libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, const char *psz_filepath, - unsigned int i_width, unsigned int i_height, libvlc_exception_t *p_e ) +int +libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, unsigned num, + const char *psz_filepath, + unsigned int i_width, unsigned int i_height ) { - vout_thread_t *p_vout; - assert( psz_filepath ); - /* We must have an input */ - if( !p_mi->p_input_thread ) - { - libvlc_exception_raise( p_e ); - libvlc_printerr( "Input does not exist" ); - return; - } - - /* GetVout will raise the exception for us */ - p_vout = GetVout( p_mi, p_e ); - if( !p_vout ) return; + vout_thread_t *p_vout = GetVout (p_mi, num); + if (p_vout == NULL) + return -1; - var_SetInteger( p_vout, "snapshot-width", i_width ); + /* FIXME: This is not atomic. Someone else could change the values, + * at least in theory. */ + var_SetInteger( p_vout, "snapshot-width", i_width); var_SetInteger( p_vout, "snapshot-height", i_height ); - var_SetString( p_vout, "snapshot-path", psz_filepath ); var_SetString( p_vout, "snapshot-format", "png" ); - - var_TriggerCallback( p_vout, "video-snapshot" ); - vlc_object_release( p_vout ); + var_TriggerCallback (p_vout, "video-snapshot" ); + return 0; } -int libvlc_video_get_height( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num, + unsigned *restrict px, unsigned *restrict py ) { - int height; - - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if( !p_vout ) return 0; + vout_thread_t *p_vout = GetVout (p_mi, num); + if (p_vout == NULL) + return -1; - height = p_vout->i_window_height; + *px = p_vout->i_window_height; + *py = p_vout->i_window_width; + vlc_object_release (p_vout); + return 0; +} - vlc_object_release( p_vout ); +int libvlc_video_get_height( libvlc_media_player_t *p_mi ) +{ + unsigned height, width; + if (libvlc_video_get_size (p_mi, 0, &height, &width)) + return 0; return height; } -int libvlc_video_get_width( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_video_get_width( libvlc_media_player_t *p_mi ) { - int width; - - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if( !p_vout ) return 0; - - width = p_vout->i_window_width; - - vlc_object_release( p_vout ); + unsigned height, width; + if (libvlc_video_get_size (p_mi, 0, &height, &width)) + return 0; return width; } -int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi ) +unsigned libvlc_media_player_has_vout( libvlc_media_player_t *p_mi ) { - input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi); - bool has_vout = false; - - if( p_input_thread ) - { - vout_thread_t *p_vout; - - p_vout = input_GetVout( p_input_thread ); - if( p_vout ) - { - has_vout = true; - vlc_object_release( p_vout ); - } - vlc_object_release( p_input_thread ); - } - return has_vout; + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mi, &n); + for (size_t i = 0; i < n; i++) + vlc_object_release (pp_vouts[i]); + free (pp_vouts); + return n; } -float libvlc_video_get_scale( libvlc_media_player_t *p_mp, - libvlc_exception_t *p_e ) +float libvlc_video_get_scale( libvlc_media_player_t *mp ) { - vout_thread_t *p_vout = GetVout( p_mp, p_e ); - if( !p_vout ) - return 0.; - - float f_scale = var_GetFloat( p_vout, "scale" ); - if( var_GetBool( p_vout, "autoscale" ) ) + float f_scale = var_GetFloat (mp, "scale"); + if (var_GetBool (mp, "autoscale")) f_scale = 0.; - vlc_object_release( p_vout ); return f_scale; } -void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale, - libvlc_exception_t *p_e ) +void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale ) { - vout_thread_t *p_vout = GetVout( p_mp, p_e ); - if( !p_vout ) - return; + if (f_scale != 0.) + var_SetFloat (p_mp, "scale", f_scale); + var_SetBool (p_mp, "autoscale", f_scale != 0.); - if( f_scale != 0. ) - var_SetFloat( p_vout, "scale", f_scale ); - var_SetBool( p_vout, "autoscale", f_scale != 0. ); - vlc_object_release( p_vout ); + /* Apply to current video outputs (if any) */ + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mp, &n); + for (size_t i = 0; i < n; i++) + { + vout_thread_t *p_vout = pp_vouts[i]; + + if (f_scale != 0.) + var_SetFloat (p_vout, "scale", f_scale); + var_SetBool (p_mp, "autoscale", f_scale != 0.); + vlc_object_release (p_vout); + } + free (pp_vouts); } -char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi ) { - char *psz_aspect = NULL; - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - - if( !p_vout ) return NULL; - - psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" ); - vlc_object_release( p_vout ); - return psz_aspect ? psz_aspect : strdup(""); + return var_GetNonEmptyString (p_mi, "aspect-ratio"); } void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, - const char *psz_aspect, libvlc_exception_t *p_e ) + const char *psz_aspect ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - int i_ret = -1; - - if( !p_vout ) return; + if (psz_aspect == NULL) + psz_aspect = ""; + var_SetString (p_mi, "aspect-ratio", psz_aspect); - i_ret = var_SetString( p_vout, "aspect-ratio", psz_aspect ); - vlc_object_release( p_vout ); - if( i_ret ) + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mi, &n); + for (size_t i = 0; i < n; i++) { - libvlc_exception_raise( p_e ); - libvlc_printerr( "Bad or unsupported aspect ratio" ); + vout_thread_t *p_vout = pp_vouts[i]; + + var_SetString (p_vout, "aspect-ratio", psz_aspect); + vlc_object_release (p_vout); } + free (pp_vouts); } -int libvlc_video_get_spu( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_video_get_spu( libvlc_media_player_t *p_mi ) { input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); vlc_value_t val_list; @@ -276,7 +261,6 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi, if( !p_input_thread ) { - libvlc_exception_raise( p_e ); libvlc_printerr( "No active input" ); return -1; } @@ -285,9 +269,8 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi, if( i_ret < 0 ) { vlc_object_release( p_input_thread ); - libvlc_exception_raise( p_e ); libvlc_printerr( "Subtitle informations not found" ); - return i_ret; + return -1; } var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); @@ -304,21 +287,15 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi, return i_spu; } -int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi ) { input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); int i_spu_count; if( !p_input_thread ) - { - libvlc_exception_raise( p_e ); - libvlc_printerr( "No active input" ); - return -1; - } + return 0; i_spu_count = var_CountChoices( p_input_thread, "spu-es" ); - vlc_object_release( p_input_thread ); return i_spu_count; } @@ -329,42 +306,30 @@ libvlc_track_description_t * return libvlc_get_track_description( p_mi, "spu-es" ); } -void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu, - libvlc_exception_t *p_e ) +int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i_spu ) { input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); - vlc_value_t val_list; - vlc_value_t newval; - int i_ret = -1; + vlc_value_t list; + int i_ret = 0; if( !p_input_thread ) - { - libvlc_exception_raise( p_e ); - libvlc_printerr( "No active input" ); - return; - } + return -1; - var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + var_Change (p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &list, NULL); - if( ( val_list.p_list->i_count == 0 ) - || (i_spu < 0) || (i_spu > val_list.p_list->i_count) ) + if (i_spu > (unsigned)list.p_list->i_count) { - libvlc_exception_raise( p_e ); - libvlc_printerr( "Subtitle number out of range" ); + libvlc_printerr( "Subtitle number out of range (%u/%u)", + i_spu, list.p_list->i_count ); + i_ret = -1; goto end; } - - newval = val_list.p_list->p_values[i_spu]; - i_ret = var_Set( p_input_thread, "spu-es", newval ); - if( i_ret < 0 ) - { - libvlc_exception_raise( p_e ); - libvlc_printerr( "Subtitle selection error" ); - } - + var_SetInteger (p_input_thread, "spu-es", + list.p_list->p_values[i_spu].i_int); end: - var_FreeList( &val_list, NULL ); - vlc_object_release( p_input_thread ); + vlc_object_release (p_input_thread); + var_FreeList (&list, NULL); + return i_ret; } int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, @@ -397,35 +362,30 @@ libvlc_track_description_t * return libvlc_get_track_description( p_mi, psz_title ); } -char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +char *libvlc_video_get_crop_geometry (libvlc_media_player_t *p_mi) { - char *psz_geometry = 0; - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - - if( !p_vout ) return 0; - - psz_geometry = var_GetNonEmptyString( p_vout, "crop" ); - vlc_object_release( p_vout ); - return psz_geometry ? psz_geometry : strdup(""); + return var_GetNonEmptyString (p_mi, "crop"); } void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, - const char *psz_geometry, libvlc_exception_t *p_e ) + const char *psz_geometry ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - int i_ret = -1; + if (psz_geometry == NULL) + psz_geometry = ""; - if( !p_vout ) return; + var_SetString (p_mi, "crop", psz_geometry); - i_ret = var_SetString( p_vout, "crop", psz_geometry ); - vlc_object_release( p_vout ); + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mi, &n); - if( i_ret ) + for (size_t i = 0; i < n; i++) { - libvlc_exception_raise( p_e ); - libvlc_printerr( "Bad or unsupported cropping geometry" ); + vout_thread_t *p_vout = pp_vouts[i]; + + var_SetString (p_vout, "crop", psz_geometry); + vlc_object_release (p_vout); } + free (pp_vouts); } void libvlc_toggle_teletext( libvlc_media_player_t *p_mi ) @@ -479,30 +439,25 @@ libvlc_track_description_t * return libvlc_get_track_description( p_mi, "video-es" ); } -int libvlc_video_get_track( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_video_get_track( libvlc_media_player_t *p_mi ) { input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); vlc_value_t val_list; vlc_value_t val; int i_track = -1; - int i_ret = -1; - int i; if( !p_input_thread ) return -1; - i_ret = var_Get( p_input_thread, "video-es", &val ); - if( i_ret < 0 ) + if( var_Get( p_input_thread, "video-es", &val ) < 0 ) { - libvlc_exception_raise( p_e ); libvlc_printerr( "Video track information not found" ); vlc_object_release( p_input_thread ); return -1; } var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL ); - for( i = 0; i < val_list.p_list->i_count; i++ ) + for( int i = 0; i < val_list.p_list->i_count; i++ ) { if( val_list.p_list->p_values[i].i_int == val.i_int ) { @@ -515,75 +470,74 @@ int libvlc_video_get_track( libvlc_media_player_t *p_mi, return i_track; } -void libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track, - libvlc_exception_t *p_e ) +int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track ) { input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); vlc_value_t val_list; int i_ret = -1; - int i; if( !p_input_thread ) - return; + return -1; var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL ); - for( i = 0; i < val_list.p_list->i_count; i++ ) + for( int i = 0; i < val_list.p_list->i_count; i++ ) { if( i_track == val_list.p_list->p_values[i].i_int ) { - i_ret = var_SetInteger( p_input_thread, "video-es", i_track ); - if( i_ret < 0 ) + if( var_SetInteger( p_input_thread, "video-es", i_track ) < 0 ) break; + i_ret = 0; goto end; } } - libvlc_exception_raise( p_e ); libvlc_printerr( "Video track number out of range" ); end: var_FreeList( &val_list, NULL ); vlc_object_release( p_input_thread ); + return i_ret; } /****************************************************************************** * libvlc_video_set_deinterlace : enable deinterlace *****************************************************************************/ -void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi, int b_enable, - const char *psz_mode, - libvlc_exception_t *p_e ) -{ - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - - if( !p_vout ) +void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi, + const char *psz_mode ) +{ + if (psz_mode == NULL) + psz_mode = ""; + if (*psz_mode + && strcmp (psz_mode, "blend") && strcmp (psz_mode, "bob") + && strcmp (psz_mode, "discard") && strcmp (psz_mode, "linear") + && strcmp (psz_mode, "mean") && strcmp (psz_mode, "x") + && strcmp (psz_mode, "yadif") && strcmp (psz_mode, "yadif2x")) return; - if( b_enable ) + if (*psz_mode) { - /* be sure that the filter name given is supported */ - if( !strcmp(psz_mode, "blend") || !strcmp(psz_mode, "bob") - || !strcmp(psz_mode, "discard") || !strcmp(psz_mode, "linear") - || !strcmp(psz_mode, "mean") || !strcmp(psz_mode, "x") - || !strcmp(psz_mode, "yadif") || !strcmp(psz_mode, "yadif2x") ) - { - /* set deinterlace filter chosen */ - var_SetString( p_vout, "deinterlace-mode", psz_mode ); - var_SetInteger( p_vout, "deinterlace", 1 ); - } - else - { - libvlc_exception_raise( p_e ); - libvlc_printerr( "Bad or unsupported deinterlacing mode" ); - } + var_SetString (p_mi, "deinterlace-mode", psz_mode); + var_SetInteger (p_mi, "deinterlace", 1); } else + var_SetInteger (p_mi, "deinterlace", 0); + + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mi, &n); + for (size_t i = 0; i < n; i++) { - /* disable deinterlace filter */ - var_SetInteger( p_vout, "deinterlace", 0 ); - } + vout_thread_t *p_vout = pp_vouts[i]; - vlc_object_release( p_vout ); + if (*psz_mode) + { + var_SetString (p_vout, "deinterlace-mode", psz_mode); + var_SetInteger (p_vout, "deinterlace", 1); + } + else + var_SetInteger (p_vout, "deinterlace", 0); + vlc_object_release (p_vout); + } + free (pp_vouts); } - /* ************** */ /* module helpers */ /* ************** */ @@ -593,7 +547,7 @@ static vlc_object_t *get_object( libvlc_media_player_t * p_mi, const char *name, libvlc_exception_t *p_e ) { vlc_object_t *object = NULL; - vout_thread_t *vout = GetVout( p_mi, p_e ); + vout_thread_t *vout = GetVout( p_mi, 0 ); libvlc_exception_clear( p_e ); if( vout ) { @@ -623,8 +577,7 @@ set_int( libvlc_media_player_t *p_mi, const char *name, if( !opt->type ) /* the enabler */ { - vout_thread_t *vout = GetVout( p_mi, p_e ); - libvlc_exception_clear( p_e ); + vout_thread_t *vout = GetVout( p_mi, 0 ); if (vout) { vout_EnableFilter( vout, opt->name, value, false ); diff --git a/src/libvlc.sym b/src/libvlc.sym index 8101c0cfc0..3b2ee00a54 100644 --- a/src/libvlc.sym +++ b/src/libvlc.sym @@ -167,6 +167,7 @@ libvlc_track_description_release libvlc_video_get_aspect_ratio libvlc_video_get_chapter_description libvlc_video_get_crop_geometry +libvlc_video_get_size libvlc_video_get_height libvlc_video_get_logo_int libvlc_video_get_marquee_int -- 2.39.2