X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_instance.c;h=e4d999440e4802ebf18fdf85a0cb359e824b607a;hb=51f996148378323ef3c7d08554c2211de47d2d25;hp=9034de8cace32a6ebf036b0c451629c7e8e4cc89;hpb=cbbe174a03104b9d0ad1429a34a0ade1b3a1c92f;p=vlc diff --git a/src/control/media_instance.c b/src/control/media_instance.c index 9034de8cac..e4d999440e 100644 --- a/src/control/media_instance.c +++ b/src/control/media_instance.c @@ -21,21 +21,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "libvlc_internal.h" #include #include #include -#include "input/input_internal.h" +#include "libvlc_internal.h" +#include "libvlc.h" /* * Release the associated input thread * * Object lock is NOT held. */ -static void release_input_thread( libvlc_media_instance_t *p_mi ) +static void release_input_thread( libvlc_media_instance_t *p_mi ) { input_thread_t *p_input_thread; - vlc_bool_t should_destroy; if( !p_mi || p_mi->i_input_id == -1 ) return; @@ -48,23 +47,26 @@ static void release_input_thread( libvlc_media_instance_t *p_mi ) if( !p_input_thread ) return; - + /* release for previous vlc_object_get */ vlc_object_release( p_input_thread ); - should_destroy = p_input_thread->i_refcount == 1; - /* release for initial p_input_thread yield (see _new()) */ vlc_object_release( p_input_thread ); /* No one is tracking this input_thread appart us. Destroy it */ - if( should_destroy ) + if( p_mi->b_own_its_input_thread ) + { + /* We owned this one */ + input_StopThread( p_input_thread ); + var_Destroy( p_input_thread, "drawable" ); input_DestroyThread( p_input_thread ); + } else { /* XXX: hack the playlist doesn't retain the input thread, * so we did it for the playlist (see _new_from_input_thread), - * revert that here. */ + * revert that here. This will be deleted with the playlist API */ vlc_object_release( p_input_thread ); } } @@ -76,7 +78,7 @@ static void release_input_thread( libvlc_media_instance_t *p_mi ) * Object lock is held. */ input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi, - libvlc_exception_t *p_e ) + libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; @@ -120,6 +122,12 @@ input_state_changed( vlc_object_t * p_this, char const * psz_cmd, case END_S: event.type = libvlc_MediaInstanceReachedEnd; break; + case PAUSE_S: + event.type = libvlc_MediaInstancePaused; + break; + case PLAYING_S: + event.type = libvlc_MediaInstancePlayed; + break; default: return VLC_SUCCESS; } @@ -128,6 +136,40 @@ input_state_changed( vlc_object_t * p_this, char const * psz_cmd, return VLC_SUCCESS; } +/* + * input_position_changed (Private) (input var "intf-change" Callback) + */ +static int +input_position_changed( vlc_object_t * p_this, char const * psz_cmd, + vlc_value_t oldval, vlc_value_t newval, + void * p_userdata ) +{ + libvlc_media_instance_t * p_mi = p_userdata; + vlc_value_t val; + + if (!strcmp(psz_cmd, "intf" /* "-change" no need to go further */)) + { + input_thread_t * p_input = (input_thread_t *)p_this; + var_Get( p_input, "position", &val ); + + if ((val.i_time % I64C(500000)) != 0) + return VLC_SUCCESS; /* No need to have a better precision */ + var_Get( p_input, "state", &val ); + + if( val.i_int != PLAYING_S ) + return VLC_SUCCESS; /* Don't send the position while stopped */ + } + else + val.i_time = newval.i_time; + + libvlc_event_t event; + event.type = libvlc_MediaInstancePositionChanged; + event.u.media_instance_position_changed.new_position = val.i_time; + + libvlc_event_send( p_mi->p_event_manager, &event ); + return VLC_SUCCESS; +} + /************************************************************************** * Create a Media Instance object **************************************************************************/ @@ -145,6 +187,7 @@ libvlc_media_instance_new( libvlc_instance_t * p_libvlc_instance, p_mi = malloc( sizeof(libvlc_media_instance_t) ); p_mi->p_md = NULL; + p_mi->drawable = 0; p_mi->p_libvlc_instance = p_libvlc_instance; p_mi->i_input_id = -1; /* refcount strategy: @@ -153,6 +196,7 @@ libvlc_media_instance_new( libvlc_instance_t * p_libvlc_instance, * operation the refcount is 0, the object is destroyed. * - Accessor _retain increase the refcount by 1 (XXX: to implement) */ p_mi->i_refcount = 1; + p_mi->b_own_its_input_thread = VLC_TRUE; /* object_lock strategy: * - No lock held in constructor * - Lock when accessing all variable this lock is held @@ -169,6 +213,12 @@ libvlc_media_instance_new( libvlc_instance_t * p_libvlc_instance, libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaInstanceReachedEnd, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaInstancePaused, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaInstancePlayed, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaInstancePositionChanged, p_e ); return p_mi; } @@ -187,7 +237,8 @@ libvlc_media_instance_new_from_media_descriptor( if( !p_mi ) return NULL; - p_mi->p_md = libvlc_media_descriptor_duplicate( p_md ); + libvlc_media_descriptor_retain( p_md ); + p_mi->p_md = p_md; return p_mi; } @@ -215,7 +266,7 @@ libvlc_media_instance_t * libvlc_media_instance_new_from_input_thread( p_mi->p_md = libvlc_media_descriptor_new_from_input_item( p_libvlc_instance, - p_input->p->input.p_item, p_e ); + input_GetItem( p_input ), p_e ); if( !p_mi->p_md ) { @@ -224,7 +275,8 @@ libvlc_media_instance_t * libvlc_media_instance_new_from_input_thread( } p_mi->i_input_id = p_input->i_object_id; - + p_mi->b_own_its_input_thread = VLC_FALSE; + /* will be released in media_instance_release() */ vlc_object_yield( p_input ); @@ -258,10 +310,11 @@ void libvlc_media_instance_destroy( libvlc_media_instance_t *p_mi ) free( p_mi ); return; /* no need to worry about no input thread */ } + vlc_mutex_destroy( &p_mi->object_lock ); input_DestroyThread( p_input_thread ); - libvlc_media_descriptor_destroy( p_mi->p_md ); + libvlc_media_descriptor_release( p_mi->p_md ); free( p_mi ); } @@ -275,27 +328,37 @@ void libvlc_media_instance_release( libvlc_media_instance_t *p_mi ) return; vlc_mutex_lock( &p_mi->object_lock ); - + p_mi->i_refcount--; - /* We hold the mutex, as a waiter to make sure pending operations - * are finished. We can't hold it longer as the get_input_thread - * function holds a lock. */ - - vlc_mutex_unlock( &p_mi->object_lock ); - if( p_mi->i_refcount > 0 ) + { + vlc_mutex_unlock( &p_mi->object_lock ); return; + } + vlc_mutex_unlock( &p_mi->object_lock ); + vlc_mutex_destroy( &p_mi->object_lock ); - libvlc_event_manager_release( p_mi->p_event_manager ); - release_input_thread( p_mi ); - libvlc_media_descriptor_destroy( p_mi->p_md ); + libvlc_event_manager_release( p_mi->p_event_manager ); + + libvlc_media_descriptor_release( p_mi->p_md ); free( p_mi ); } +/************************************************************************** + * Retain a Media Instance object + **************************************************************************/ +void libvlc_media_instance_retain( libvlc_media_instance_t *p_mi ) +{ + if( !p_mi ) + return; + + p_mi->i_refcount++; +} + /************************************************************************** * Set the Media descriptor associated with the instance **************************************************************************/ @@ -310,10 +373,10 @@ void libvlc_media_instance_set_media_descriptor( return; vlc_mutex_lock( &p_mi->object_lock ); - + release_input_thread( p_mi ); - libvlc_media_descriptor_destroy( p_mi->p_md ); + libvlc_media_descriptor_release( p_mi->p_md ); if( !p_md ) { @@ -322,8 +385,9 @@ void libvlc_media_instance_set_media_descriptor( return; /* It is ok to pass a NULL md */ } - p_mi->p_md = libvlc_media_descriptor_duplicate( p_md ); - + libvlc_media_descriptor_retain( p_md ); + p_mi->p_md = p_md; + /* The policy here is to ignore that we were created using a different * libvlc_instance, because we don't really care */ p_mi->p_libvlc_instance = p_md->p_libvlc_instance; @@ -344,7 +408,8 @@ libvlc_media_instance_get_media_descriptor( if( !p_mi->p_md ) return NULL; - return libvlc_media_descriptor_duplicate( p_mi->p_md ); + libvlc_media_descriptor_retain( p_mi->p_md ); + return p_mi->p_md; } /************************************************************************** @@ -357,9 +422,6 @@ libvlc_media_instance_event_manager( { (void)p_e; - if( !p_mi->p_md ) - return NULL; - return p_mi->p_event_manager; } @@ -371,19 +433,19 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, { input_thread_t * p_input_thread; - if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) ) + if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) ) { - /* A thread alread exists, send it a play message */ - vlc_value_t val; - val.i_int = PLAYING_S; - - input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, PLAYING_S ); + /* A thread alread exists, send it a play message */ + input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S ); vlc_object_release( p_input_thread ); return; } + /* Ignore previous exception */ + libvlc_exception_clear( p_e ); + vlc_mutex_lock( &p_mi->object_lock ); - + if( !p_mi->p_md ) { libvlc_exception_raise( p_e, "no associated media descriptor" ); @@ -395,7 +457,15 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, p_mi->p_md->p_input_item ); p_mi->i_input_id = p_input_thread->i_object_id; + if( p_mi->drawable ) + { + vlc_value_t val; + val.i_int = p_mi->drawable; + var_Create( p_input_thread, "drawable", VLC_VAR_DOINHERIT ); + var_Set( p_input_thread, "drawable", val ); + } var_AddCallback( p_input_thread, "state", input_state_changed, p_mi ); + var_AddCallback( p_input_thread, "intf-change", input_position_changed, p_mi ); /* will be released in media_instance_release() */ vlc_object_yield( p_input_thread ); @@ -409,19 +479,34 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, void libvlc_media_instance_pause( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { - input_thread_t * p_input_thread; - vlc_value_t val; - val.i_int = PAUSE_S; - - p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e ); if( !p_input_thread ) return; - input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, val ); + input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); vlc_object_release( p_input_thread ); } +/************************************************************************** + * Stop + **************************************************************************/ +void libvlc_media_instance_stop( libvlc_media_instance_t *p_mi, + libvlc_exception_t *p_e ) +{ + //libvlc_exception_raise( p_e, "Not implemented" ); +} + +/************************************************************************** + * Set Drawable + **************************************************************************/ +void libvlc_media_instance_set_drawable( libvlc_media_instance_t *p_mi, + libvlc_drawable_t drawable, + libvlc_exception_t *p_e ) +{ + p_mi->drawable = drawable; +} + /************************************************************************** * Getters for stream information **************************************************************************/ @@ -478,7 +563,7 @@ void libvlc_media_instance_set_time( void libvlc_media_instance_set_position( libvlc_media_instance_t *p_mi, float position, - libvlc_exception_t *p_e ) + libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; vlc_value_t val; @@ -511,39 +596,30 @@ float libvlc_media_instance_get_position( float libvlc_media_instance_get_fps( libvlc_media_instance_t *p_mi, - libvlc_exception_t *p_e) + libvlc_exception_t *p_e) { + input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); double f_fps = 0.0; - input_thread_t *p_input_thread; - p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); - if( !p_input_thread ) - return 0.0; - - if( (NULL == p_input_thread->p->input.p_demux) - || demux2_Control( p_input_thread->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) - || f_fps < 0.1 ) + if( p_input_thread ) { + if( input_Control( p_input_thread, INPUT_GET_VIDEO_FPS, &f_fps ) ) + f_fps = 0.0; vlc_object_release( p_input_thread ); - return 0.0; - } - else - { - vlc_object_release( p_input_thread ); - return( f_fps ); } + return f_fps; } vlc_bool_t libvlc_media_instance_will_play( libvlc_media_instance_t *p_mi, - libvlc_exception_t *p_e) + libvlc_exception_t *p_e) { input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if ( !p_input_thread ) return VLC_FALSE; - if ( !p_input_thread->b_die && !p_input_thread->b_dead ) + if ( !p_input_thread->b_die && !p_input_thread->b_dead ) { vlc_object_release( p_input_thread ); return VLC_TRUE; @@ -555,7 +631,7 @@ vlc_bool_t libvlc_media_instance_will_play( void libvlc_media_instance_set_rate( libvlc_media_instance_t *p_mi, float rate, - libvlc_exception_t *p_e ) + libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; vlc_value_t val; @@ -590,7 +666,18 @@ float libvlc_media_instance_get_rate( return (float)1000.0f/val.i_int; } -int libvlc_media_instance_get_state( +static libvlc_state_t vlc_to_libvlc_state[] = +{ + [INIT_S] = libvlc_Opening, + [OPENING_S] = libvlc_Opening, + [BUFFERING_S] = libvlc_Buffering, + [PLAYING_S] = libvlc_Playing, + [PAUSE_S] = libvlc_Paused, + [END_S] = libvlc_Ended, + [ERROR_S] = libvlc_Error, +}; + +libvlc_state_t libvlc_media_instance_get_state( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e ) { @@ -599,11 +686,13 @@ int libvlc_media_instance_get_state( p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); if ( !p_input_thread ) - return 0; + return libvlc_Stopped; var_Get( p_input_thread, "state", &val ); vlc_object_release( p_input_thread ); - return val.i_int; -} + if( val.i_int < 0 || val.i_int > 6 ) + return libvlc_Stopped; + return vlc_to_libvlc_state[val.i_int]; +}