* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "libvlc_internal.h"
-
#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_player.h>
+
+#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_vout.h>
+#include "media_player_internal.h"
+#include <vlc_osd.h>
+
/*
* Remember to release the returned vout_thread_t.
*/
static vout_thread_t *GetVout( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_exception )
{
- input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_exception );
+ input_thread_t *p_input = libvlc_get_input_thread( p_mi, p_exception );
vout_thread_t *p_vout = NULL;
- if( p_input_thread )
+ if( p_input )
{
- p_vout = input_GetVout( p_input_thread );
+ p_vout = input_GetVout( p_input );
if( !p_vout )
{
libvlc_exception_raise( p_exception, "No active video output" );
}
- vlc_object_release( p_input_thread );
+ vlc_object_release( p_input );
}
return p_vout;
}
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 )
{
- vout_thread_t *p_vout = GetVout( p_mi, p_e );
- input_thread_t *p_input_thread;
-
- /* GetVout will raise the exception for us */
- if( !p_vout ) return;
+ vout_thread_t *p_vout;
+ /* The filepath must be not NULL */
if( !psz_filepath )
{
libvlc_exception_raise( p_e, "filepath is null" );
return;
}
-
- var_SetInteger( p_vout, "snapshot-width", i_width );
- var_SetInteger( p_vout, "snapshot-height", i_height );
-
- p_input_thread = p_mi->p_input_thread;
+ /* We must have an input */
if( !p_mi->p_input_thread )
{
libvlc_exception_raise( p_e, "Input does not exist" );
return;
}
+ /* GetVout will raise the exception for us */
+ p_vout = GetVout( p_mi, p_e );
+ if( !p_vout ) return;
+
+ 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" );
return has_vout;
}
-int libvlc_video_reparent( libvlc_media_player_t *p_mi, libvlc_drawable_t d,
- libvlc_exception_t *p_e )
-{
- (void) p_mi; (void) d;
- libvlc_exception_raise(p_e, "Reparenting not supported");
- return -1;
-}
-
-void libvlc_video_resize( libvlc_media_player_t *p_mi, int width, int height, libvlc_exception_t *p_e )
-{
- 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_player_t *p_mi,
- const libvlc_rectangle_t *area,
- libvlc_exception_t *p_e )
-{
-#ifdef __APPLE__
- 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 );
- }
- }
-#else
- (void) p_mi; (void) area; (void) p_e;
-#endif
-}
-
-/* global video settings */
-
-/* Deprecated use libvlc_media_player_set_drawable() */
-void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d,
+float libvlc_video_get_scale( libvlc_media_player_t *p_mp,
libvlc_exception_t *p_e )
{
- /* set as default for future vout instances */
-#ifdef WIN32
- vlc_value_t val;
-
- if( sizeof(HWND) > sizeof(libvlc_drawable_t) )
- return; /* BOOM! we told you not to use this function! */
- val.p_address = (void *)(uintptr_t)d;
- var_Set( p_instance->p_libvlc_int, "drawable-hwnd", val );
-#elif defined(__APPLE__)
- var_SetInteger( p_instance->p_libvlc_int, "drawable-agl", d );
-#else
- var_SetInteger( p_instance->p_libvlc_int, "drawable-xid", d );
-#endif
-
- libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
- if( p_mi )
- {
- libvlc_media_player_set_drawable( p_mi, d, p_e );
- libvlc_media_player_release(p_mi);
- }
-}
-
-/* Deprecated use libvlc_media_player_get_drawable() */
-libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
-{
- VLC_UNUSED(p_e);
-
-#ifdef WIN32
- vlc_value_t val;
-
- if( sizeof(HWND) > sizeof(libvlc_drawable_t) )
- return 0;
- var_Get( p_instance->p_libvlc_int, "drawable-hwnd", &val );
- return (uintptr_t)val.p_address;
-#elif defined(__APPLE__)
- return var_GetInteger( p_instance->p_libvlc_int, "drawable-agl" );
-#else
- return var_GetInteger( p_instance->p_libvlc_int, "drawable-xid" );
-#endif
-}
-
-void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height,
- libvlc_exception_t *p_e )
-{
- /* set as default for future vout instances */
- config_PutInt(p_instance->p_libvlc_int, "width", width);
- config_PutInt(p_instance->p_libvlc_int, "height", height);
+ vout_thread_t *p_vout = GetVout( p_mp, p_e );
+ if( !p_vout )
+ return 0.;
- libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
- if( p_mi )
- {
- 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_media_player_release(p_mi);
- }
+ float f_scale = var_GetFloat( p_vout, "scale" );
+ if( var_GetBool( p_vout, "autoscale" ) )
+ f_scale = 0.;
+ vlc_object_release( p_vout );
+ return f_scale;
}
-void libvlc_video_set_viewport( libvlc_instance_t *p_instance, libvlc_media_player_t *p_mi,
- const libvlc_rectangle_t *view, const libvlc_rectangle_t *clip,
- libvlc_exception_t *p_e )
+void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale,
+ libvlc_exception_t *p_e )
{
-#ifdef __APPLE__
- if( !view )
- {
- libvlc_exception_raise( p_e, "viewport is NULL" );
+ vout_thread_t *p_vout = GetVout( p_mp, p_e );
+ if( !p_vout )
return;
- }
- /* if clip is NULL, then use view rectangle as clip */
- if( !clip )
- clip = view;
-
- /* set as default for future vout instances */
- var_SetInteger( p_instance->p_libvlc_int, "drawable-view-top", view->top );
- var_SetInteger( p_instance->p_libvlc_int, "drawable-view-left", view->left );
- var_SetInteger( p_instance->p_libvlc_int, "drawable-view-bottom", view->bottom );
- var_SetInteger( p_instance->p_libvlc_int, "drawable-view-right", view->right );
- var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-top", clip->top );
- var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-left", clip->left );
- var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-bottom", clip->bottom );
- var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-right", clip->right );
-
- if( p_mi )
- {
- vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( p_vout )
- {
- /* change viewport for running vout */
- vout_Control( p_vout, VOUT_SET_VIEWPORT,
- view->top, view->left, view->bottom, view->right,
- clip->top, clip->left, clip->bottom, clip->right );
- vlc_object_release( p_vout );
- }
- }
-#else
- (void) p_instance; (void) view; (void) clip; (void) p_e;
-#endif
+ if( f_scale != 0. )
+ var_SetFloat( p_vout, "scale", f_scale );
+ var_SetBool( p_vout, "autoscale", f_scale != 0. );
+ vlc_object_release( p_vout );
}
char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi,
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 )
+ if( val.i_int == val_list.p_list->p_values[i].i_int )
{
i_spu = i;
break;
}
}
+ var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
return 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_spu_count;
if( !p_input_thread )
return -1;
- var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
+ i_spu_count = var_CountChoices( p_input_thread, "spu-es" );
+
vlc_object_release( p_input_thread );
- return val_list.p_list->i_count;
+ return i_spu_count;
}
libvlc_track_description_t *
if( val_list.p_list->i_count == 0 )
{
libvlc_exception_raise( p_e, "Subtitle value out of range" );
- vlc_object_release( p_input_thread );
- return;
+ goto end;
}
if( (i_spu < 0) && (i_spu > val_list.p_list->i_count) )
{
libvlc_exception_raise( p_e, "Subtitle value out of range" );
- vlc_object_release( p_input_thread );
- return;
+ goto end;
}
newval = val_list.p_list->p_values[i_spu];
{
libvlc_exception_raise( p_e, "Setting subtitle value failed" );
}
+
+end:
+ var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
}
if( list.p_list->i_count > 0 )
var_SetInteger( p_input_thread, "spu-es", list.p_list->p_values[0].i_int );
- var_Change( p_input_thread, "teletext-es", VLC_VAR_FREELIST, &list, NULL );
+ var_FreeList( &list, NULL );
}
}
vlc_object_release( p_input_thread );
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_track_count;
if( !p_input_thread )
return -1;
- var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
+ i_track_count = var_CountChoices( p_input_thread, "video-es" );
+
vlc_object_release( p_input_thread );
- return val_list.p_list->i_count;
+ return i_track_count;
}
libvlc_track_description_t *
var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
for( i = 0; i < val_list.p_list->i_count; i++ )
{
- vlc_value_t track_val = val_list.p_list->p_values[i];
- if( track_val.i_int == val.i_int )
+ if( val_list.p_list->p_values[i].i_int == val.i_int )
{
i_track = i;
break;
- }
+ }
}
+ var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
return i_track;
}
vlc_value_t val = val_list.p_list->p_values[i];
if( i_track == val.i_int )
{
- i_ret = var_Set( p_input_thread, "audio-es", val );
+ i_ret = var_Set( p_input_thread, "video-es", val );
if( i_ret < 0 )
libvlc_exception_raise( p_e, "Setting video track failed" );
- vlc_object_release( p_input_thread );
- return;
+ goto end;
}
}
libvlc_exception_raise( p_e, "Video track out of range" );
+
+end:
+ var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
}
-int libvlc_video_destroy( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+/******************************************************************************
+ * 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 );
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
+
+ if( !p_vout )
+ {
+ libvlc_exception_raise( p_e, "Unable to get video output" );
+ return;
+ }
+
+ if( b_enable )
+ {
+ /* 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") )
+ {
+ /* set deinterlace filter chosen */
+ var_SetString( p_vout, "deinterlace", psz_mode );
+ }
+ else
+ {
+ libvlc_exception_raise( p_e, "Unsuported or bad deinterlace filter name" );
+ }
+ }
+ else
+ {
+ /* disable deinterlace filter */
+ var_SetString( p_vout, "deinterlace", "" );
+ }
+
vlc_object_release( p_vout );
+}
+
+/*****************************************************************************
+ * Marquee: FIXME: That implementation has not persistent state and requires
+ * a vout
+ *****************************************************************************/
+
+static inline const char * get_marquee_int_option_identifier(unsigned option)
+{
+ static const char * marquee_table[] =
+ {
+ "marq",
+ "marq-color",
+ "marq-opacity",
+ "marq-position",
+ "marq-refresh",
+ "marq-size",
+ "marq-timeout",
+ "marq-x",
+ "marq-y"
+ };
+ static const unsigned marquee_table_size = sizeof(marquee_table)/sizeof(*marquee_table);
+ if( option >= marquee_table_size )
+ return NULL;
+ return marquee_table[option];
+}
+
+static inline const char * get_marquee_string_option_identifier(unsigned option)
+{
+ static const char * marquee_table[] =
+ {
+ "marq-marquee"
+ };
+ static const unsigned marquee_table_size = sizeof(marquee_table)/sizeof(*marquee_table);
+ if( option >= marquee_table_size )
+ return NULL;
+ return marquee_table[option];
+}
+
+
+static inline vlc_object_t * get_marquee_object( libvlc_media_player_t * p_mi )
+{
+ libvlc_exception_t e;
+ libvlc_exception_init(&e);
+ vout_thread_t * vout = GetVout( p_mi, &e );
+ libvlc_exception_clear(&e);
+ if( !vout )
+ return NULL;
+ vlc_object_t * object = vlc_object_find_name( vout, "marq", FIND_CHILD );
+ vlc_object_release(vout);
+ return object;
+}
+
+/*****************************************************************************
+ * libvlc_video_get_marquee_option_as_int : get a marq option value
+ *****************************************************************************/
+int libvlc_video_get_marquee_option_as_int( libvlc_media_player_t *p_mi,
+ libvlc_video_marquee_int_option_t option,
+ libvlc_exception_t *p_e )
+{
+ const char * identifier = get_marquee_int_option_identifier(option);
+ if(!identifier)
+ {
+ libvlc_exception_raise( p_e, "This option is not available" );
+ return 0;
+ }
+ vlc_object_t * marquee = get_marquee_object(p_mi);
- return 0;
+ /* Handle the libvlc_marquee_Enabled separately */
+ if(option == libvlc_marquee_Enabled)
+ {
+ bool isEnabled = marquee != NULL;
+ vlc_object_release(marquee);
+ return isEnabled;
+ }
+
+ /* Generic case */
+ if(!identifier)
+ {
+ libvlc_exception_raise( p_e, "Marquee is not enabled" );
+ return 0;
+ }
+ int ret = var_GetInteger(marquee, identifier);
+ vlc_object_release(marquee);
+ return ret;
+}
+
+/*****************************************************************************
+ * libvlc_video_get_marquee_option_as_string : get a marq option value
+ *****************************************************************************/
+char * libvlc_video_get_marquee_option_as_string( libvlc_media_player_t *p_mi,
+ libvlc_video_marquee_string_option_t option,
+ libvlc_exception_t *p_e )
+{
+ const char * identifier = get_marquee_string_option_identifier(option);
+ if(!identifier)
+ {
+ libvlc_exception_raise( p_e, "This option is not available" );
+ return 0;
+ }
+
+ vlc_object_t * marquee = get_marquee_object(p_mi);
+ if(!marquee)
+ {
+ libvlc_exception_raise( p_e, "Marquee is not enabled" );
+ return 0;
+ }
+ char *ret = var_GetString(marquee, identifier);
+ vlc_object_release(marquee);
+ return ret;
+}
+
+/*****************************************************************************
+ * libvlc_video_set_marquee_option_as_int: enable, disable or set an int option
+ *****************************************************************************/
+void libvlc_video_set_marquee_option_as_int( libvlc_media_player_t *p_mi,
+ libvlc_video_marquee_int_option_t option,
+ int value, libvlc_exception_t *p_e )
+{
+ const char * identifier = get_marquee_string_option_identifier(option);
+ if(!identifier)
+ {
+ libvlc_exception_raise( p_e, "This option is not available" );
+ return;
+ }
+
+ /* Handle the libvlc_marquee_Enabled separately */
+ if(option == libvlc_marquee_Enabled)
+ {
+ libvlc_exception_t e;
+ libvlc_exception_init(&e);
+ vout_thread_t * vout = GetVout( p_mi, &e );
+ libvlc_exception_clear(&e);
+ if (vout)
+ vout_EnableFilter(vout, identifier, value, false);
+ else
+ libvlc_exception_raise( p_e, "No Vout" );
+ vlc_object_release(vout);
+ return;
+ }
+
+ vlc_object_t * marquee = get_marquee_object(p_mi);
+ if(!marquee)
+ {
+ libvlc_exception_raise( p_e, "Marquee is not enabled" );
+ return;
+ }
+ var_SetInteger(marquee, identifier, value);
+ vlc_object_release(marquee);
+}
+
+/*****************************************************************************
+ * libvlc_video_set_marquee_option_as_string: set a string option
+ *****************************************************************************/
+void libvlc_video_set_marquee_option_as_string( libvlc_media_player_t *p_mi,
+ libvlc_video_marquee_string_option_t option,
+ const char * value,
+ libvlc_exception_t *p_e )
+{
+ const char * identifier = get_marquee_string_option_identifier(option);
+ if(!identifier)
+ {
+ libvlc_exception_raise( p_e, "This option is not available" );
+ return;
+ }
+ vlc_object_t * marquee = get_marquee_object(p_mi);
+ if(!marquee)
+ {
+ libvlc_exception_raise( p_e, "Marquee is not enabled" );
+ return;
+ }
+ var_SetString(marquee, identifier, value);
+ vlc_object_release(marquee);
}
projects / vlc / blobdiff