/*****************************************************************************
- * video.c: ibvlc new API video functions
+ * video.c: libvlc new API video functions
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
+ *
* $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
*
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Cl�ent Stenac <zorglub@videolan.org>
+ * Filippo Carone <littlejohn@videolan.org>
*
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <libvlc_internal.h>
+#include "libvlc_internal.h"
#include <vlc/libvlc.h>
+#include <vlc_input.h>
+#include <vlc_vout.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
-
+/*
+ * 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,
libvlc_exception_t *p_exception )
{
}
p_input_thread = (input_thread_t*)vlc_object_get(
- p_input->p_instance->p_vlc,
+ p_input->p_instance->p_libvlc_int,
p_input->i_input_id );
if( !p_input_thread )
{
p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
if( !p_vout )
{
+ 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;
}
/**********************************************************************
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while setting fullscreen value" );
+
+ vlc_object_release( p_vout1 );
}
int libvlc_get_fullscreen( libvlc_input_t *p_input,
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while setting fullscreen value" );
+
+ vlc_object_release( p_vout1 );
}
void
-libvlc_video_take_snapshot( libvlc_input_t *p_input, char *filepath,
+libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_input, p_e );
input_thread_t *p_input_thread;
-
+
char path[256];
/* GetVout will raise the exception for us */
}
p_input_thread = (input_thread_t*)vlc_object_get(
- p_input->p_instance->p_vlc,
+ p_input->p_instance->p_libvlc_int,
p_input->i_input_id );
if( !p_input_thread )
{
libvlc_exception_raise( p_e, "Input does not exist" );
- return NULL;
+ return;
}
-
- snprintf( path, 255, "%s", filepath );
+
+ snprintf( path, 255, "%s", psz_filepath );
var_SetString( p_vout, "snapshot-path", path );
var_SetString( p_vout, "snapshot-format", "png" );
vout_Control( p_vout, VOUT_SNAPSHOT );
vlc_object_release( p_vout );
+ vlc_object_release( p_input_thread );
+}
+
+int libvlc_video_get_height( libvlc_input_t *p_input,
+ libvlc_exception_t *p_e )
+{
+ vout_thread_t *p_vout1 = GetVout( p_input, p_e );
+ if( !p_vout1 )
+ return 0;
+
+ vlc_object_release( p_vout1 );
+
+ return p_vout1->i_window_height;
+}
+
+int libvlc_video_get_width( libvlc_input_t *p_input,
+ libvlc_exception_t *p_e )
+{
+ vout_thread_t *p_vout1 = GetVout( p_input, p_e );
+ if( !p_vout1 )
+ return 0;
+
+ vlc_object_release( p_vout1 );
+
+ return p_vout1->i_window_width;
+}
+
+vlc_bool_t libvlc_input_has_vout( libvlc_input_t *p_input,
+ libvlc_exception_t *p_e )
+{
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+ if ( NULL == p_vout )
+ {
+ if ( libvlc_exception_raised( p_e )
+ && strcmp( "No active video output", libvlc_exception_get_message( p_e ) ) == 0 )
+ {
+ libvlc_exception_clear( p_e );
+ }
+ return VLC_FALSE;
+ }
- return;
+ vlc_object_release( p_vout );
+
+ return VLC_TRUE;
+}
+
+int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d,
+ libvlc_exception_t *p_e )
+{
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+
+ if ( p_vout == NULL)
+ {
+ /// \todo: set exception
+ return 0;
+ }
+
+ 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 )
+{
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+ vout_Control( p_vout, VOUT_SET_SIZE, width, height );
+ vlc_object_release( p_vout );
+}
+
+/* global video settings */
+
+void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d,
+ libvlc_exception_t *p_e )
+{
+ /* set as default for future vout instances */
+ var_SetInteger(p_instance->p_libvlc_int, "drawable", (int)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 )
+ {
+ vout_thread_t *p_vout = GetVout( p_input, 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_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 )
+{
+ /* 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);
+
+ if( libvlc_playlist_isplaying(p_instance, p_e) )
+ {
+ libvlc_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e);
+ if( p_input )
+ {
+ vout_thread_t *p_vout = GetVout( p_input, 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);
+ }
+ }
+}
+
+void libvlc_video_set_viewport( libvlc_instance_t *p_instance,
+ const libvlc_rectangle_t *view, const libvlc_rectangle_t *clip,
+ libvlc_exception_t *p_e )
+{
+ if( NULL == view )
+ {
+ libvlc_exception_raise( p_e, "viewport is NULL" );
+ }
+
+ /* if clip is NULL, then use view rectangle as clip */
+ if( NULL == 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( libvlc_playlist_isplaying(p_instance, p_e) )
+ {
+ libvlc_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e);
+ if( p_input )
+ {
+ vout_thread_t *p_vout = GetVout( p_input, 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 );
+ }
+ libvlc_input_free(p_input);
+ }
+ }
+}
+
+char *libvlc_video_get_aspect_ratio( libvlc_input_t *p_input,
+ libvlc_exception_t *p_e )
+{
+ char *psz_aspect = 0;
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+
+ if( !p_vout )
+ return 0;
+
+ psz_aspect = var_GetString( p_vout, "aspect-ratio" );
+ vlc_object_release( p_vout );
+ return psz_aspect;
+}
+
+void libvlc_video_set_aspect_ratio( libvlc_input_t *p_input,
+ char *psz_aspect, libvlc_exception_t *p_e )
+{
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+ int i_ret = -1;
+
+ if( !p_vout )
+ return;
+
+ i_ret = var_SetString( p_vout, "aspect-ratio", psz_aspect );
+ if( i_ret )
+ libvlc_exception_raise( p_e,
+ "Unexpected error while setting aspect-ratio value" );
+
+ vlc_object_release( p_vout );
+}
+
+char *libvlc_video_get_crop_geometry( libvlc_input_t *p_input,
+ libvlc_exception_t *p_e )
+{
+ char *psz_geometry = 0;
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+
+ if( !p_vout )
+ return 0;
+
+ psz_geometry = var_GetString( p_vout, "crop" );
+ vlc_object_release( p_vout );
+ return psz_geometry;
+}
+
+void libvlc_video_set_crop_geometry( libvlc_input_t *p_input,
+ char *psz_geometry, libvlc_exception_t *p_e )
+{
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+ int i_ret = -1;
+
+ if( !p_vout )
+ return;
+
+ i_ret = var_SetString( p_vout, "crop", psz_geometry );
+ if( i_ret )
+ libvlc_exception_raise( p_e,
+ "Unexpected error while setting crop geometry" );
+
+ vlc_object_release( p_vout );
+}
+
+int libvlc_video_destroy( libvlc_input_t *p_input,
+ libvlc_exception_t *p_e )
+{
+ vout_thread_t *p_vout = GetVout( p_input, p_e );
+ vlc_object_detach( p_vout );
+ vlc_object_release( p_vout );
+ vout_Destroy( p_vout );
+
+ return 0;
}
projects / vlc / blobdiff