X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_stream.h;h=24dc14a032f5b08bd6e29fc8f185630cffa71961;hb=0103fd959a37be1ccc9ee5c59fb84f9610b0bc74;hp=4e4864cb9412c127401f08d6657b088a05db26ea;hpb=02dc7efea86a69bfe03ba96a0bbba85a0a615e29;p=vlc diff --git a/include/vlc_stream.h b/include/vlc_stream.h index 4e4864cb94..24dc14a032 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -1,24 +1,24 @@ /***************************************************************************** * vlc_stream.h: Stream (between access and demux) descriptor and methods ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2004 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * 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 + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_STREAM_H @@ -52,18 +52,24 @@ typedef struct stream_text_t stream_text_t; struct stream_t { VLC_COMMON_MEMBERS + bool b_error; - /* Module properties */ + /* Module properties for stream filter */ module_t *p_module; - /* For stream filter they will hold an array of stream sources */ - int i_source; - stream_t **pp_source; + char *psz_access; + /* Real or virtual path (it can only be changed during stream_t opening) */ + char *psz_path; + + /* Stream source for stream filter */ + stream_t *p_source; /* */ int (*pf_read) ( stream_t *, void *p_read, unsigned int i_read ); int (*pf_peek) ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek ); int (*pf_control)( stream_t *, int i_query, va_list ); + + /* */ void (*pf_destroy)( stream_t *); /* Private data for module */ @@ -71,6 +77,9 @@ struct stream_t /* Text reader state */ stream_text_t *p_text; + + /* Weak link to parent input */ + input_thread_t *p_input; }; /** @@ -83,40 +92,45 @@ enum stream_query_e STREAM_CAN_FASTSEEK, /**< arg1= bool * res=cannot fail*/ /* */ - STREAM_SET_POSITION, /**< arg1= int64_t res=can fail */ - STREAM_GET_POSITION, /**< arg1= int64_t * res=cannot fail*/ - - STREAM_GET_SIZE, /**< arg1= int64_t * res=cannot fail (0 if no sense)*/ + STREAM_SET_POSITION, /**< arg1= uint64_t res=can fail */ + STREAM_GET_POSITION, /**< arg1= uint64_t * res=cannot fail*/ - STREAM_GET_MTU, /**< arg1= int * res=cannot fail (0 if no sense)*/ + STREAM_GET_SIZE, /**< arg1= uint64_t * res=cannot fail (0 if no sense)*/ /* Special for direct access control from demuxer. * XXX: avoid using it by all means */ STREAM_CONTROL_ACCESS, /* arg1= int i_access_query, args res: can fail if access unreachable or access control answer */ + /* You should update size of source if any and then update size + * FIXME find a way to avoid it */ + STREAM_UPDATE_SIZE, + + /* */ STREAM_GET_CONTENT_TYPE, /**< arg1= char ** res=can fail */ - /* SET_RECORD: - * XXX only data read through stream_Read/Block will be recorded */ + /* XXX only data read through stream_Read/Block will be recorded */ STREAM_SET_RECORD_STATE, /**< arg1=bool, arg2=const char *psz_ext (if arg1 is true) res=can fail */ }; -VLC_EXPORT( int, stream_Read, ( stream_t *s, void *p_read, int i_read ) ); -VLC_EXPORT( int, stream_Peek, ( stream_t *s, const uint8_t **pp_peek, int i_peek ) ); -VLC_EXPORT( int, stream_vaControl, ( stream_t *s, int i_query, va_list args ) ); -VLC_EXPORT( void, stream_Delete, ( stream_t *s ) ); -VLC_EXPORT( int, stream_Control, ( stream_t *s, int i_query, ... ) ); -VLC_EXPORT( block_t *, stream_Block, ( stream_t *s, int i_size ) ); -VLC_EXPORT( char *, stream_ReadLine, ( stream_t * ) ); +VLC_API int stream_Read( stream_t *s, void *p_read, int i_read ); +VLC_API int stream_Peek( stream_t *s, const uint8_t **pp_peek, int i_peek ); +VLC_API int stream_vaControl( stream_t *s, int i_query, va_list args ); +VLC_API void stream_Delete( stream_t *s ); +VLC_API int stream_Control( stream_t *s, int i_query, ... ); +VLC_API block_t * stream_Block( stream_t *s, int i_size ); +VLC_API block_t * stream_BlockRemaining( stream_t *s, int i_max_size ); +VLC_API char * stream_ReadLine( stream_t * ); /** * Get the current position in a stream */ static inline int64_t stream_Tell( stream_t *s ) { - int64_t i_pos; + uint64_t i_pos; stream_Control( s, STREAM_GET_POSITION, &i_pos ); + if( i_pos >> 62 ) + return (int64_t)1 << 62; return i_pos; } @@ -125,19 +139,14 @@ static inline int64_t stream_Tell( stream_t *s ) */ static inline int64_t stream_Size( stream_t *s ) { - int64_t i_pos; + uint64_t i_pos; stream_Control( s, STREAM_GET_SIZE, &i_pos ); + if( i_pos >> 62 ) + return (int64_t)1 << 62; return i_pos; } -static inline int stream_MTU( stream_t *s ) -{ - int i_mtu; - stream_Control( s, STREAM_GET_MTU, &i_mtu ); - return i_mtu; -} - -static inline int stream_Seek( stream_t *s, int64_t i_pos ) +static inline int stream_Seek( stream_t *s, uint64_t i_pos ) { return stream_Control( s, STREAM_SET_POSITION, i_pos ); } @@ -158,27 +167,50 @@ static inline char *stream_ContentType( stream_t *s ) * Create a special stream and a demuxer, this allows chaining demuxers * You must delete it using stream_Delete. */ -#define stream_DemuxNew( a, b, c ) __stream_DemuxNew( VLC_OBJECT(a), b, c) -VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, const char *psz_demux, es_out_t *out ) ); +VLC_API stream_t * stream_DemuxNew( demux_t *p_demux, const char *psz_demux, es_out_t *out ); + /** - * Send data to a stream_t handle created by stream_DemuxNew. + * Send data to a stream handle created by stream_DemuxNew(). */ -VLC_EXPORT( void, stream_DemuxSend, ( stream_t *s, block_t *p_block ) ); +VLC_API void stream_DemuxSend( stream_t *s, block_t *p_block ); + +/** + * Perform a demux (i.e. DEMUX_...) control request on a stream handle + * created by stream_DemuxNew(). + */ +VLC_API int stream_DemuxControlVa( stream_t *s, int, va_list ); + +static inline int stream_DemuxControl( stream_t *s, int query, ... ) +{ + va_list ap; + int ret; + + va_start( ap, query ); + ret = stream_DemuxControlVa( s, query, ap ); + va_end( ap ); + return ret; +} /** * Create a stream_t reading from memory. * You must delete it using stream_Delete. */ -#define stream_MemoryNew( a, b, c, d ) __stream_MemoryNew( VLC_OBJECT(a), b, c, d ) -VLC_EXPORT( stream_t *,__stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, bool b_preserve_memory ) ); +VLC_API stream_t * stream_MemoryNew(vlc_object_t *p_obj, uint8_t *p_buffer, uint64_t i_size, bool b_preserve_memory ); +#define stream_MemoryNew( a, b, c, d ) stream_MemoryNew( VLC_OBJECT(a), b, c, d ) /** - * Create a stream_t reading from an URL. + * Create a stream_t reading from a URL. * You must delete it using stream_Delete. */ -#define stream_UrlNew( a, b ) __stream_UrlNew( VLC_OBJECT(a), b ) -VLC_EXPORT( stream_t *,__stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) ); +VLC_API stream_t * stream_UrlNew(vlc_object_t *p_this, const char *psz_url ); +#define stream_UrlNew( a, b ) stream_UrlNew( VLC_OBJECT(a), b ) + +/** + * Try to add a stream filter to an open stream. + * @return New stream to use, or NULL if the filter could not be added. + **/ +VLC_API stream_t* stream_FilterNew( stream_t *p_source, const char *psz_stream_filter ); /** * @} */