/* Display media title in OSD */
static void DisplayTitleOnOSD( vout_thread_t *p_vout );
-/* */
-static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture );
-
/*****************************************************************************
* Video Filter2 functions
*****************************************************************************/
{
vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner;
- DropPicture( p_vout, p_pic );
+ vlc_mutex_lock( &p_vout->picture_lock );
+ vout_UsePictureLocked( p_vout, p_pic );
+ vlc_mutex_unlock( &p_vout->picture_lock );
}
static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data )
p_vout->p->p_picture_displayed = NULL;
/* Initialize locks */
- vlc_mutex_init_recursive( &p_vout->picture_lock );
+ vlc_mutex_init( &p_vout->picture_lock );
+ vlc_cond_init( &p_vout->p->picture_wait );
vlc_mutex_init( &p_vout->change_lock );
vlc_mutex_init( &p_vout->p->vfilter_lock );
spu_Destroy( p_vout->p_spu );
/* Destroy the locks */
+ vlc_cond_destroy( &p_vout->p->picture_wait );
vlc_mutex_destroy( &p_vout->picture_lock );
vlc_mutex_destroy( &p_vout->change_lock );
vlc_mutex_destroy( &p_vout->p->vfilter_lock );
{
const mtime_t i_duration = i_date - p_vout->p->i_pause_date;
+ vlc_mutex_lock( &p_vout->picture_lock );
for( int i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
{
picture_t *p_pic = PP_RENDERPICTURE[i_index];
if( p_pic->i_status == READY_PICTURE )
p_pic->date += i_duration;
}
+ vlc_cond_signal( &p_vout->p->picture_wait );
+ vlc_mutex_unlock( &p_vout->picture_lock );
+
spu_OffsetSubtitleDate( p_vout->p_spu, i_duration );
}
p_vout->p->b_paused = b_paused;
p_pic->date = i_date;
}
}
+ vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->picture_lock );
}
void vout_FixLeaks( vout_thread_t *p_vout, bool b_forced )
for( i_pic = 0; i_pic < p_vout->render.i_pictures; i_pic++ )
{
picture_t *p_pic = p_vout->render.pp_picture[i_pic];
-
- if( p_pic->i_status == RESERVED_PICTURE )
- vout_DestroyPicture( p_vout, p_pic );
- if( p_pic->i_refcount > 0 )
- vout_UnlinkPicture( p_vout, p_pic );
+ p_pic->i_refcount = 0;
+ vout_UsePictureLocked( p_vout, p_pic );
}
+ vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->picture_lock );
}
picture_t *p_last = p_vout->p->p_picture_displayed;;
p_picture = NULL;
- display_date = 0;
for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
{
picture_t *p_pic = PP_RENDERPICTURE[i_index];
if( p_last && p_pic != p_last && p_pic->date <= p_last->date )
{
/* Drop old picture */
- DropPicture( p_vout, p_pic );
+ vout_UsePictureLocked( p_vout, p_pic );
+ }
+ else if( !p_vout->p->b_paused && !p_pic->b_force && p_pic != p_last &&
+ p_pic->date < current_date + p_vout->p->render_time &&
+ b_drop_late )
+ {
+ /* Picture is late: it will be destroyed and the thread
+ * will directly choose the next picture */
+ vout_UsePictureLocked( p_vout, p_pic );
+ p_vout->p->i_picture_lost++;
+
+ msg_Warn( p_vout, "late picture skipped (%"PRId64")",
+ current_date - p_pic->date );
}
else if( ( !p_last || p_last->date < p_pic->date ) &&
( p_picture == NULL || p_pic->date < p_picture->date ) )
if( !p_picture )
p_picture = p_last;
+ display_date = 0;
if( p_picture )
{
display_date = p_picture->date;
/* If we found better than the last picture, destroy it */
if( p_last && p_picture != p_last )
{
- DropPicture( p_vout, p_last );
+ vout_UsePictureLocked( p_vout, p_last );
p_vout->p->p_picture_displayed = p_last = NULL;
}
/* Compute FPS rate */
p_vout->p->p_fps_sample[ p_vout->p->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date;
- if( !p_picture->b_force && p_picture != p_last &&
- display_date < current_date + p_vout->p->render_time &&
- b_drop_late )
- {
- /* Picture is late: it will be destroyed and the thread
- * will directly choose the next picture */
- DropPicture( p_vout, p_picture );
- p_vout->p->i_picture_lost++;
- msg_Warn( p_vout, "late picture skipped (%"PRId64")",
- current_date - display_date );
- vlc_mutex_unlock( &p_vout->picture_lock );
- continue;
- }
-
if( display_date > current_date + VOUT_DISPLAY_DELAY )
{
/* A picture is ready to be rendered, but its rendering date
display_date = current_date + p_vout->p->render_time;
}
}
-
if( p_picture )
p_vout->p->p_picture_displayed = p_picture;
}
/* Sleep a while or until a given date */
if( display_date != 0 )
{
- /* If there are filters in the chain, better give them the picture
+ /* If there are *vout* filters in the chain, better give them the picture
* in advance */
if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain )
{
}
else
{
- msleep( VOUT_IDLE_SLEEP );
+ /* Wait until a frame is being sent or a supurious wakeup (not a problem here) */
+ vlc_mutex_lock( &p_vout->picture_lock );
+ vlc_cond_timedwait( &p_vout->p->picture_wait, &p_vout->picture_lock, current_date + VOUT_IDLE_SLEEP );
+ vlc_mutex_unlock( &p_vout->picture_lock );
}
/* On awakening, take back lock and send immediately picture
/* Drop the filtered picture if created by video filters */
if( p_filtered_picture != NULL && p_filtered_picture != p_picture )
- DropPicture( p_vout, p_filtered_picture );
+ {
+ vlc_mutex_lock( &p_vout->picture_lock );
+ vout_UsePictureLocked( p_vout, p_filtered_picture );
+ vlc_mutex_unlock( &p_vout->picture_lock );
+ }
if( p_picture != NULL )
{
p_vout->p->p_picture_displayed = NULL;
for( i = 0; i < I_OUTPUTPICTURES; i++ )
p_vout->p_picture[ i ].i_status = FREE_PICTURE;
+ vlc_cond_signal( &p_vout->p->picture_wait );
I_OUTPUTPICTURES = 0;
if( p_vout->b_error )
msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed\n" );
+ vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->picture_lock );
if( p_vout->b_error )
p_vout->p->p_chroma = NULL;
}
-static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture )
-{
- vlc_mutex_lock( &p_vout->picture_lock );
- if( p_picture->i_refcount )
- {
- /* Pretend we displayed the picture, but don't destroy
- * it since the decoder might still need it. */
- p_picture->i_status = DISPLAYED_PICTURE;
- }
- else
- {
- /* Destroy the picture without displaying it */
- p_picture->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
- picture_CleanupQuant( p_picture );
- }
- vlc_mutex_unlock( &p_vout->picture_lock );
-}
-
-
-
/* following functions are local */
-
static int ReduceHeight( int i_ratio )
{
int i_dummy = VOUT_ASPECT_FACTOR;
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <assert.h>
#include <vlc_common.h>
+#include <libvlc.h>
#include <vlc_vout.h>
#include <vlc_osd.h>
#include <vlc_filter.h>
#include "vout_pictures.h"
#include "vout_internal.h"
-#include <assert.h>
-
/**
* Display a picture
*
if( p_pic->i_status == RESERVED_PICTURE )
{
p_pic->i_status = READY_PICTURE;
+ vlc_cond_signal( &p_vout->p->picture_wait );
}
else
{
return( NULL );
}
+/* */
+static void DestroyPicture( vout_thread_t *p_vout, picture_t *p_picture )
+{
+ vlc_assert_locked( &p_vout->picture_lock );
+
+ p_picture->i_status = DESTROYED_PICTURE;
+ p_vout->i_heap_size--;
+ picture_CleanupQuant( p_picture );
+
+ vlc_cond_signal( &p_vout->p->picture_wait );
+}
+
/**
* Remove a permanent or reserved picture from the heap
*
* This function frees a previously reserved picture or a permanent
* picture. It is meant to be used when the construction of a picture aborted.
* Note that the picture will be destroyed even if it is linked !
+ *
+ * TODO remove it, vout_DropPicture should be used instead
*/
void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
- vlc_mutex_lock( &p_vout->picture_lock );
-
#ifndef NDEBUG
/* Check if picture status is valid */
+ vlc_mutex_lock( &p_vout->picture_lock );
if( p_pic->i_status != RESERVED_PICTURE )
{
msg_Err( p_vout, "picture to destroy %p has invalid status %d",
p_pic, p_pic->i_status );
}
+ vlc_mutex_unlock( &p_vout->picture_lock );
#endif
- p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
- picture_CleanupQuant( p_pic );
+ vout_DropPicture( p_vout, p_pic );
+}
- vlc_mutex_unlock( &p_vout->picture_lock );
+/* */
+void vout_UsePictureLocked( vout_thread_t *p_vout, picture_t *p_picture )
+{
+ vlc_assert_locked( &p_vout->picture_lock );
+ if( p_picture->i_refcount > 0 )
+ {
+ /* Pretend we displayed the picture, but don't destroy
+ * it since the decoder might still need it. */
+ p_picture->i_status = DISPLAYED_PICTURE;
+ }
+ else
+ {
+ /* Destroy the picture without displaying it */
+ DestroyPicture( p_vout, p_picture );
+ }
}
/* */
{
/* Grr cannot destroy ready picture by myself so be sure vout won't like it */
p_pic->date = 1;
- }
- else if( p_pic->i_refcount > 0 )
- {
- p_pic->i_status = DISPLAYED_PICTURE;
+ vlc_cond_signal( &p_vout->p->picture_wait );
}
else
{
- p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
- picture_CleanupQuant( p_pic );
+ vout_UsePictureLocked( p_vout, p_pic );
}
vlc_mutex_unlock( &p_vout->picture_lock );
void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->picture_lock );
- p_pic->i_refcount--;
- if( ( p_pic->i_refcount == 0 ) &&
- ( p_pic->i_status == DISPLAYED_PICTURE ) )
- {
- p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
- picture_CleanupQuant( p_pic );
- }
+ if( p_pic->i_refcount > 0 )
+ p_pic->i_refcount--;
+ else
+ msg_Err( p_vout, "Invalid picture reference count (%p, %d)",
+ p_pic, p_pic->i_refcount );
+
+ if( p_pic->i_refcount == 0 && p_pic->i_status == DISPLAYED_PICTURE )
+ DestroyPicture( p_vout, p_pic );
vlc_mutex_unlock( &p_vout->picture_lock );
}