X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmediacontrol_util.c;h=965f853e08c27b36a86d0f4a5859b192eb1c6b70;hb=148630710d221cd81ac64e34c3c67735db3c0f0d;hp=70874da20fe41e25f8d58864078443a8fb20ab22;hpb=f85de941b2b2ac1952638ff335dc315c568a431c;p=vlc diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c index 70874da20f..965f853e08 100644 --- a/src/control/mediacontrol_util.c +++ b/src/control/mediacontrol_util.c @@ -21,47 +21,36 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "mediacontrol_internal.h" #include -#include -#include -#include -#include - +#include #include #include #include /* malloc(), free() */ #include -#include /* ENOMEM */ #include -#include #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TIME_H -# include -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -/* FIXME: Need to stop accessing private input structures !! */ -#include "input/input_internal.h" +#include -vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input, - mediacontrol_PositionKey from, - mediacontrol_PositionKey to, - vlc_int64_t value ) +libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_player, + mediacontrol_PositionKey from, + mediacontrol_PositionKey to, + int64_t value ) { if( to == from ) return value; - /* For all conversions, we need data from p_input */ - if( !p_input ) + if( !p_media_player ) return 0; switch( from ) @@ -69,7 +58,7 @@ vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input, case mediacontrol_MediaTime: if( to == mediacontrol_ByteCount ) { - /* FIXME */ + /* FIXME Unsupported */ /* vlc < 0.8 API */ /* return value * 50 * p_input->stream.i_mux_rate / 1000; */ return 0; @@ -78,33 +67,34 @@ vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input, { double f_fps; - if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 ) + f_fps = libvlc_media_player_get_rate( p_media_player ); + if( f_fps < 0 ) return 0; else return( value * f_fps / 1000.0 ); } /* Cannot happen */ - /* See http://catb.org/~esr/jargon/html/entry/can't-happen.html */ + /* See http://catb.org/~esr/jargon/html/entry/can-t-happen.html */ break; case mediacontrol_SampleCount: { double f_fps; - if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) || - f_fps < 0.1 ) + f_fps = libvlc_media_player_get_rate( p_media_player ); + if( f_fps < 0 ) return 0; if( to == mediacontrol_ByteCount ) { /* FIXME */ /* vlc < 0.8 API */ -/* return ( vlc_int64_t )( value * 50 * p_input->stream.i_mux_rate / f_fps ); */ +/* return ( int64_t )( value * 50 * p_input->stream.i_mux_rate / f_fps ); */ return 0; } if( to == mediacontrol_MediaTime ) - return( vlc_int64_t )( value * 1000.0 / ( double )f_fps ); + return( int64_t )( value * 1000.0 / ( double )f_fps ); /* Cannot happen */ break; @@ -112,28 +102,6 @@ vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input, 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 ( vlc_int64_t )( 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 ( vlc_int64_t )( value * f_fps / 50 / p_input->stream.i_mux_rate ); -// } - /* Cannot happen */ - break; } /* Cannot happen */ return 0; @@ -141,77 +109,58 @@ vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input, /* Converts a mediacontrol_Position into a time in microseconds in movie clock time */ -vlc_int64_t -private_mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_Position * pos ) +libvlc_time_t +private_mediacontrol_position2microsecond( libvlc_media_player_t * p_media_player, + const mediacontrol_Position * pos ) { switch( pos->origin ) { case mediacontrol_AbsolutePosition: - return ( 1000 * private_mediacontrol_unit_convert( p_input, + return ( 1000 * private_mediacontrol_unit_convert( p_media_player, pos->key, /* from */ mediacontrol_MediaTime, /* to */ pos->value ) ); break; case mediacontrol_RelativePosition: { - vlc_int64_t l_pos; - vlc_value_t val; + libvlc_time_t l_time = 0; + libvlc_time_t l_pos = 0; - val.i_time = 0; - if( p_input ) - { - var_Get( p_input, "time", &val ); - } + l_time = libvlc_media_player_get_time( p_media_player ); + /* Ignore exception, we will assume a 0 time value */ - l_pos = 1000 * private_mediacontrol_unit_convert( p_input, - pos->key, - mediacontrol_MediaTime, - pos->value ); - return val.i_time + l_pos; + l_pos = private_mediacontrol_unit_convert( p_media_player, + pos->key, + mediacontrol_MediaTime, + pos->value ); + return 1000 * ( l_time + l_pos ); break; } case mediacontrol_ModuloPosition: { - vlc_int64_t l_pos; - vlc_value_t val; + libvlc_time_t l_time = 0; + libvlc_time_t l_length = 0; + libvlc_time_t l_pos = 0; - val.i_time = 0; - if( p_input ) - { - var_Get( p_input, "length", &val ); - } + l_length = libvlc_media_player_get_length( p_media_player ); + if( l_length <= 0 ) + return 0; - if( val.i_time > 0) - { - l_pos = ( 1000 * private_mediacontrol_unit_convert( p_input, - pos->key, - mediacontrol_MediaTime, - pos->value ) ); - } - else - l_pos = 0; + l_time = libvlc_media_player_get_time( p_media_player ); + /* Ignore exception, we will assume a 0 time value */ + + l_pos = private_mediacontrol_unit_convert( p_media_player, + pos->key, + mediacontrol_MediaTime, + pos->value ); - return l_pos % val.i_time; + return 1000 * ( ( l_time + l_pos ) % l_length ); break; } } return 0; } -mediacontrol_RGBPicture* -private_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 * sizeof( char ) ); - return pic; -} - void mediacontrol_RGBPicture__free( mediacontrol_RGBPicture* pic ) { @@ -222,33 +171,6 @@ mediacontrol_RGBPicture__free( mediacontrol_RGBPicture* pic ) } } -mediacontrol_PlaylistSeq* -private_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 ); - } -} - void mediacontrol_StreamInformation__free( mediacontrol_StreamInformation* p_si ) { @@ -264,7 +186,7 @@ mediacontrol_Exception* mediacontrol_exception_create( void ) { mediacontrol_Exception* exception; - + exception = ( mediacontrol_Exception* )malloc( sizeof( mediacontrol_Exception ) ); mediacontrol_exception_init( exception ); return exception; @@ -281,22 +203,38 @@ mediacontrol_exception_init( mediacontrol_Exception *exception ) } void -mediacontrol_exception_free( mediacontrol_Exception *exception ) +mediacontrol_exception_cleanup( mediacontrol_Exception *exception ) { - if( ! exception ) - return; + if( exception ) + free( exception->message ); +} - free( exception->message ); +void +mediacontrol_exception_free( mediacontrol_Exception *exception ) +{ + mediacontrol_exception_cleanup( exception ); free( exception ); } +/** + * Allocates and initializes a mediacontrol_RGBPicture object. + * + * @param i_width: picture width + * @param i_height: picture width + * @param i_chroma: picture chroma + * @param l_date: picture timestamp + * @param p_data: pointer to the data. The data will be directly used, not copied. + * @param i_datasize: data size in bytes + * + * @return the new object, or NULL on error. + */ mediacontrol_RGBPicture* -private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, vlc_int64_t l_date, - char* p_data, int i_datasize ) +private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, int64_t l_date, + char* p_data, int i_datasize ) { mediacontrol_RGBPicture *retval; - retval = private_mediacontrol_RGBPicture__alloc( i_datasize ); + retval = ( mediacontrol_RGBPicture * )malloc( sizeof( mediacontrol_RGBPicture ) ); if( retval ) { retval->width = i_width; @@ -304,7 +242,7 @@ private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, retval->type = i_chroma; retval->date = l_date; retval->size = i_datasize; - memcpy( retval->data, p_data, i_datasize ); + retval->data = p_data; } return retval; }