Changeset 34f81612d956bfc7ad53fb7937b7d38d9cdec730

Timestamp:

17/06/07 22:54:32 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1182113672 +0000

git-parent:

[0dabfb1de3089a7e568767baeb275465488eaac6]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1182113672 +0000

Message:

libvlc: Rename input to media_instance. And add the possibility to create a medi_instance from a media_descriptor.

Files:

• include/vlc/libvlc.h (modified) (20 diffs)
• include/vlc/libvlc_structures.h (modified) (1 diff)
• src/control/audio.c (modified) (3 diffs)
• src/control/event.c (modified) (1 diff)
• src/control/input.c (modified) (16 diffs)
• src/control/libvlc_internal.h (modified) (3 diffs)
• src/control/media_descriptor.c (modified) (2 diffs)
• src/control/mediacontrol_audio_video.c (modified) (6 diffs)
• src/control/mediacontrol_core.c (modified) (7 diffs)
• src/control/playlist.c (modified) (1 diff)
• src/control/video.c (modified) (25 diffs)

include/vlc/libvlc.h

@@ -287 +287 @@
-                                                libvlc_exception_t * );
-
-typedef struct libvlc_input_t libvlc_input_t;
-
-/* Get the input that is currently being played by the playlist
- * \param p_instance the instance to use
@@ -294 +292 @@
- * \return an input object
- */
-input_t *libvlc_playlist_get_input( libvlc_instance_t *,
-                         
+media_instance_t * libvlc_playlist_get_media_instance(
+libvlc_instance_t *,
-
-/** @}*/
-
-/*****************************************************************************
-Input
+Media Instance
- *****************************************************************************/
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/// \bug This might go away ... to be replaced by a broader system
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/** @} */
@@ -337 +353 @@
- * \param p_exception an initialized exception
- */
-input
-input
+media_instance
+media_instance
-
-/**
@@ -345 +361 @@
- * \param p_exception an initialized exception
- */
-input
+media_instance
-
-/**
@@ -353 +369 @@
- * \param p_exception an initialized exception
- */
-input
+media_instance
-
-/**
@@ -361 +377 @@
- * \return the fullscreen status (boolean)
- */
-input
+media_instance
-
-/**
@@ -369 +385 @@
- * \return the video height
- */
-input
+media_instance
-
-/**
@@ -377 +393 @@
- * \return the video width
- */
-input
+media_instance
-
-/**
@@ -385 +401 @@
- * \return the video aspect ratio
- */
-input
+media_instance
-
-/**
@@ -393 +409 @@
- * \param p_exception an initialized exception
- */
-input
+media_instance
-
-/**
@@ -401 +417 @@
- * \return the video subtitle selected
- */
-input
+media_instance
-
-/**
@@ -409 +425 @@
- * \param p_exception an initialized exception
- */
-input
+media_instance
-
-/**
@@ -417 +433 @@
- * \return the crop filter geometry
- */
-input
+media_instance
-
-/**
@@ -425 +441 @@
- * \param p_exception an initialized exception
- */
-input
+media_instance
-
-/**
@@ -433 +449 @@
- * \param p_exception an initialized exception
- */
-input
-
-input
+media_instance
+
+media_instance
-
-/**
@@ -445 +461 @@
- * \return the success status (boolean)
- */
-input
+media_instance
-
-/**
@@ -454 +470 @@
- * \return the success status (boolean)
- */
-input
+media_instance
-
-/**
@@ -462 +478 @@
- * \param p_exception an initialized exception
- */
-input
+media_instance
-
-/**
@@ -564 +580 @@
-+  * \return the audio track (int)
-+  */
-input
+media_instance
-
-/**
@@ -572 +588 @@
- * \param p_exception an initialized exception
- */
-input
+media_instance
-
-/**

include/vlc/libvlc_structures.h

@@ -77 +77 @@
-
-typedef struct libvlc_media_descriptor_t libvlc_media_descriptor_t;
+
+/**@} */
+
+/*****************************************************************************
+ * Media Instance
+ *****************************************************************************/
+/** defgroup libvlc_media_instance MediaInstance
+ * \ingroup libvlc
+ * LibVLC Media Instance handling
+ * @{
+ */
+
+typedef struct libvlc_media_instance_t libvlc_media_instance_t;
-
-/**@} */

src/control/audio.c

@@ -28 +28 @@
-#include <vlc_input.h>
-#include <vlc_aout.h>
-
-/*
- * Remember to release the returned input_thread_t since it is locked at
- * the end of this function.
- */
-static input_thread_t *GetInput( libvlc_input_t *p_input,
-                                 libvlc_exception_t *p_exception )
-{
-    input_thread_t *p_input_thread = NULL;
-
-    if( !p_input )
-    {
-        libvlc_exception_raise( p_exception, "Input is NULL" );
-        return NULL;
-    }
-
-    p_input_thread = (input_thread_t*)vlc_object_get(
-                                 p_input->p_instance->p_libvlc_int,
-                                 p_input->i_input_id );
-    if( !p_input_thread )
-    {
-        libvlc_exception_raise( p_exception, "Input does not exist" );
-        return NULL;
-    }
-
-    return p_input_thread;
-}
-
-/*
@@ -143 +116 @@
- * libvlc_audio_get_track : Get the current audio track
- *****************************************************************************/
-input_t *p_input
+media_instance_t *p_mi
-                            libvlc_exception_t *p_e )
-{
-GetInput( p_input
+libvlc_get_input_thread( p_mi
-    vlc_value_t val_list;
-    vlc_value_t val;
@@ -181 +154 @@
- * libvlc_audio_set_track : Set the current audio track
- *****************************************************************************/
-input_t *p_input
+media_instance_t *p_mi
-                             libvlc_exception_t *p_e )
-{
-GetInput( p_input
+libvlc_get_input_thread( p_mi
-    vlc_value_t val_list;
-    int i_ret = -1;

src/control/event.c

@@ -91 +91 @@
-{
-    libvlc_exception_t p_e_unused; /* FIXME: error checking here */
-input_t * p_libvlc_input = libvlc_playlist_get_input( p_instance, &p_e_unused )
+media_instance_t * p_mi
-    input_thread_t * p_input;
-
-
+
+
+
-        return NULL;
-
-libvlc_input
-
-input_free(p_libvlc_input
+
+mi
+
+media_instance_destroy( p_mi 
-
-    return p_input;

src/control/input.c

@@ -1 +1 @@
-/*****************************************************************************
-input.c: Libvlc new API input
+media_instance.c: Libvlc API Media Instance
- *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
@@ -28 +28 @@
-#include "input/input_internal.h"
-
-void libvlc_input_free( libvlc_input_t *p_input )
-{
-    if( p_input ) free( p_input );
-}
-
-/*
- * Retrieve the input thread. Be sure to release the object
- * once you are done with it. (libvlc Internal)
- */
-input_t *p_input
+media_instance_t *p_mi
-                                         libvlc_exception_t *p_e ) 
-{
-    input_thread_t *p_input_thread;
-
-input
+mi || p_mi->i_input_id == -1
-        RAISENULL( "Input is NULL" );
-
-    p_input_thread = (input_thread_t*)vlc_object_get(
-input->p
-input
+mi->p_libvlc
+mi
-    if( !p_input_thread )
-        RAISENULL( "Input does not exist" );
@@ -54 +49 @@
-}
-
+/**************************************************************************
+ * Create a Media Instance object
+ **************************************************************************/
+libvlc_media_instance_t *
+libvlc_media_instance_new( libvlc_media_descriptor_t *p_md )
+{
+    libvlc_media_instance_t * p_mi;
+
+    if( !p_md )
+        return NULL;
+
+    p_mi = malloc( sizeof(libvlc_media_instance_t) );
+    p_mi->p_md = libvlc_media_descriptor_duplicate( p_md );
+    p_mi->p_libvlc_instance = p_mi->p_md->p_libvlc_instance;
+    p_mi->i_input_id = -1;
+
+    return p_mi;
+}
+
+/**************************************************************************
+ * Create a new media instance object from an input_thread (Libvlc Internal)
+ **************************************************************************/
+libvlc_media_instance_t * libvlc_media_instance_new_from_input_thread(
+                                   struct libvlc_instance_t *p_libvlc_instance,
+                                   input_thread_t *p_input )
+{
+    libvlc_media_instance_t * p_mi;
+
+    p_mi = malloc( sizeof(libvlc_media_instance_t) );
+    p_mi->p_md = libvlc_media_descriptor_new_from_input_item(
+                    p_libvlc_instance,
+                    p_input->p->input.p_item );
+    p_mi->p_libvlc_instance = p_libvlc_instance;
+    p_mi->i_input_id = p_input->i_object_id;
+
+    return p_mi;
+}
+
+/**************************************************************************
+ * Destroy a Media Instance object
+ **************************************************************************/
+void libvlc_media_instance_destroy( libvlc_media_instance_t *p_mi )
+{
+    input_thread_t *p_input_thread;
+    libvlc_exception_t p_e;
+
+    /* XXX: locking */
+    libvlc_exception_init( &p_e );
+
+    if( !p_mi )
+        return;
+
+    p_input_thread = libvlc_get_input_thread( p_mi, &p_e );
+
+    if( libvlc_exception_raised( &p_e ) )
+        return; /* no need to worry about no input thread */
+    
+    input_DestroyThread( p_input_thread );
+
+    libvlc_media_descriptor_destroy( p_mi->p_md );
+
+    free( p_mi );
+}
+
+/**************************************************************************
+ * Free a Media Instance object (libvlc internal)
+ **************************************************************************/
+void libvlc_media_instance_destroy_and_detach( libvlc_media_instance_t *p_mi )
+{
+    if( !p_mi )
+        return;
+
+    libvlc_media_descriptor_destroy( p_mi->p_md );
+
+    free( p_mi );
+}
+
+/**************************************************************************
+ * Play
+ **************************************************************************/
+void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
+                                 libvlc_exception_t *p_e )
+{
+    input_thread_t * p_input_thread;
+
+    if( p_mi->i_input_id != -1) 
+    {
+        vlc_value_t val;
+        val.i_int = PLAYING_S;
+
+        /* A thread alread exists, send it a play message */
+        p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+
+        if( libvlc_exception_raised( p_e ) )
+            return;
+
+        input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, PLAYING_S );
+        return;
+    }
+
+    p_input_thread = input_CreateThread( p_mi->p_libvlc_instance->p_libvlc_int,
+                                         p_mi->p_md->p_input_item );
+    p_mi->i_input_id = p_input_thread->i_object_id;
+}
+
+/**************************************************************************
+ * Pause
+ **************************************************************************/
+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 );
+
+    if( libvlc_exception_raised( p_e ) )
+        return;
+
+    input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, val );
+}
-
-/**************************************************************************
- * Getters for stream information
- **************************************************************************/
-
+
+
-                             libvlc_exception_t *p_e )
-{
@@ -64 +182 @@
-    vlc_value_t val;
-
-input
+mi
-    if( !p_input_thread )
-        return -1;
@@ -74 +192 @@
-}
-
-
+
+
-                                   libvlc_exception_t *p_e )
-{
@@ -80 +199 @@
-    vlc_value_t val;
-
-input
+mi
-    if( !p_input_thread )
-        return -1;
@@ -89 +208 @@
-}
-
-
-
+
+
+
+
-{
-    input_thread_t *p_input_thread;
-    vlc_value_t value;
-
-input
+mi
-    if( !p_input_thread )
-        return;
@@ -104 +225 @@
-}
-
-
+
+
+
-                                libvlc_exception_t *p_e ) 
-{
@@ -111 +234 @@
-    val.f_float = position;
-
-input
+mi
-    if( !p_input_thread )
-        return;
@@ -119 +242 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    if( !p_input_thread )
-        return -1.0;
@@ -135 +259 @@
-}
-
-
-
+
+
+
-{
-    double f_fps = 0.0;
-    input_thread_t *p_input_thread;
-
-input
+mi
-    if( !p_input_thread )
-        return 0.0;
@@ -159 +284 @@
-}
-
-
-
+
+
+
-{
-    input_thread_t *p_input_thread =
-input
+mi
-    if ( !p_input_thread )
-        return VLC_FALSE;
@@ -176 +302 @@
-}
-
-
-
+
+
+
+
-{
-    input_thread_t *p_input_thread;
@@ -187 +315 @@
-    val.i_int = 1000.0f/rate;
-
-input
+mi
-    if ( !p_input_thread )
-        return;
@@ -195 +323 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    if ( !p_input_thread )
-        return -1.0;
@@ -211 +340 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    if ( !p_input_thread )
-        return 0;

src/control/libvlc_internal.h

@@ -32 +32 @@
-#include <vlc/vlc.h>
-#include <vlc/libvlc_structures.h>
+
+#include <vlc_input.h>
-    
-/***************************************************************************
@@ -83 +85 @@
-};
-
-input
+media_instance
-{
-
-
-
+
+
+
+
-};
-
@@ -94 +97 @@
- ***************************************************************************/
-VLC_EXPORT (input_thread_t *, libvlc_get_input_thread,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define RAISENULL( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \

src/control/media_descriptor.c

@@ -59 +59 @@
-        return NULL; /* XXX: throw an exception */
-
-input
+media_descriptor
-    p_media_desc->p_libvlc_instance = p_instance;
-    p_media_desc->p_input_item      = p_input_item;
@@ -68 +68 @@
-
-/**************************************************************************
+ * Create a new media descriptor object from an input_item
+ * (libvlc internal)
+ **************************************************************************/
+libvlc_media_descriptor_t * libvlc_media_descriptor_new_from_input_item(
+                                   libvlc_instance_t *p_instance,
+                                   input_item_t *p_input_item )
+{
+    libvlc_media_descriptor_t * p_media_desc;
+
+    if (!p_input_item)
+        return NULL; /* XXX: throw an exception */
+
+    p_media_desc = malloc( sizeof(libvlc_media_descriptor_t) );
+    p_media_desc->p_libvlc_instance = p_instance;
+    p_media_desc->p_input_item      = p_input_item;
+    p_media_desc->b_preparsed       = VLC_TRUE;
+
+    return p_media_desc;
+}
+
+/**************************************************************************
- * Delete a media descriptor object
- **************************************************************************/
-eta_desc
+d
-{
-eta_desc
+d
-        return;
-
-    /* XXX: locking */
-eta_desc
+d
-
-eta_desc
+d
-}
-
-/**************************************************************************
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- **************************************************************************/
-static const int meta_conversion[] =

src/control/mediacontrol_audio_video.c

@@ -284 +284 @@
-{
-    libvlc_exception_t ex;
-input_t* p_input
+media_instance_t* p_mi
-    int i_ret;
-
@@ -290 +290 @@
-    libvlc_exception_init( &ex );
-
-input = libvlc_playlist_get_input
-
-
-input_get_rate( p_input
-input_free( p_input
+mi = libvlc_playlist_get_media_instance
+
+
+media_instance_get_rate( p_mi
+media_instance_destroy_and_detach( p_mi
-    HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
-
@@ -306 +306 @@
-{
-    libvlc_exception_t ex;
-input_t* p_input
-
-
-
-
-input = libvlc_playlist_get_input
-
-
-input_set_rate( p_input
-input_free( p_input
+media_instance_t* p_mi
+
+
+
+
+mi = libvlc_playlist_get_media_instance
+
+
+media_instance_set_rate( p_mi
+media_instance_destroy_and_detach( p_mi
-    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
-}
@@ -324 +324 @@
-{
-    libvlc_exception_t ex;
-input_t* p_input
+media_instance_t* p_mi
-    int i_ret;
-
@@ -330 +330 @@
-    libvlc_exception_init( &ex );
-
-input = libvlc_playlist_get_input
-
-
-input
-input_free( p_input
+mi = libvlc_playlist_get_media_instance
+
+
+mi
+media_instance_destroy_and_detach( p_mi
-    HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
-
@@ -346 +346 @@
-{
-    libvlc_exception_t ex;
-input_t* p_input
-
-
-
-
-input = libvlc_playlist_get_input
-
-
-input
-input_free( p_input
-
-
+media_instance_t* p_mi
+
+
+
+
+mi = libvlc_playlist_get_media_instance
+
+
+mi
+media_instance_destroy_and_detach( p_mi
+
+

src/control/mediacontrol_core.c

@@ -125 +125 @@
-    libvlc_exception_t ex;
-    vlc_int64_t pos;
-input_t * p_input
+media_instance_t * p_mi
-
-    mediacontrol_exception_init( exception );
@@ -134 +134 @@
-    retval->key = a_key;
-
-input = libvlc_playlist_get_input
+mi = libvlc_playlist_get_media_instance
-    HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
-
-    if(  an_origin != mediacontrol_AbsolutePosition )
-    {
-input_free( p_input
+media_instance_destroy_and_detach( p_mi
-        /* Relative or ModuloPosition make no sense */
-        RAISE_NULL( mediacontrol_PositionOriginNotSupported,
@@ -146 +146 @@
-
-    /* We are asked for an AbsolutePosition. */
-input_get_time( p_input
+media_instance_get_time( p_mi
-
-    if( a_key == mediacontrol_MediaTime )
@@ -156 +156 @@
-        if( ! self->p_playlist->p_input )
-        {
-input_free( p_input
+media_instance_destroy_and_detach( p_mi
-            RAISE_NULL( mediacontrol_InternalException,
-                        "No input" );
@@ -165 +165 @@
-                                                   pos );
-    }
-input_free( p_input
+media_instance_destroy_and_detach( p_mi
-    return retval;
-}
@@ -175 +175 @@
-                                 mediacontrol_Exception *exception )
-{
-input_t * p_input
+media_instance_t * p_mi
-    libvlc_exception_t ex;
-    vlc_int64_t i_pos;
@@ -182 +182 @@
-    mediacontrol_exception_init( exception );
-
-input = libvlc_playlist_get_input
+mi = libvlc_playlist_get_media_instance
-    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
-
-    i_pos = mediacontrol_position2microsecond( self->p_playlist->p_input, a_position );
-input_set_time( p_input
-input_free( p_input
+media_instance_set_time( p_mi