Merge mediacontrol to trunk

Makefile.am

@@ -60,6 +60,7 @@ dist_pkginclude_HEADERS = \
 	include/vlc/decoder.h \
 	include/vlc/input.h \
 	include/vlc/intf.h \
+	include/vlc/control.h \
 	$(NULL)
 
 noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built)
@@ -412,6 +413,9 @@ SOURCES_libvlc_common = \
 	src/misc/vlm.c \
 	src/misc/xml.c \
 	src/extras/libc.c \
+	src/control/core.c \
+	src/control/util.c \
+	src/control/audio_video.c \
 	$(NULL)
 
 SOURCES_libvlc = \

include/vlc/control.h

+/*****************************************************************************
+ * control.h: global header for mediacontrol
+ *****************************************************************************
+ * Copyright (C) 2005 VideoLAN
+ * $Id: vlc.h 10101 2005-03-02 16:47:31Z robux4 $
+ *
+ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+#ifndef _VLC_CONTROL_H
+#define _VLC_CONTROL_H 1
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+#include <vlc/vlc.h>
+
+#if defined( WIN32 )
+#define WINDOWHANDLE HWND
+#else
+#define WINDOWHANDLE int
+#endif
+
+
+typedef int bool;
+
+/************************************************************************
+ * Position Object Manipulation
+ *************************************************************************/
+typedef enum  {
+  mediacontrol_AbsolutePosition,
+  mediacontrol_RelativePosition,
+  mediacontrol_ModuloPosition
+} mediacontrol_PositionOrigin;
+
+typedef enum {
+  mediacontrol_ByteCount,
+  mediacontrol_SampleCount,
+  mediacontrol_MediaTime
+} mediacontrol_PositionKey;
+
+typedef struct {
+  mediacontrol_PositionOrigin origin;
+  mediacontrol_PositionKey key;
+  long value;
+} mediacontrol_Position;
+
+typedef struct {
+  int  width;
+  int  height;
+  long type;
+  long long date;
+  int  size;
+  char* data;
+} mediacontrol_RGBPicture;
+
+typedef struct {
+  int size;
+  char** data;
+} mediacontrol_PlaylistSeq;
+
+typedef struct {
+  int code;
+  char* message;
+} mediacontrol_Exception;
+
+/* Exception codes */
+#define mediacontrol_PositionKeyNotSupported    1
+#define mediacontrol_PositionOriginNotSupported 2
+#define mediacontrol_InvalidPosition            3
+#define mediacontrol_PlaylistException          4
+#define mediacontrol_InternalException          5
+
+typedef struct {
+  vlc_object_t  *p_vlc;
+  playlist_t    *p_playlist;
+  intf_thread_t *p_intf;
+  int           vlc_object_id;
+} mediacontrol_Instance;
+
+/* Cf stream_control.h */
+enum mediacontrol_PlayerStatusList
+  {
+    mediacontrol_PlayingStatus, mediacontrol_PauseStatus,
+    mediacontrol_ForwardStatus, mediacontrol_BackwardStatus,
+    mediacontrol_InitStatus,    mediacontrol_EndStatus,
+    mediacontrol_UndefinedStatus
+  };
+typedef enum mediacontrol_PlayerStatusList mediacontrol_PlayerStatus;
+
+typedef struct {
+    mediacontrol_PlayerStatus streamstatus;
+    char* url;         /* The URL of the current media stream */
+    long long position;     /* actual location in the stream (in ms) */
+    long long length;         /* total length of the stream (in ms) */
+  } mediacontrol_StreamInformation;
+
+/**************************************************************************
+ *  Helper functions
+ ***************************************************************************/
+long long mediacontrol_unit_convert (input_thread_t *p_input,
+                                     mediacontrol_PositionKey from,
+                                     mediacontrol_PositionKey to,
+                                     long long value);
+long long
+mediacontrol_position2microsecond (input_thread_t* p_input, const mediacontrol_Position * pos);
+
+mediacontrol_RGBPicture* mediacontrol_RGBPicture__alloc (int datasize);
+void mediacontrol_RGBPicture__free (mediacontrol_RGBPicture* pic);
+mediacontrol_PlaylistSeq* mediacontrol_PlaylistSeq__alloc (int size);
+void mediacontrol_PlaylistSeq__free (mediacontrol_PlaylistSeq* ps);
+
+mediacontrol_Exception* mediacontrol_exception_init(mediacontrol_Exception *exception);
+void mediacontrol_exception_free(mediacontrol_Exception *exception);
+
+/*****************************************************************************
+ * Core functions
+ *****************************************************************************/
+mediacontrol_Instance* mediacontrol_new(char** args, mediacontrol_Exception *exception);
+mediacontrol_Instance* mediacontrol_new_from_object(vlc_object_t* p_object,
+                            mediacontrol_Exception *exception);
+
+mediacontrol_Position* mediacontrol_get_media_position(
+                                       mediacontrol_Instance *self,
+                                       mediacontrol_PositionOrigin an_origin,
+                                       mediacontrol_PositionKey a_key,
+                                       mediacontrol_Exception *exception);
+void mediacontrol_set_media_position(mediacontrol_Instance *self,
+                                     const mediacontrol_Position* a_position,
+                                     mediacontrol_Exception *exception);
+void mediacontrol_start( mediacontrol_Instance *self,
+                         const mediacontrol_Position* a_position,
+                         mediacontrol_Exception *exception);
+
+void mediacontrol_pause(mediacontrol_Instance *self,
+                        const mediacontrol_Position* a_position, 
+                        mediacontrol_Exception *exception);
+
+void mediacontrol_resume(mediacontrol_Instance *self,
+                         const mediacontrol_Position* a_position,
+                         mediacontrol_Exception *exception);
+
+void mediacontrol_stop(mediacontrol_Instance *self,
+                       const mediacontrol_Position* a_position,
+                       mediacontrol_Exception *exception);
+void mediacontrol_exit(mediacontrol_Instance *self);
+
+void mediacontrol_playlist_add_item (mediacontrol_Instance *self,
+                                     const char* psz_file,
+                                     mediacontrol_Exception *exception);
+void mediacontrol_playlist_clear (mediacontrol_Instance *self,
+                                  mediacontrol_Exception *exception);
+mediacontrol_PlaylistSeq* mediacontrol_playlist_get_list (
+                                mediacontrol_Instance *self,
+                                mediacontrol_Exception *exception);
+
+
+/*****************************************************************************
+ * A/V functions
+ *****************************************************************************/
+mediacontrol_RGBPicture* mediacontrol_snapshot (mediacontrol_Instance *self,
+                                const mediacontrol_Position* a_position,
+                                mediacontrol_Exception *exception);
+
+/* Return a NULL terminated list */
+mediacontrol_RGBPicture** mediacontrol_all_snapshots (mediacontrol_Instance *self,
+						      mediacontrol_Exception *exception);
+
+// Displays the message string, between "begin" and "end" positions
+void mediacontrol_display_text (mediacontrol_Instance *self,
+				const char* message, 
+				const mediacontrol_Position* begin, 
+				const mediacontrol_Position* end,
+				mediacontrol_Exception *exception);
+
+mediacontrol_StreamInformation* 
+mediacontrol_get_stream_information(mediacontrol_Instance* self,
+				    mediacontrol_PositionKey a_key,
+				    mediacontrol_Exception *exception);
+
+unsigned short mediacontrol_sound_get_volume(mediacontrol_Instance* self,
+					     mediacontrol_Exception *exception);
+void mediacontrol_sound_set_volume(mediacontrol_Instance* self,
+				   const unsigned short volume,
+				   mediacontrol_Exception *exception);
+
+bool mediacontrol_set_visual(mediacontrol_Instance* self,
+			     WINDOWHANDLE visual_id,
+			     mediacontrol_Exception *exception);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+

src/control/init.c

+#define __VLC__
+#include <vlc/control.h>
+
+mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *exception )
+{
+    mediacontrol_Instance* retval;
+    vlc_object_t *p_vlc;
+    int p_vlc_id;
+    char **ppsz_argv;
+    int i_count = 0;
+    int i_index;
+    char **p_tmp;
+
+    if( args )
+    {
+        for ( p_tmp = args ; *p_tmp != NULL ; p_tmp++ )
+            i_count++;
+    }
+
+    ppsz_argv = malloc( i_count + 2 );
+    if( ! ppsz_argv )
+    {
+        exception->code = mediacontrol_InternalException;
+        exception->message = "Out of memory";
+        return NULL;
+    }
+    ppsz_argv[0] = "vlc";
+    for ( i_index = 0; i_index < i_count; i_index++ )
+    {
+        ppsz_argv[i_index + 1] = strdup( args[i_index] );
+        if( ! ppsz_argv[i_index + 1] )
+        {
+            exception->code = mediacontrol_InternalException;
+            exception->message = "Out of memory";
+            return NULL;
+        }
+    }
+
+    ppsz_argv[i_count + 1] = NULL;
+
+    p_vlc_id = VLC_Create();
+  
+    p_vlc = ( vlc_object_t* )vlc_current_object( p_vlc_id );
+  
+    if( ! p_vlc )
+    {
+        exception->code = mediacontrol_InternalException;
+        exception->message = strdup( "Unable to initialize VLC" );
+        return NULL;
+    }
+    retval = ( mediacontrol_Instance* )malloc( sizeof( mediacontrol_Instance ) );
+    if( ! retval )
+    {
+        exception->code = mediacontrol_InternalException;
+        exception->message = strdup( "Out of memory" );
+        return NULL;
+    }
+
+    VLC_Init( p_vlc_id, i_count + 1, ppsz_argv );
+
+    retval->p_vlc = p_vlc;
+    retval->vlc_object_id = p_vlc_id;
+
+    /* We can keep references on these, which should not change. Is it true ? */
+    retval->p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+    retval->p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_ANYWHERE );
+
+    if( ! retval->p_playlist || ! retval->p_intf )
+    {
+        exception->code = mediacontrol_InternalException;
+        exception->message = strdup( "No available interface" );
+        return NULL;
+    }
+    return retval;  
+};
+
+void
+mediacontrol_exit( mediacontrol_Instance *self )
+{
+  /*
+    vlc_object_release( (vlc_object_t* )self->p_playlist );
+    vlc_object_release( (vlc_object_t* )self->p_intf );
+  */
+    VLC_CleanUp( self->vlc_object_id );
+    VLC_Destroy( self->vlc_object_id );
+}

src/control/plugin.c

+#include "mediacontrol-core.h"
+#include <vlc/intf.h>
+
+mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *exception )
+{
+    exception->code = mediacontrol_InternalException;
+    exception->message = strdup( "The mediacontrol extension was compiled for plugin use only." );
+    return NULL;
+};
+
+void
+mediacontrol_exit( mediacontrol_Instance *self )
+{
+    /* 
+       vlc_object_release( self->p_playlist );
+    */
+    
+    vlc_mutex_lock( &self->p_intf->change_lock );
+    self->p_intf->b_die = 1;
+    vlc_mutex_unlock( &self->p_intf->change_lock );
+
+    /*
+      vlc_object_release( self->p_intf );
+      vlc_object_release( self->p_vlc );
+    */
+}

src/control/util.c

+/*****************************************************************************
+ * util.c: Utility functions and exceptions management
+ *****************************************************************************
+ * Copyright (C) 2005 VideoLAN
+ * $Id: vlc.c 10786 2005-04-23 23:19:17Z zorglub $
+ *
+ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+#include <vlc/control.h>
+
+#include <vlc/intf.h>
+#include <vlc/vout.h>
+#include <vlc/aout.h>
+#include <vlc_demux.h>
+
+#include <osd.h>
+
+#define HAS_SNAPSHOT 1
+
+#ifdef HAS_SNAPSHOT
+#include <snapshot.h>
+#endif
+
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>
+
+#include <errno.h>                                                 /* ENOMEM */
+#include <stdio.h>
+#include <ctype.h>
+
+#ifdef HAVE_UNISTD_H
+#    include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#endif
+#include <sys/types.h>
+
+#define RAISE( c, m )  exception->code = c; \
+                       exception->message = strdup(m);
+
+long long mediacontrol_unit_convert( input_thread_t *p_input,
+                                     mediacontrol_PositionKey from,
+                                     mediacontrol_PositionKey to,
+                                     long long value )
+{
+    if( to == from )
+        return value;
+
+    /* For all conversions, we need data from p_input */
+    if( !p_input )
+        return 0;
+
+    switch( from )
+    {
+    case mediacontrol_MediaTime:
+        if( to == mediacontrol_ByteCount )
+        {
+            /* FIXME */
+            /* vlc < 0.8 API */
+            /* return value * 50 * p_input->stream.i_mux_rate / 1000; */
+            return 0;
+        }
+        if( to == mediacontrol_SampleCount )
+        {
+            double f_fps;
+
+            if( demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+                return 0;
+            else
+                return( value * f_fps / 1000.0 );
+        }
+        /* Cannot happen */
+        /* See http://catb.org/~esr/jargon/html/entry/can't-happen.html */
+        break;
+
+    case mediacontrol_SampleCount:
+    {
+        double f_fps;
+
+	if( demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+            return 0;
+
+        if( to == mediacontrol_ByteCount )
+        {
+            /* FIXME */
+            /* vlc < 0.8 API */
+/*             return ( long long )( value * 50 * p_input->stream.i_mux_rate / f_fps ); */
+            return 0;
+        }
+
+        if( to == mediacontrol_MediaTime )
+            return( long long )( value * 1000.0 / ( double )f_fps );
+
+        /* Cannot happen */
+        break;
+    }
+    case mediacontrol_ByteCount:
+        /* FIXME */
+        return 0;
+/* vlc < 0.8 API: */
+
+//         if( p_input->stream.i_mux_rate == 0 )
+//             return 0;
+// 
+//         /* Convert an offset into milliseconds. Taken from input_ext-intf.c.
+//            The 50 hardcoded constant comes from the definition of i_mux_rate :
+//            i_mux_rate : the rate we read the stream (in units of 50 bytes/s) ;
+//            0 if undef */
+//         if( to == mediacontrol_MediaTime )
+//             return ( long long )( 1000 * value / 50 / p_input->stream.i_mux_rate );
+// 
+//         if( to == mediacontrol_SampleCount )
+//         {
+//             double f_fps;
+//             if( demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+//                 return 0;
+//             else
+//                 return ( long long )( value * f_fps / 50 / p_input->stream.i_mux_rate );
+//         }
+        /* Cannot happen */
+        break;
+    }
+    /* Cannot happen */
+    return 0;
+}
+
+/* Converts a mediacontrol_Position into a time in microseconds in
+   movie clock time */
+long long
+mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_Position * pos )
+{
+    switch( pos->origin )
+    {
+    case mediacontrol_AbsolutePosition:
+        return ( 1000 * mediacontrol_unit_convert( p_input,
+                                                   pos->key, /* from */
+                                                   mediacontrol_MediaTime,  /* to */
+                                                   pos->value ) );
+        break;
+    case mediacontrol_RelativePosition:
+    {
+        long long l_pos;
+        vlc_value_t val;
+
+        val.i_time = 0;
+        if( p_input )
+        {
+            var_Get( p_input, "time", &val );
+        }
+
+        l_pos = 1000 * mediacontrol_unit_convert( p_input,
+                                                  pos->key,
+                                                  mediacontrol_MediaTime,
+                                                  pos->value );
+        return val.i_time + l_pos;
+        break;
+    }
+    case mediacontrol_ModuloPosition:
+    {
+        long long l_pos;
+        vlc_value_t val;
+
+        val.i_time = 0;
+        if( p_input )
+        {
+            var_Get( p_input, "length", &val );
+        }
+
+        if( val.i_time > 0)
+        {
+            l_pos = ( 1000 * mediacontrol_unit_convert( p_input,
+                                                        pos->key,
+                                                        mediacontrol_MediaTime,
+                                                        pos->value ) );
+        }
+        else
+            l_pos = 0;
+
+        return l_pos % val.i_time;
+        break;
+    }
+    }
+    return 0;
+}
+
+mediacontrol_RGBPicture*
+mediacontrol_RGBPicture__alloc( int datasize )
+{
+    mediacontrol_RGBPicture* pic;
+
+    pic = ( mediacontrol_RGBPicture * )malloc( sizeof( mediacontrol_RGBPicture ) );
+    if( ! pic )
+        return NULL;
+
+    pic->size = datasize;
+    pic->data = ( char* )malloc( datasize );
+    return pic;
+}
+
+void
+mediacontrol_RGBPicture__free( mediacontrol_RGBPicture* pic )
+{
+    if( pic )
+        free( pic->data );
+    free( pic );
+}
+
+mediacontrol_PlaylistSeq*
+mediacontrol_PlaylistSeq__alloc( int size )
+{
+    mediacontrol_PlaylistSeq* ps;
+
+    ps =( mediacontrol_PlaylistSeq* )malloc( sizeof( mediacontrol_PlaylistSeq ) );
+    if( ! ps )
+        return NULL;
+
+    ps->size = size;
+    ps->data = ( char** )malloc( size * sizeof( char* ) );
+    return ps;
+}
+
+void
+mediacontrol_PlaylistSeq__free( mediacontrol_PlaylistSeq* ps )
+{
+    if( ps )
+    {
+        int i;
+        for( i = 0 ; i < ps->size ; i++ )
+            free( ps->data[i] );
+    }
+    free( ps->data );
+    free( ps );
+}
+
+mediacontrol_Exception*
+mediacontrol_exception_init( mediacontrol_Exception *exception )
+{
+    if( exception == NULL )
+    {
+        exception = ( mediacontrol_Exception* )malloc( sizeof( mediacontrol_Exception ) );
+    }
+
+    exception->code = 0;
+    exception->message = NULL;
+    return exception;
+}
+
+void
+mediacontrol_exception_free( mediacontrol_Exception *exception )
+{
+    if( ! exception )
+        return;
+
+    free( exception->message );
+    free( exception );
+}
+
+mediacontrol_RGBPicture*
+_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, long long l_date,
+                                char* p_data, int i_datasize )
+{
+    mediacontrol_RGBPicture *retval;
+
+    retval = mediacontrol_RGBPicture__alloc( i_datasize );
+    if( retval )
+    {
+        retval->width  = i_width;
+        retval->height = i_height;
+        retval->type   = i_chroma;
+        retval->date   = l_date;
+        retval->size   = i_datasize;
+        memcpy( retval->data, p_data, i_datasize );
+    }
+    return retval;
+}

src/libvlc.h

@@ -322,9 +322,9 @@ static char *ppsz_clock_descriptions[] =
 
 #define INPUT_PROGRAM_TEXT N_("Choose program (SID)")
 #define INPUT_PROGRAM_LONGTEXT N_( \
-    "Choose the program to select by giving its Service ID\n." \
+    "Choose the program to select by giving its Service ID.\n" \
     "Only use this option if you want to read a multi-program stream " \
-    "(like DVB streams for example )" )
+    "(ike DVB streams for example)" )
 
 #define INPUT_PROGRAMS_TEXT N_("Choose programs")
 #define INPUT_PROGRAMS_LONGTEXT N_( \
@@ -927,7 +927,6 @@ vlc_module_begin();
     set_subcategory( SUBCAT_AUDIO_AOUT );
     add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT,
                 VLC_TRUE );
-        change_short('A');
     set_subcategory( SUBCAT_AUDIO_AFILTER );
     add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0,
                          NULL, AUDIO_FILTER_TEXT,
@@ -1200,6 +1199,7 @@ vlc_module_begin();
                 MEMCPY_LONGTEXT, VLC_TRUE );
     add_module( "audio-channel-mixer", "audio mixer", NULL, NULL,
                 AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_TRUE );
+        change_short('A');
 
     set_section( N_("Plugins" ), NULL );
     add_bool( "plugins-cache", VLC_TRUE, NULL, PLUGINS_CACHE_TEXT,

vlc-config.in.in

@@ -82,6 +82,8 @@ if test "@includedir@" != "/usr/include"; then
 fi
 if test "${top_builddir}" != ""; then
   top_builddir="${top_builddir}/"
+elif test "${TOP_BUILDDIR}" != ""; then
+  top_builddir="${TOP_BUILDDIR}/"
 fi
 includes="${includes} -I${top_builddir}include"
 cppflags="${includes}"