X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia.c;h=940e420a1338c5a9105179e254a66f7b71955510;hb=4704ae3fc98d6bea83f3f4290d314cfabce16001;hp=566ce11b24b1a2aac6e4a45531946b00b78378c9;hpb=295904fac56671cda96aa1fa2d9f789ceb770728;p=vlc diff --git a/src/control/media.c b/src/control/media.c index 566ce11b24..940e420a13 100644 --- a/src/control/media.c +++ b/src/control/media.c @@ -25,6 +25,8 @@ # include "config.h" #endif +#include + #include #include #include // For the subitems, here for convenience @@ -245,14 +247,16 @@ libvlc_media_t * libvlc_media_new_from_input_item( if (!p_input_item) { - libvlc_exception_raise( p_e, "No input item given" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "No input item given" ); return NULL; } p_md = malloc( sizeof(libvlc_media_t) ); if( !p_md ) { - libvlc_exception_raise( p_e, "Not enough memory" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Not enough memory" ); return NULL; } @@ -302,7 +306,8 @@ libvlc_media_t * libvlc_media_new( if (!p_input_item) { - libvlc_exception_raise( p_e, "Can't create md's input_item" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Not enough memory" ); return NULL; } @@ -330,7 +335,8 @@ libvlc_media_t * libvlc_media_new_as_node( if (!p_input_item) { - libvlc_exception_raise( p_e, "Can't create md's input_item" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Not enough memory" ); return NULL; } @@ -352,28 +358,24 @@ libvlc_media_t * libvlc_media_new_as_node( **************************************************************************/ void libvlc_media_add_option( libvlc_media_t * p_md, - const char * ppsz_option, - libvlc_exception_t *p_e ) + const char * psz_option ) { - VLC_UNUSED(p_e); - input_item_AddOption( p_md->p_input_item, ppsz_option, + input_item_AddOption( p_md->p_input_item, psz_option, VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED ); } /************************************************************************** - * Same as libvlc_media_add_option but with untrusted source. + * Same as libvlc_media_add_option but with configurable flags. **************************************************************************/ -void libvlc_media_add_option_untrusted( +void libvlc_media_add_option_flag( libvlc_media_t * p_md, const char * ppsz_option, - libvlc_exception_t *p_e ) + libvlc_media_option_t i_flags ) { - VLC_UNUSED(p_e); input_item_AddOption( p_md->p_input_item, ppsz_option, - VLC_INPUT_OPTION_UNIQUE ); + i_flags ); } - /************************************************************************** * Delete a media descriptor object **************************************************************************/ @@ -411,9 +413,7 @@ void libvlc_media_release( libvlc_media_t *p_md ) **************************************************************************/ void libvlc_media_retain( libvlc_media_t *p_md ) { - if (!p_md) - return; - + assert (p_md); p_md->i_refcount++; } @@ -431,10 +431,9 @@ libvlc_media_duplicate( libvlc_media_t *p_md_orig ) * Get mrl from a media descriptor object **************************************************************************/ char * -libvlc_media_get_mrl( libvlc_media_t * p_md, - libvlc_exception_t * p_e ) +libvlc_media_get_mrl( libvlc_media_t * p_md ) { - VLC_UNUSED(p_e); + assert( p_md ); return input_item_GetURI( p_md->p_input_item ); } @@ -442,13 +441,11 @@ libvlc_media_get_mrl( libvlc_media_t * p_md, * Getter for meta information **************************************************************************/ -char * libvlc_media_get_meta( libvlc_media_t *p_md, - libvlc_meta_t e_meta, - libvlc_exception_t *p_e ) +char *libvlc_media_get_meta( libvlc_media_t *p_md, libvlc_meta_t e_meta ) { char * psz_meta; - VLC_UNUSED(p_e); + assert( p_md ); /* XXX: locking */ preparse_if_needed( p_md ); @@ -473,16 +470,33 @@ char * libvlc_media_get_meta( libvlc_media_t *p_md, return psz_meta; } +/************************************************************************** + * Setter for meta information + **************************************************************************/ + +void libvlc_media_set_meta( libvlc_media_t *p_md, libvlc_meta_t e_meta, const char *psz_value ) +{ + assert( p_md ); + input_item_SetMeta( p_md->p_input_item, libvlc_to_vlc_meta[e_meta], psz_value ); +} + +int libvlc_media_save_meta( libvlc_media_t *p_md ) +{ + assert( p_md ); + vlc_object_t *p_obj = VLC_OBJECT(libvlc_priv( + p_md->p_libvlc_instance->p_libvlc_int)->p_playlist); + return input_item_WriteMeta( p_obj, p_md->p_input_item ) == VLC_SUCCESS; +} + /************************************************************************** * Getter for state information * Can be error, playing, buffering, NothingSpecial. **************************************************************************/ libvlc_state_t -libvlc_media_get_state( libvlc_media_t *p_md, - libvlc_exception_t *p_e ) +libvlc_media_get_state( libvlc_media_t *p_md ) { - VLC_UNUSED(p_e); + assert( p_md ); return p_md->state; } @@ -492,11 +506,9 @@ libvlc_media_get_state( libvlc_media_t *p_md, void libvlc_media_set_state( libvlc_media_t *p_md, - libvlc_state_t state, - libvlc_exception_t *p_e ) + libvlc_state_t state ) { libvlc_event_t event; - VLC_UNUSED(p_e); p_md->state = state; @@ -512,60 +524,87 @@ libvlc_media_set_state( libvlc_media_t *p_md, * subitems **************************************************************************/ libvlc_media_list_t * -libvlc_media_subitems( libvlc_media_t * p_md, - libvlc_exception_t * p_e ) +libvlc_media_subitems( libvlc_media_t * p_md ) { - VLC_UNUSED(p_e); - if( p_md->p_subitems ) libvlc_media_list_retain( p_md->p_subitems ); return p_md->p_subitems; } +/************************************************************************** + * Getter for statistics information + **************************************************************************/ +int libvlc_media_get_stats( libvlc_media_t *p_md, + libvlc_media_stats_t *p_stats ) +{ + if( !p_md->p_input_item ) + return false; + + input_stats_t *p_itm_stats = p_md->p_input_item->p_stats; + vlc_mutex_lock( &p_itm_stats->lock ); + p_stats->i_read_bytes = p_itm_stats->i_read_bytes; + p_stats->f_input_bitrate = p_itm_stats->f_input_bitrate; + + p_stats->i_demux_read_bytes = p_itm_stats->i_demux_read_bytes; + p_stats->f_demux_bitrate = p_itm_stats->f_demux_bitrate; + p_stats->i_demux_corrupted = p_itm_stats->i_demux_corrupted; + p_stats->i_demux_discontinuity = p_itm_stats->i_demux_discontinuity; + + p_stats->i_decoded_video = p_itm_stats->i_decoded_video; + p_stats->i_decoded_audio = p_itm_stats->i_decoded_audio; + + p_stats->i_displayed_pictures = p_itm_stats->i_displayed_pictures; + p_stats->i_lost_pictures = p_itm_stats->i_lost_pictures; + + p_stats->i_played_abuffers = p_itm_stats->i_played_abuffers; + p_stats->i_lost_abuffers = p_itm_stats->i_lost_abuffers; + + p_stats->i_sent_packets = p_itm_stats->i_sent_packets; + p_stats->i_sent_bytes = p_itm_stats->i_sent_bytes; + p_stats->f_send_bitrate = p_itm_stats->f_send_bitrate; + vlc_mutex_unlock( &p_itm_stats->lock ); + return true; +} + /************************************************************************** * event_manager **************************************************************************/ libvlc_event_manager_t * -libvlc_media_event_manager( libvlc_media_t * p_md, - libvlc_exception_t * p_e ) +libvlc_media_event_manager( libvlc_media_t * p_md ) { - VLC_UNUSED(p_e); + assert( p_md ); return p_md->p_event_manager; } /************************************************************************** - * Get duration of media object. + * Get duration of media object (in ms) **************************************************************************/ int64_t -libvlc_media_get_duration( libvlc_media_t * p_md, - libvlc_exception_t * p_e ) +libvlc_media_get_duration( libvlc_media_t * p_md, libvlc_exception_t *p_e ) { - VLC_UNUSED(p_e); + assert( p_md ); - if( !p_md || !p_md->p_input_item) + if( !p_md->p_input_item ) { - libvlc_exception_raise( p_e, "No input item" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "No input item" ); return -1; } - return input_item_GetDuration( p_md->p_input_item ); + return input_item_GetDuration( p_md->p_input_item ) / 1000; } /************************************************************************** * Get preparsed status for media object. **************************************************************************/ int -libvlc_media_is_preparsed( libvlc_media_t * p_md, - libvlc_exception_t * p_e ) +libvlc_media_is_preparsed( libvlc_media_t * p_md ) { - VLC_UNUSED(p_e); + assert( p_md ); - if( !p_md || !p_md->p_input_item) - { - libvlc_exception_raise( p_e, "No input item" ); + if( !p_md->p_input_item ) return false; - } return input_item_IsPreparsed( p_md->p_input_item ); } @@ -576,16 +615,10 @@ libvlc_media_is_preparsed( libvlc_media_t * p_md, * an native object that references a libvlc_media_t pointer **************************************************************************/ void -libvlc_media_set_user_data( libvlc_media_t * p_md, - void * p_new_user_data, - libvlc_exception_t * p_e ) +libvlc_media_set_user_data( libvlc_media_t * p_md, void * p_new_user_data ) { - VLC_UNUSED(p_e); - - if( p_md ) - { - p_md->p_user_data = p_new_user_data; - } + assert( p_md ); + p_md->p_user_data = p_new_user_data; } /************************************************************************** @@ -594,17 +627,8 @@ libvlc_media_set_user_data( libvlc_media_t * p_md, * an native object that references a libvlc_media_t pointer **************************************************************************/ void * -libvlc_media_get_user_data( libvlc_media_t * p_md, - libvlc_exception_t * p_e ) +libvlc_media_get_user_data( libvlc_media_t * p_md ) { - VLC_UNUSED(p_e); - - if( p_md ) - { - return p_md->p_user_data; - } - else - { - return NULL; - } + assert( p_md ); + return p_md->p_user_data; }