# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_vout.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
#include <vlc_aout.h>
#include <vlc_sout.h>
#include "../libvlc.h"
sout_instance_t *p_sout;
vout_thread_t *p_vout_free;
- aout_instance_t *p_aout;
/* This lock is used to protect vout resources access (for hold)
* It is a special case because of embed video (possible deadlock
- * between vout window request and vout holds in some(qt4) interface) */
- vlc_mutex_t lock_vout;
+ * between vout window request and vout holds in some(qt4) interface)
+ */
+ vlc_mutex_t lock_hold;
+
+ /* You need lock+lock_hold to write to the following variables and
+ * only lock or lock_hold to read them */
+
int i_vout;
vout_thread_t **pp_vout;
+
+ aout_instance_t *p_aout;
};
/* */
}
static vout_thread_t *DetachVout( input_resource_t *p_resource )
{
+ vlc_assert_locked( &p_resource->lock );
assert( p_resource->i_vout == 0 );
vout_thread_t *p_vout = p_resource->p_vout_free;
p_resource->p_vout_free = NULL;
vout_thread_t *p_vout, video_format_t *p_fmt,
bool b_recycle )
{
+ vlc_assert_locked( &p_resource->lock );
+
if( !p_vout && !p_fmt )
{
if( p_resource->p_vout_free )
{
assert( p_vout != p_resource->p_vout_free );
- vlc_mutex_lock( &p_resource->lock_vout );
+ vlc_mutex_lock( &p_resource->lock_hold );
TAB_REMOVE( p_resource->i_vout, p_resource->pp_vout, p_vout );
- vlc_mutex_unlock( &p_resource->lock_vout );
+ vlc_mutex_unlock( &p_resource->lock_hold );
}
/* */
- p_vout = vout_Request( p_resource->p_input, p_vout, p_fmt );
+ vout_configuration_t cfg = {
+ .vout = p_vout,
+ .fmt = p_fmt,
+ };
+ p_vout = vout_Request( p_resource->p_input, &cfg );
if( !p_vout )
return NULL;
DisplayVoutTitle( p_resource, p_vout );
- vlc_mutex_lock( &p_resource->lock_vout );
+ vlc_mutex_lock( &p_resource->lock_hold );
TAB_APPEND( p_resource->i_vout, p_resource->pp_vout, p_vout );
- vlc_mutex_unlock( &p_resource->lock_vout );
+ vlc_mutex_unlock( &p_resource->lock_hold );
return p_vout;
}
{
assert( p_vout );
- vlc_mutex_lock( &p_resource->lock_vout );
+ vlc_mutex_lock( &p_resource->lock_hold );
TAB_REMOVE( p_resource->i_vout, p_resource->pp_vout, p_vout );
const int i_vout_active = p_resource->i_vout;
- vlc_mutex_unlock( &p_resource->lock_vout );
+ vlc_mutex_unlock( &p_resource->lock_hold );
if( p_resource->p_vout_free || i_vout_active > 0 || !b_recycle )
{
{
msg_Dbg( p_resource->p_input, "saving a free vout" );
vout_Flush( p_vout, 1 );
- spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, -1 );
+ vout_FlushSubpictureChannel( p_vout, -1 );
p_resource->p_vout_free = p_vout;
}
}
static vout_thread_t *HoldVout( input_resource_t *p_resource )
{
- if( p_resource->i_vout <= 0 )
- return NULL;
-
/* TODO FIXME: p_resource->pp_vout order is NOT stable */
- vlc_mutex_lock( &p_resource->lock_vout );
-
- vout_thread_t *p_vout = p_resource->pp_vout[0];
+ vlc_mutex_lock( &p_resource->lock_hold );
- vlc_object_hold( p_vout );
+ vout_thread_t *p_vout = p_resource->i_vout > 0 ? p_resource->pp_vout[0] : NULL;
+ if( p_vout )
+ vlc_object_hold( p_vout );
- vlc_mutex_unlock( &p_resource->lock_vout );
+ vlc_mutex_unlock( &p_resource->lock_hold );
return p_vout;
}
-static void HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout, int *pi_vout )
+
+static void HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout,
+ size_t *pi_vout )
{
vout_thread_t **pp_vout;
*pi_vout = 0;
*ppp_vout = NULL;
- vlc_mutex_lock( &p_resource->lock_vout );
+ vlc_mutex_lock( &p_resource->lock_hold );
if( p_resource->i_vout <= 0 )
goto exit;
- pp_vout = calloc( p_resource->i_vout, sizeof(*pp_vout) );
+ pp_vout = malloc( p_resource->i_vout * sizeof(*pp_vout) );
if( !pp_vout )
goto exit;
}
exit:
- vlc_mutex_unlock( &p_resource->lock_vout );
+ vlc_mutex_unlock( &p_resource->lock_hold );
}
/* */
}
static aout_instance_t *DetachAout( input_resource_t *p_resource )
{
+ vlc_assert_locked( &p_resource->lock );
+ vlc_mutex_lock( &p_resource->lock_hold );
+
aout_instance_t *p_aout = p_resource->p_aout;
p_resource->p_aout = NULL;
+ vlc_mutex_unlock( &p_resource->lock_hold );
+
return p_aout;
}
static aout_instance_t *RequestAout( input_resource_t *p_resource, aout_instance_t *p_aout )
{
+ vlc_assert_locked( &p_resource->lock );
assert( p_resource->p_input );
if( p_aout )
}
else
{
- if( !p_resource->p_aout )
+ p_aout = p_resource->p_aout;
+ if( !p_aout )
{
msg_Dbg( p_resource->p_input, "creating aout" );
- p_resource->p_aout = aout_New( p_resource->p_input );
+ p_aout = aout_New( p_resource->p_input );
+
+ vlc_mutex_lock( &p_resource->lock_hold );
+ p_resource->p_aout = p_aout;
+ vlc_mutex_unlock( &p_resource->lock_hold );
}
else
{
msg_Dbg( p_resource->p_input, "reusing aout" );
}
- if( !p_resource->p_aout )
+ if( !p_aout )
return NULL;
- vlc_object_detach( p_resource->p_aout );
- vlc_object_attach( p_resource->p_aout, p_resource->p_input );
- vlc_object_hold( p_resource->p_aout );
- return p_resource->p_aout;
+ vlc_object_detach( p_aout );
+ vlc_object_attach( p_aout, p_resource->p_input );
+ vlc_object_hold( p_aout );
+ return p_aout;
}
}
static aout_instance_t *HoldAout( input_resource_t *p_resource )
{
- if( !p_resource->p_aout )
- return NULL;
+ vlc_mutex_lock( &p_resource->lock_hold );
aout_instance_t *p_aout = p_resource->p_aout;
+ if( p_aout )
+ vlc_object_hold( p_aout );
- vlc_object_hold( p_aout );
+ vlc_mutex_unlock( &p_resource->lock_hold );
return p_aout;
}
return NULL;
vlc_mutex_init( &p_resource->lock );
- vlc_mutex_init( &p_resource->lock_vout );
+ vlc_mutex_init( &p_resource->lock_hold );
return p_resource;
}
DestroyVout( p_resource );
DestroyAout( p_resource );
- vlc_mutex_destroy( &p_resource->lock_vout );
+ vlc_mutex_destroy( &p_resource->lock_hold );
vlc_mutex_destroy( &p_resource->lock );
free( p_resource );
}
{
return HoldVout( p_resource );
}
-void input_resource_HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout, int *pi_vout )
+
+void input_resource_HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout,
+ size_t *pi_vout )
{
HoldVouts( p_resource, ppp_vout, pi_vout );
}
+
void input_resource_TerminateVout( input_resource_t *p_resource )
{
input_resource_RequestVout( p_resource, NULL, NULL, false );
}
aout_instance_t *input_resource_HoldAout( input_resource_t *p_resource )
{
- vlc_mutex_lock( &p_resource->lock );
- aout_instance_t *p_ret = HoldAout( p_resource );
- vlc_mutex_unlock( &p_resource->lock );
-
- return p_ret;
+ return HoldAout( p_resource );
}
/* */
sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, sout_instance_t *p_sout, const char *psz_sout )