WinCE: fix vlc_GetCPUCount()

[vlc] / src / video_output / vout_pictures.c

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 8bac6e495a5b5bc3b5a78c7fa67019fcde06ad7e..3519caa70d3924202a54c1ee867a6429f8628e18 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -45,90 +45,72 @@
 #include "vout_internal.h"
 
 /**
- * Display a picture
+ * It retreives a picture from the vout or NULL if no pictures are
+ * available yet.
  *
- * Remove the reservation flag of a picture, which will cause it to be ready
- * for display.
- */
-void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
-{
-    vlc_mutex_lock( &p_vout->p->picture_lock );
-
-    p_pic->p_next = NULL;
-    picture_fifo_Push(p_vout->p->decoder_fifo, p_pic);
-
-    vlc_cond_signal( &p_vout->p->picture_wait );
-    vlc_mutex_unlock( &p_vout->p->picture_lock );
-}
-
-/**
- * Allocate a picture in the video output heap.
+ * You MUST call vout_PutPicture or vout_ReleasePicture on it.
  *
- * This function creates a reserved image in the video output heap.
- * A null pointer is returned if the function fails. This method provides an
- * already allocated zone of memory in the picture data fields.
- * It needs locking since several pictures can be created by several producers
- * threads.
+ * You may use vout_HoldPicture(paired with vout_ReleasePicture) to keep a
+ * read-only reference.
  */
-picture_t *vout_CreatePicture( vout_thread_t *p_vout,
-                               bool b_progressive,
-                               bool b_top_field_first,
-                               unsigned int i_nb_fields )
+picture_t *vout_GetPicture( vout_thread_t *p_vout )
 {
-#warning "TODO remove unused vout_CreatePicture parameters"
     /* Get lock */
     vlc_mutex_lock( &p_vout->p->picture_lock );
     picture_t *p_pic = picture_pool_Get(p_vout->p->decoder_pool);
     if (p_pic) {
         picture_Reset(p_pic);
-        p_pic->p_next = NULL; // FIXME put it in picture_Reset ?
+        p_pic->p_next = NULL;
     }
     vlc_mutex_unlock( &p_vout->p->picture_lock );
 
     return p_pic;
 }
 
-/* */
-void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic  )
+/**
+ * It gives to the vout a picture to be displayed.
+ *
+ * The given picture MUST comes from vout_GetPicture.
+ *
+ * Becareful, after vout_PutPicture is called, picture_t::p_next cannot be
+ * read/used.
+ */
+void vout_PutPicture( vout_thread_t *p_vout, picture_t *p_pic )
 {
     vlc_mutex_lock( &p_vout->p->picture_lock );
 
-    picture_Release( p_pic );
+    p_pic->p_next = NULL;
+    picture_fifo_Push(p_vout->p->decoder_fifo, p_pic);
 
-    vlc_cond_signal( &p_vout->p->picture_wait );
     vlc_mutex_unlock( &p_vout->p->picture_lock );
-}
 
-void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
-{
-    vout_DropPicture( p_vout, p_pic );
+    vout_control_Wake( &p_vout->p->control);
 }
 
-
 /**
- * Increment reference counter of a picture
- *
- * This function increments the reference counter of a picture in the video
- * heap. It needs a lock since several producer threads can access the picture.
+ * It releases a picture retreived by vout_GetPicture.
  */
-void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
+void vout_ReleasePicture( vout_thread_t *p_vout, picture_t *p_pic  )
 {
     vlc_mutex_lock( &p_vout->p->picture_lock );
-    picture_Hold( p_pic );
+
+    picture_Release( p_pic );
+
     vlc_mutex_unlock( &p_vout->p->picture_lock );
+
+    vout_control_Wake( &p_vout->p->control);
 }
 
 /**
- * Decrement reference counter of a picture
- *
- * This function decrement the reference counter of a picture in the video heap
+ * It increment the reference counter of a picture retreived by
+ * vout_GetPicture.
  */
-void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
+void vout_HoldPicture( vout_thread_t *p_vout, picture_t *p_pic )
 {
     vlc_mutex_lock( &p_vout->p->picture_lock );
-    picture_Release( p_pic );
 
-    vlc_cond_signal( &p_vout->p->picture_wait );
+    picture_Hold( p_pic );
+
     vlc_mutex_unlock( &p_vout->p->picture_lock );
 }
 
@@ -164,15 +146,15 @@ static int vout_AllocatePicture( picture_t *p_pic,
         i_bytes += p->i_pitch * p->i_lines;
     }
 
-    p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
-    if( p_pic->p_data == NULL )
+    uint8_t *p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
+    if( !p_data )
     {
         p_pic->i_planes = 0;
         return VLC_EGENERIC;
     }
 
     /* Fill the p_pixels field for each plane */
-    p_pic->p[0].p_pixels = p_pic->p_data;
+    p_pic->p[0].p_pixels = p_data;
     for( int i = 1; i < p_pic->i_planes; i++ )
     {
         p_pic->p[i].p_pixels = &p_pic->p[i-1].p_pixels[ p_pic->p[i-1].i_lines *
@@ -393,7 +375,6 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r
     p_picture->format = fmt;
     p_picture->i_refcount = 1;
     p_picture->pf_release = PictureReleaseCallback;
-    p_picture->i_status = RESERVED_PICTURE;
 
     return p_picture;
 }