X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=9aa2105cf7835307ce2d8edec31b61206cb8a342;hb=848489c3863b1b7ddbe542aa3e746063722b9280;hp=7fc495432cd4eee7794f796f855596b74af6b8d7;hpb=c87d50dd850bac965aaf9e81b97e0c166fc22a4f;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index 7fc495432c..9aa2105cf7 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -1,8 +1,8 @@ /***************************************************************************** * demux.c ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN - * $Id: demux.c,v 1.13 2004/03/03 20:39:53 gbazin Exp $ + * Copyright (C) 1999-2004 the VideoLAN team + * $Id$ * * Author: Laurent Aimar * @@ -18,235 +18,165 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "ninput.h" +#include -int demux_vaControl( input_thread_t *p_input, int i_query, va_list args ) -{ - if( p_input->pf_demux_control ) - { - return p_input->pf_demux_control( p_input, i_query, args ); - } - return VLC_EGENERIC; -} - -int demux_Control( input_thread_t *p_input, int i_query, ... ) -{ - va_list args; - int i_result; - - va_start( args, i_query ); - i_result = demux_vaControl( p_input, i_query, args ); - va_end( args ); +#include "input_internal.h" - return i_result; -} - -static void SeekOffset( input_thread_t *p_input, int64_t i_pos ); +static bool SkipID3Tag( demux_t * ); +static bool SkipAPETag( demux_t *p_demux ); -int demux_vaControlDefault( input_thread_t *p_input, int i_query, - va_list args ) +/***************************************************************************** + * demux_New: + * if s is NULL then load a access_demux + *****************************************************************************/ +demux_t *__demux_New( vlc_object_t *p_obj, + const char *psz_access, const char *psz_demux, + const char *psz_path, + stream_t *s, es_out_t *out, bool b_quick ) { - int i_ret; - double f, *pf; - int64_t i64, *pi64; - - vlc_mutex_lock( &p_input->stream.stream_lock ); - switch( i_query ) - { - case DEMUX_GET_POSITION: - pf = (double*)va_arg( args, double * ); - if( p_input->stream.p_selected_area->i_size <= 0 ) - { - *pf = 0.0; - } - else - { - *pf = (double)p_input->stream.p_selected_area->i_tell / - (double)p_input->stream.p_selected_area->i_size; - } - i_ret = VLC_SUCCESS; - break; - - case DEMUX_SET_POSITION: - f = (double)va_arg( args, double ); - if( p_input->stream.b_seekable && p_input->pf_seek != NULL && - f >= 0.0 && f <= 1.0 ) - { - SeekOffset( p_input, (int64_t)(f * - (double)p_input->stream.p_selected_area->i_size) ); - i_ret = VLC_SUCCESS; - } - else - { - i_ret = VLC_EGENERIC; - } - break; - - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_input->stream.i_mux_rate > 0 ) - { - *pi64 = (int64_t)1000000 * - ( p_input->stream.p_selected_area->i_tell / 50 ) / - p_input->stream.i_mux_rate; - i_ret = VLC_SUCCESS; - } - else - { - *pi64 = 0; - i_ret = VLC_EGENERIC; - } - break; + static const char typename[] = "demux"; + demux_t *p_demux = vlc_custom_create( p_obj, sizeof( *p_demux ), + VLC_OBJECT_GENERIC, typename ); + const char *psz_module; - case DEMUX_SET_TIME: - i64 = (int64_t)va_arg( args, int64_t ); - if( p_input->stream.i_mux_rate > 0 && - p_input->stream.b_seekable && - p_input->pf_seek != NULL && i64 >= 0 ) - { - SeekOffset( p_input, i64 * 50 * - (int64_t)p_input->stream.i_mux_rate / - (int64_t)1000000 ); - i_ret = VLC_SUCCESS; - } - else - { - i_ret = VLC_EGENERIC; - } - break; + if( p_demux == NULL ) return NULL; - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_input->stream.i_mux_rate > 0 ) - { - *pi64 = (int64_t)1000000 * - ( p_input->stream.p_selected_area->i_size / 50 ) / - p_input->stream.i_mux_rate; - i_ret = VLC_SUCCESS; - } - else - { - *pi64 = 0; - i_ret = VLC_EGENERIC; - } - break; - case DEMUX_GET_FPS: - i_ret = VLC_EGENERIC; - break; - case DEMUX_GET_META: - i_ret = VLC_EGENERIC; - break; + /* Parse URL */ + p_demux->psz_access = strdup( psz_access ); + p_demux->psz_demux = strdup( psz_demux ); + p_demux->psz_path = strdup( psz_path ); - default: - msg_Err( p_input, "unknown query in demux_vaControlDefault" ); - i_ret = VLC_EGENERIC; - break; + /* Take into account "demux" to be able to do :demux=dump */ + if( p_demux->psz_demux && *p_demux->psz_demux == '\0' ) + { + free( p_demux->psz_demux ); + p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" ); + if( p_demux->psz_demux == NULL ) + p_demux->psz_demux = strdup( "" ); } - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - return i_ret; -} -static void SeekOffset( input_thread_t *p_input, int64_t i_pos ) -{ - /* Reinitialize buffer manager. */ - input_AccessReinit( p_input ); - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - p_input->pf_seek( p_input, i_pos ); - vlc_mutex_lock( &p_input->stream.stream_lock ); -} + if( !b_quick ) + { + msg_Dbg( p_obj, "creating demux: access='%s' demux='%s' path='%s'", + p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path ); + } + p_demux->s = s; + p_demux->out = out; -/***************************************************************************** - * demux2_New: - *****************************************************************************/ -demux_t *__demux2_New( vlc_object_t *p_obj, - char *psz_mrl, stream_t *s, es_out_t *out ) -{ - demux_t *p_demux = vlc_object_create( p_obj, sizeof( demux_t ) ); + p_demux->pf_demux = NULL; + p_demux->pf_control = NULL; + p_demux->p_sys = NULL; + p_demux->info.i_update = 0; + p_demux->info.i_title = 0; + p_demux->info.i_seekpoint = 0; - char *psz_dup = strdup( psz_mrl ? psz_mrl : "" ); - char *psz = strchr( psz_dup, ':' ); + if( s ) psz_module = p_demux->psz_demux; + else psz_module = p_demux->psz_access; - if( p_demux == NULL ) + if( s && *psz_module == '\0' && strrchr( p_demux->psz_path, '.' ) ) { - free( psz_dup ); - return NULL; - } + /* XXX: add only file without any problem here and with strong detection. + * - no .mp3, .a52, ... (aac is added as it works only by file ext + * anyway + * - wav can't be added 'cause of a52 and dts in them as raw audio + */ + static const struct { char ext[5]; char demux[9]; } exttodemux[] = + { + { "aac", "aac" }, + { "aiff", "aiff" }, + { "asf", "asf" }, { "wmv", "asf" }, { "wma", "asf" }, + { "avi", "avi" }, + { "au", "au" }, + { "flac", "flac" }, + { "dv", "dv" }, + { "m3u", "playlist" }, + { "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" }, + { "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" }, + { "mod", "mod" }, { "xm", "mod" }, + { "nsv", "nsv" }, + { "ogg", "ogg" }, { "ogm", "ogg" }, + { "pva", "pva" }, + { "rm", "rm" }, + { "m4v", "m4v" }, + { "h264", "h264" }, + { "", "" }, + }; + /* Here, we don't mind if it does not work, it must be quick */ + static const struct { char ext[4]; char demux[5]; } exttodemux_quick[] = + { + { "mp3", "mpga" }, + { "ogg", "ogg" }, + { "wma", "asf" }, + { "", "" } + }; - /* Parse URL */ - p_demux->psz_access = NULL; - p_demux->psz_demux = NULL; - p_demux->psz_path = NULL; + const char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1; + int i; - if( psz ) - { - *psz++ = '\0'; - - if( psz[0] == '/' && psz[1] == '/' ) + if( !b_quick ) { - psz += 2; + for( i = 0; exttodemux[i].ext[0]; i++ ) + { + if( !strcasecmp( psz_ext, exttodemux[i].ext ) ) + { + psz_module = exttodemux[i].demux; + break; + } + } } - p_demux->psz_path = strdup( psz ); - - psz = strchr( psz_dup, '/' ); - if( psz ) + else { - *psz++ = '\0'; - p_demux->psz_access = strdup( psz_dup ); - p_demux->psz_demux = strdup( psz ); + for( i = 0; exttodemux_quick[i].ext[0]; i++ ) + { + if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) ) + { + psz_module = exttodemux_quick[i].demux; + break; + } + } + } } - else - { - p_demux->psz_path = strdup( psz_mrl ); - } - free( psz_dup ); + /* Before module_Need (for var_Create...) */ + vlc_object_attach( p_demux, p_obj ); - if( p_demux->psz_access == NULL ) - { - p_demux->psz_access = strdup( "" ); - } - if( p_demux->psz_demux == NULL ) + if( s ) { - p_demux->psz_demux = strdup( "" ); + /* ID3/APE tags will mess-up demuxer probing so we skip it here. + * ID3/APE parsers will called later on in the demuxer to access the + * skipped info. */ + if( !SkipID3Tag( p_demux ) ) + SkipAPETag( p_demux ); + + p_demux->p_module = + module_Need( p_demux, "demux", psz_module, + !strcmp( psz_module, p_demux->psz_demux ) ? + true : false ); } - if( p_demux->psz_path == NULL ) + else { - p_demux->psz_path = strdup( "" ); + p_demux->p_module = + module_Need( p_demux, "access_demux", psz_module, + !strcmp( psz_module, p_demux->psz_access ) ? + true : false ); } - msg_Dbg( p_obj, "demux2_New: '%s' -> access='%s' demux='%s' path='%s'", - psz_mrl, - p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path ); - - p_demux->s = s; - p_demux->out = out; - - p_demux->pf_demux = NULL; - p_demux->pf_control = NULL; - p_demux->p_sys = NULL; - /* Before module_Need (for var_Create...) */ - vlc_object_attach( p_demux, p_obj ); - - p_demux->p_module = - module_Need( p_demux, "demux2", p_demux->psz_demux, VLC_TRUE ); if( p_demux->p_module == NULL ) { vlc_object_detach( p_demux ); free( p_demux->psz_path ); free( p_demux->psz_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); return NULL; } @@ -254,9 +184,9 @@ demux_t *__demux2_New( vlc_object_t *p_obj, } /***************************************************************************** - * demux2_Delete: + * demux_Delete: *****************************************************************************/ -void demux2_Delete( demux_t *p_demux ) +void demux_Delete( demux_t *p_demux ) { module_Unneed( p_demux, p_demux->p_module ); vlc_object_detach( p_demux ); @@ -265,13 +195,13 @@ void demux2_Delete( demux_t *p_demux ) free( p_demux->psz_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); } /***************************************************************************** - * demux2_vaControlHelper: + * demux_vaControlHelper: *****************************************************************************/ -int demux2_vaControlHelper( stream_t *s, +int demux_vaControlHelper( stream_t *s, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) @@ -291,7 +221,7 @@ int demux2_vaControlHelper( stream_t *s, pi64 = (int64_t*)va_arg( args, int64_t * ); if( i_bitrate > 0 && i_end > i_start ) { - *pi64 = I64C(8000000) * (i_end - i_start) / i_bitrate; + *pi64 = INT64_C(8000000) * (i_end - i_start) / i_bitrate; return VLC_SUCCESS; } return VLC_EGENERIC; @@ -300,7 +230,7 @@ int demux2_vaControlHelper( stream_t *s, pi64 = (int64_t*)va_arg( args, int64_t * ); if( i_bitrate > 0 && i_end > i_start ) { - *pi64 = I64C(8000000) * (i_tell - i_start) / i_bitrate; + *pi64 = INT64_C(8000000) * (i_tell - i_start) / i_bitrate; return VLC_SUCCESS; } return VLC_EGENERIC; @@ -334,7 +264,7 @@ int demux2_vaControlHelper( stream_t *s, i64 = (int64_t)va_arg( args, int64_t ); if( i_bitrate > 0 && i64 >= 0 ) { - int64_t i_block = i64 * i_bitrate / I64C(8000000) / i_align; + int64_t i_block = i64 * i_bitrate / INT64_C(8000000) / i_align; if( stream_Seek( s, i_start + i_block * i_align ) ) { return VLC_EGENERIC; @@ -345,6 +275,11 @@ int demux2_vaControlHelper( stream_t *s, case DEMUX_GET_FPS: case DEMUX_GET_META: + case DEMUX_HAS_UNSUPPORTED_META: + case DEMUX_SET_NEXT_DEMUX_TIME: + case DEMUX_GET_TITLE_INFO: + case DEMUX_SET_GROUP: + case DEMUX_GET_ATTACHMENTS: return VLC_EGENERIC; default: @@ -353,3 +288,340 @@ int demux2_vaControlHelper( stream_t *s, } } +/**************************************************************************** + * stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain) + ****************************************************************************/ +typedef struct +{ + /* Data buffer */ + block_fifo_t *p_fifo; + block_t *p_block; + + int64_t i_pos; + + /* Demuxer */ + char *psz_name; + es_out_t *out; + demux_t *p_demux; + +} d_stream_sys_t; + +static int DStreamRead ( stream_t *, void *p_read, int i_read ); +static int DStreamPeek ( stream_t *, const uint8_t **pp_peek, int i_peek ); +static int DStreamControl( stream_t *, int i_query, va_list ); +static int DStreamThread ( stream_t * ); + + +stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux, + es_out_t *out ) +{ + /* We create a stream reader, and launch a thread */ + stream_t *s; + d_stream_sys_t *p_sys; + + if( psz_demux == NULL || *psz_demux == '\0' ) return NULL; + + s = vlc_stream_create( p_obj ); + if( s == NULL ) + return NULL; + s->pf_read = DStreamRead; + s->pf_peek = DStreamPeek; + s->pf_control= DStreamControl; + + s->i_char_width = 1; + s->b_little_endian = false; + + s->p_sys = malloc( sizeof( d_stream_sys_t) ); + if( s->p_sys == NULL ) + { + vlc_object_release( s ); + return NULL; + } + p_sys = (d_stream_sys_t*)s->p_sys; + + p_sys->i_pos = 0; + p_sys->out = out; + p_sys->p_demux = NULL; + p_sys->p_block = NULL; + p_sys->psz_name = strdup( psz_demux ); + + /* decoder fifo */ + if( ( p_sys->p_fifo = block_FifoNew() ) == NULL ) + { + vlc_object_release( s ); + free( p_sys->psz_name ); + free( p_sys ); + return NULL; + } + + if( vlc_thread_create( s, "stream out", DStreamThread, + VLC_THREAD_PRIORITY_INPUT, false ) ) + { + vlc_object_release( s ); + free( p_sys->psz_name ); + free( p_sys ); + return NULL; + } + + return s; +} + +void stream_DemuxSend( stream_t *s, block_t *p_block ) +{ + d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + if( p_block ) block_FifoPut( p_sys->p_fifo, p_block ); +} + +void stream_DemuxDelete( stream_t *s ) +{ + d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + block_t *p_empty; + + vlc_object_kill( s ); + if( p_sys->p_demux ) + vlc_object_kill( p_sys->p_demux ); + p_empty = block_New( s, 1 ); p_empty->i_buffer = 0; + block_FifoPut( p_sys->p_fifo, p_empty ); + vlc_thread_join( s ); + + if( p_sys->p_demux ) demux_Delete( p_sys->p_demux ); + if( p_sys->p_block ) block_Release( p_sys->p_block ); + + block_FifoRelease( p_sys->p_fifo ); + free( p_sys->psz_name ); + free( p_sys ); + + vlc_object_release( s ); +} + + +static int DStreamRead( stream_t *s, void *p_read, int i_read ) +{ + d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + uint8_t *p_out = p_read; + int i_out = 0; + + //msg_Dbg( s, "DStreamRead: wanted %d bytes", i_read ); + + while( !s->b_die && !s->b_error && i_read ) + { + block_t *p_block = p_sys->p_block; + int i_copy; + + if( !p_block ) + { + p_block = block_FifoGet( p_sys->p_fifo ); + if( !p_block ) s->b_error = 1; + p_sys->p_block = p_block; + } + + if( p_block && i_read ) + { + i_copy = __MIN( i_read, p_block->i_buffer ); + if( p_out && i_copy ) memcpy( p_out, p_block->p_buffer, i_copy ); + i_read -= i_copy; + i_out += i_copy; + p_block->i_buffer -= i_copy; + p_block->p_buffer += i_copy; + + if( !p_block->i_buffer ) + { + block_Release( p_block ); + p_sys->p_block = NULL; + } + } + } + + p_sys->i_pos += i_out; + return i_out; +} + +static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, int i_peek ) +{ + d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + block_t **pp_block = &p_sys->p_block; + int i_out = 0; + *pp_peek = 0; + + //msg_Dbg( s, "DStreamPeek: wanted %d bytes", i_peek ); + + while( !s->b_die && !s->b_error && i_peek ) + { + int i_copy; + + if( !*pp_block ) + { + *pp_block = block_FifoGet( p_sys->p_fifo ); + if( !*pp_block ) s->b_error = 1; + } + + if( *pp_block && i_peek ) + { + i_copy = __MIN( i_peek, (*pp_block)->i_buffer ); + i_peek -= i_copy; + i_out += i_copy; + + if( i_peek ) pp_block = &(*pp_block)->p_next; + } + } + + if( p_sys->p_block ) + { + p_sys->p_block = block_ChainGather( p_sys->p_block ); + *pp_peek = p_sys->p_block->p_buffer; + } + + return i_out; +} + +static int DStreamControl( stream_t *s, int i_query, va_list args ) +{ + d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + int64_t *p_i64; + bool *p_b; + int *p_int; + + switch( i_query ) + { + case STREAM_GET_SIZE: + p_i64 = (int64_t*) va_arg( args, int64_t * ); + *p_i64 = 0; + return VLC_SUCCESS; + + case STREAM_CAN_SEEK: + p_b = (bool*) va_arg( args, bool * ); + *p_b = false; + return VLC_SUCCESS; + + case STREAM_CAN_FASTSEEK: + p_b = (bool*) va_arg( args, bool * ); + *p_b = false; + return VLC_SUCCESS; + + case STREAM_GET_POSITION: + p_i64 = (int64_t*) va_arg( args, int64_t * ); + *p_i64 = p_sys->i_pos; + return VLC_SUCCESS; + + case STREAM_SET_POSITION: + { + int64_t i64 = (int64_t)va_arg( args, int64_t ); + int i_skip; + if( i64 < p_sys->i_pos ) return VLC_EGENERIC; + i_skip = i64 - p_sys->i_pos; + + while( i_skip > 0 ) + { + int i_read = DStreamRead( s, NULL, i_skip ); + if( i_read <= 0 ) return VLC_EGENERIC; + i_skip -= i_read; + } + return VLC_SUCCESS; + } + + case STREAM_GET_MTU: + p_int = (int*) va_arg( args, int * ); + *p_int = 0; + return VLC_SUCCESS; + + case STREAM_CONTROL_ACCESS: + case STREAM_GET_CONTENT_TYPE: + return VLC_EGENERIC; + + default: + msg_Err( s, "invalid DStreamControl query=0x%x", i_query ); + return VLC_EGENERIC; + } +} + +static int DStreamThread( stream_t *s ) +{ + d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + demux_t *p_demux; + + /* Create the demuxer */ + if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out, + false )) ) + { + return VLC_EGENERIC; + } + + p_sys->p_demux = p_demux; + + /* Main loop */ + while( !s->b_die && !p_demux->b_die ) + { + if( p_demux->pf_demux( p_demux ) <= 0 ) break; + } + + vlc_object_kill( p_demux ); + return VLC_SUCCESS; +} + +/**************************************************************************** + * Utility functions + ****************************************************************************/ +static bool SkipID3Tag( demux_t *p_demux ) +{ + const uint8_t *p_peek; + uint8_t version, revision; + int i_size; + int b_footer; + + if( !p_demux->s ) + return false; + + /* Get 10 byte id3 header */ + if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) + return false; + + if( memcmp( p_peek, "ID3", 3 ) ) + return false; + + version = p_peek[3]; + revision = p_peek[4]; + b_footer = p_peek[5] & 0x10; + i_size = (p_peek[6]<<21) + (p_peek[7]<<14) + (p_peek[8]<<7) + p_peek[9]; + + if( b_footer ) i_size += 10; + i_size += 10; + + /* Skip the entire tag */ + stream_Read( p_demux->s, NULL, i_size ); + + msg_Dbg( p_demux, "ID3v2.%d revision %d tag found, skipping %d bytes", + version, revision, i_size ); + return true; +} +static bool SkipAPETag( demux_t *p_demux ) +{ + const uint8_t *p_peek; + int i_version; + int i_size; + uint32_t flags; + + if( !p_demux->s ) + return false; + + /* Get 32 byte ape header */ + if( stream_Peek( p_demux->s, &p_peek, 32 ) < 32 ) + return false; + + if( memcmp( p_peek, "APETAGEX", 8 ) ) + return false; + + i_version = GetDWLE( &p_peek[8] ); + flags = GetDWLE( &p_peek[8+4+4] ); + if( ( i_version != 1000 && i_version != 2000 ) || !( flags & (1<<29) ) ) + return false; + + i_size = GetDWLE( &p_peek[8+4] ) + ( (flags&(1<<30)) ? 32 : 0 ); + + /* Skip the entire tag */ + stream_Read( p_demux->s, NULL, i_size ); + + msg_Dbg( p_demux, "AP2 v%d tag found, skipping %d bytes", + i_version/1000, i_size ); + return true; +} +