libvlc input and video update:

[vlc] / src / control / video.c

diff --git a/src/control/video.c b/src/control/video.c
index 9a1a7c9c5868320d66755bdc68965700ba77bb77..968d51bea71c14c3f796c5a329530dd7f0e0d975 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -51,9 +51,12 @@ static vout_thread_t *GetVout( libvlc_input_t *p_input,
     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;
 }
 /**********************************************************************
@@ -80,6 +83,9 @@ void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen,
     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,
@@ -122,4 +128,82 @@ void libvlc_toggle_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 *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 */
+    if( !p_vout )
+    {
+        return;
+    }
+
+    p_input_thread = (input_thread_t*)vlc_object_get(
+                                 p_input->p_instance->p_vlc,
+                                 p_input->i_input_id );
+    if( !p_input_thread )
+    {
+        libvlc_exception_raise( p_e, "Input does not exist" );
+        return NULL;
+    }
+   
+    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 );
+
+    return;
+    
+}
+
+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 );
+
+    /* GetVout will raise the exception for us */
+    if( !p_vout )
+    {
+        return VLC_FALSE;
+    }
+
+    vlc_object_release( p_vout );
+    
+    return VLC_TRUE;
 }