* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "libvlc_internal.h"
-#include "libvlc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+
#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_list.h> // For the subitems, here for convenience
+#include <vlc/libvlc_events.h>
+
+#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_meta.h>
+#include <vlc_playlist.h> /* For the preparser */
+
+#include "libvlc.h"
-/* For the preparser */
-#include <vlc_playlist.h>
+#include "libvlc_internal.h"
+#include "media_internal.h"
static const vlc_meta_type_t libvlc_to_vlc_meta[] =
{
{
playlist_PreparseEnqueue(
libvlc_priv (p_md->p_libvlc_instance->p_libvlc_int)->p_playlist,
- p_md->p_input_item );
+ p_md->p_input_item, pl_Unlocked );
p_md->b_preparsed = true;
}
}
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;
}
input_item_t * p_input_item;
libvlc_media_t * p_md;
- p_input_item = input_ItemNew( p_instance->p_libvlc_int, psz_mrl, NULL );
+ p_input_item = input_item_New( p_instance->p_libvlc_int, psz_mrl, NULL );
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;
}
input_item_t * p_input_item;
libvlc_media_t * p_md;
- p_input_item = input_ItemNew( p_instance->p_libvlc_int, "vlc://nop", psz_name );
+ p_input_item = input_item_New( p_instance->p_libvlc_int, "vlc://nop", psz_name );
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;
}
* The options are detailled in vlc --long-help, for instance "--sout-all"
**************************************************************************/
void libvlc_media_add_option(
+ libvlc_media_t * p_md,
+ const char * psz_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 configurable flags.
+ **************************************************************************/
+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_ItemAddOpt( p_md->p_input_item, ppsz_option,
- VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED );
+ input_item_AddOption( p_md->p_input_item, ppsz_option,
+ i_flags );
}
/**************************************************************************
**************************************************************************/
void libvlc_media_retain( libvlc_media_t *p_md )
{
- if (!p_md)
- return;
-
+ assert (p_md);
p_md->i_refcount++;
}
* 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 );
}
* 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 );
{
playlist_AskForArtEnqueue(
libvlc_priv(p_md->p_libvlc_instance->p_libvlc_int)->p_playlist,
- p_md->p_input_item );
+ p_md->p_input_item, pl_Unlocked );
}
/* Should be integrated in core */
**************************************************************************/
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;
}
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;
* 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;
}
+/**************************************************************************
+ * Setter for state information (LibVLC Internal)
+ **************************************************************************/
+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 );
}
* 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;
}
/**************************************************************************
* 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;
}
projects / vlc / blobdiff