Merge commit 'origin/1.0-bugfix'

[vlc] / src / control / mediacontrol_audio_video.c

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index f783f516594807b4530ced60bae16ae95ec6f3ec..cb28ccfacbe8fae680e1282d0cae041ce7e3b37b 100644 (file)
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -26,12 +26,15 @@
 #endif
 #include "mediacontrol_internal.h"
 #include "libvlc_internal.h"
+#include "media_player_internal.h"
 
 #include <vlc/mediacontrol.h>
 #include <vlc/libvlc.h>
 
 #include <vlc_vout.h>
+#include <vlc_input.h>
 #include <vlc_osd.h>
+#include <vlc_block.h>
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
@@ -56,12 +59,9 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
                        mediacontrol_Exception *exception )
 {
     (void)a_position;
-    vlc_object_t* p_cache;
     vout_thread_t* p_vout;
     input_thread_t *p_input;
-    mediacontrol_RGBPicture *p_pic = NULL;
-    char path[256];
-    snapshot_t *p_snapshot;
+    mediacontrol_RGBPicture *p_pic;
     libvlc_exception_t ex;
 
     libvlc_exception_init( &ex );
@@ -73,52 +73,42 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
         RAISE_NULL( mediacontrol_InternalException, "No input" );
     }
 
-    p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+    p_vout = input_GetVout( p_input );
     vlc_object_release( p_input );
     if( ! p_vout )
     {
         RAISE_NULL( mediacontrol_InternalException, "No video output" );
     }
-    p_cache = vlc_object_create( p_input, sizeof( vlc_object_t ) );
-    if( p_cache == NULL )
-    {
-        vlc_object_release( p_vout );
-        vlc_object_release( p_input );
-        RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
-    }
-    snprintf( path, 255, "object:%p", p_cache );
-    var_SetString( p_vout, "snapshot-path", path );
-    var_SetString( p_vout, "snapshot-format", "png" );
 
-    vlc_object_lock( p_cache );
-    vout_Control( p_vout, VOUT_SNAPSHOT );
-    vlc_object_wait( p_cache );
-    vlc_object_release( p_vout );
+    block_t *p_image;
+    video_format_t fmt;
 
-    p_snapshot = ( snapshot_t* ) p_cache->p_private;
-    vlc_object_unlock( p_cache );
-    vlc_object_release( p_cache );
+    if( vout_GetSnapshot( p_vout, &p_image, NULL, &fmt, "png", 500*1000 ) )
+    {
+        RAISE_NULL( mediacontrol_InternalException, "Snapshot exception" );
+        return NULL;
+    }
 
-    if( p_snapshot )
+    /* */
+    char *p_data = malloc( p_image->i_buffer );
+    if( p_data )
     {
-        /* Note: p_snapshot->p_data is directly used, not copied. Thus
-           do not free it here. */
-        p_pic = private_mediacontrol_createRGBPicture( p_snapshot->i_width,
-                                                       p_snapshot->i_height,
-                                                       VLC_FOURCC( 'p','n','g',' ' ),
-                                                       p_snapshot->date,
-                                                       p_snapshot->p_data,
-                                                       p_snapshot->i_datasize );
-        if( !p_pic )
-        {
-            free( p_snapshot );
-            RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
-        }
+        memcpy( p_data, p_image->p_buffer, p_image->i_buffer );
+        p_pic = private_mediacontrol_createRGBPicture( fmt.i_width,
+                                                       fmt.i_height,
+                                                       fmt.i_chroma,
+                                                       p_image->i_pts,
+                                                       p_data,
+                                                       p_image->i_buffer );
     }
     else
     {
-        RAISE_NULL( mediacontrol_InternalException, "Snapshot exception" );
+        p_pic = NULL;
     }
+    block_Release( p_image );
+
+    if( !p_pic )
+        RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
     return p_pic;
 }
 
@@ -159,7 +149,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
     {
         RAISE_VOID( mediacontrol_InternalException, "No input" );
     }
-    p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+    p_vout = input_GetVout( p_input );
     if( ! p_vout )
     {
         RAISE_VOID( mediacontrol_InternalException, "No video output" );