X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=675da9c1d5f57bf21d73f6e7acf6043e981a5e62;hb=a9121588115a890ada660c45a5cec0a750153a62;hp=d6c2e3f40ed8f0c261f7800dee675cf6427065b9;hpb=bf0e0e611cf75362f69d278a7b886617ae234204;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index d6c2e3f40e..675da9c1d5 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -1,7 +1,7 @@ /***************************************************************************** * demux.c ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN + * Copyright (C) 1999-2004 the VideoLAN team * $Id$ * * Author: Laurent Aimar @@ -18,45 +18,78 @@ * * 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 "demux.h" +#include +#include +#include +#include + +static bool SkipID3Tag( demux_t * ); +static bool SkipAPETag( demux_t *p_demux ); + +/* Decode URL (which has had its scheme stripped earlier) to a file path. */ +/* XXX: evil code duplication from access.c */ +static char *get_path(const char *location) +{ + char *url, *path; + + /* Prepending "file://" is a bit hackish. But then again, we do not want + * to hard-code the list of schemes that use file paths in make_path(). + */ + if (asprintf(&url, "file://%s", location) == -1) + return NULL; + + path = make_path (url); + free (url); + return path; +} -#include "input_internal.h" /***************************************************************************** - * demux2_New: + * demux_New: * if s is NULL then load a access_demux *****************************************************************************/ -demux_t *__demux2_New( vlc_object_t *p_obj, - char *psz_access, char *psz_demux, char *psz_path, - stream_t *s, es_out_t *out ) +demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, + const char *psz_access, const char *psz_demux, + const char *psz_location, + stream_t *s, es_out_t *out, bool b_quick ) { - demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX ); - char *psz_module; + 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; - if( p_demux == NULL ) - { - return NULL; - } + if( p_demux == NULL ) return NULL; + + p_demux->p_input = p_parent_input; /* Parse URL */ p_demux->psz_access = strdup( psz_access ); p_demux->psz_demux = strdup( psz_demux ); - p_demux->psz_path = strdup( psz_path ); + p_demux->psz_location = strdup( psz_location ); + p_demux->psz_file = get_path( psz_location ); - /* Take into account "demux" to be able to do :demux=demuxdump */ - if( *p_demux->psz_demux == '\0' ) + /* 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_GetString( p_obj, "demux" ); + p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" ); + if( p_demux->psz_demux == NULL ) + p_demux->psz_demux = strdup( "" ); } - msg_Dbg( p_obj, "demux2_New: access='%s' demux='%s' path='%s'", - p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path ); + if( !b_quick ) + msg_Dbg( p_obj, "creating demux: access='%s' demux='%s' " + "location='%s' file='%s'", + p_demux->psz_access, p_demux->psz_demux, + p_demux->psz_location, p_demux->psz_file ); p_demux->s = s; p_demux->out = out; @@ -68,19 +101,22 @@ demux_t *__demux2_New( vlc_object_t *p_obj, p_demux->info.i_title = 0; p_demux->info.i_seekpoint = 0; - if( s ) - psz_module = p_demux->psz_demux; - else - psz_module = p_demux->psz_access; + if( s ) psz_module = p_demux->psz_demux; + else psz_module = p_demux->psz_access; + + const char *psz_ext; - if( s && *psz_module == '\0' && strrchr( p_demux->psz_path, '.' ) ) + if( s && *psz_module == '\0' + && p_demux->psz_file != NULL + && (psz_ext = strrchr( p_demux->psz_file, '.' )) ) { - /* 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 + /* 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 struct { char *ext; char *demux; } exttodemux[] = - { + static const struct { char ext[5]; char demux[9]; } exttodemux[] = + { { "aac", "aac" }, { "aiff", "aiff" }, { "asf", "asf" }, { "wmv", "asf" }, { "wma", "asf" }, @@ -88,55 +124,88 @@ demux_t *__demux2_New( vlc_object_t *p_obj, { "au", "au" }, { "flac", "flac" }, { "dv", "dv" }, + { "drc", "dirac" }, { "m3u", "m3u" }, + { "m3u8", "m3u8" }, { "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" }, { "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" }, - { "mod", "mod" }, { "xm", "mod" }, { "nsv", "nsv" }, - { "ogg", "ogg" }, { "ogm", "ogg" }, + { "ogg", "ogg" }, { "ogm", "ogg" }, /* legacy Ogg */ + { "oga", "ogg" }, { "spx", "ogg" }, { "ogv", "ogg" }, + { "ogx", "ogg" }, /*RFC5334*/ { "pva", "pva" }, { "rm", "rm" }, - { NULL, NULL }, + { "m4v", "m4v" }, + { "h264", "h264" }, + { "voc", "voc" }, + { "mid", "smf" }, { "rmi", "smf" }, + { "", "" }, + }; + /* 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" }, + { "", "" } }; - char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1; - int i; + psz_ext++; // skip '.' - for( i = 0; exttodemux[i].ext != NULL; i++ ) + if( !b_quick ) + { + for( unsigned i = 0; exttodemux[i].ext[0]; i++ ) + { + if( !strcasecmp( psz_ext, exttodemux[i].ext ) ) + { + psz_module = exttodemux[i].demux; + break; + } + } + } + else { - if( !strcasecmp( psz_ext, exttodemux[i].ext ) ) + for( unsigned i = 0; exttodemux_quick[i].ext[0]; i++ ) { - psz_module = exttodemux[i].demux; - break; + if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) ) + { + psz_module = exttodemux_quick[i].demux; + break; + } } + } } - /* Before module_Need (for var_Create...) */ + /* Before module_need (for var_Create...) */ vlc_object_attach( p_demux, p_obj ); if( s ) { + /* 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, "demux2", psz_module, - !strcmp( psz_module, p_demux->psz_demux ) ? - VLC_TRUE : VLC_FALSE ); + module_need( p_demux, "demux", psz_module, + !strcmp( psz_module, p_demux->psz_demux ) ); } else { p_demux->p_module = - module_Need( p_demux, "access_demux", psz_module, - !strcmp( psz_module, p_demux->psz_access ) ? - VLC_TRUE : VLC_FALSE ); + module_need( p_demux, "access_demux", psz_module, + !strcmp( psz_module, p_demux->psz_access ) ); } if( p_demux->p_module == NULL ) { - vlc_object_detach( p_demux ); - free( p_demux->psz_path ); + free( p_demux->psz_file ); + free( p_demux->psz_location ); free( p_demux->psz_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); return NULL; } @@ -144,26 +213,35 @@ 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 ); + module_unneed( p_demux, p_demux->p_module ); - free( p_demux->psz_path ); + free( p_demux->psz_file ); + free( p_demux->psz_location ); free( p_demux->psz_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); +} + +/***************************************************************************** + * demux_GetParentInput: + *****************************************************************************/ +input_thread_t * demux_GetParentInput( demux_t *p_demux ) +{ + return p_demux->p_input ? vlc_object_hold((vlc_object_t*)p_demux->p_input) : NULL; } + /***************************************************************************** - * 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, + int64_t i_bitrate, int i_align, int i_query, va_list args ) { int64_t i_tell; @@ -181,16 +259,16 @@ 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; case DEMUX_GET_TIME: pi64 = (int64_t*)va_arg( args, int64_t * ); - if( i_bitrate > 0 && i_end > i_start ) + if( i_bitrate > 0 && i_tell >= 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; @@ -224,7 +302,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; @@ -235,9 +313,13 @@ 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: + case DEMUX_CAN_RECORD: + case DEMUX_SET_RECORD_STATE: return VLC_EGENERIC; default: @@ -247,266 +329,112 @@ int demux2_vaControlHelper( stream_t *s, } /**************************************************************************** - * stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain) + * Utility functions ****************************************************************************/ -typedef struct +decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) { - /* Data buffer */ - vlc_mutex_t lock; - int i_buffer; - int i_buffer_size; - uint8_t *p_buffer; - - 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 *, 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, 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_object_create( p_obj, VLC_OBJECT_STREAM ); - s->pf_block = NULL; - s->pf_read = DStreamRead; - s->pf_peek = DStreamPeek; - s->pf_control= DStreamControl; - - s->p_sys = malloc( sizeof( d_stream_sys_t) ); - p_sys = (d_stream_sys_t*)s->p_sys; - - vlc_mutex_init( s, &p_sys->lock ); - p_sys->i_buffer = 0; - p_sys->i_buffer_size = 1000000; - p_sys->p_buffer = malloc( p_sys->i_buffer_size ); - p_sys->i_pos = 0; - p_sys->psz_name = strdup( psz_demux ); - p_sys->out = out; - p_sys->p_demux = NULL; - - if( vlc_thread_create( s, "stream out", DStreamThread, - VLC_THREAD_PRIORITY_INPUT, VLC_FALSE ) ) + decoder_t *p_packetizer; + p_packetizer = vlc_custom_create( p_demux, sizeof( *p_packetizer ), + VLC_OBJECT_GENERIC, "demux packetizer" ); + if( !p_packetizer ) { - vlc_mutex_destroy( &p_sys->lock ); - vlc_object_destroy( s ); - free( p_sys ); + es_format_Clean( p_fmt ); return NULL; } + p_fmt->b_packetized = false; - return s; -} + p_packetizer->pf_decode_audio = NULL; + p_packetizer->pf_decode_video = NULL; + p_packetizer->pf_decode_sub = NULL; + p_packetizer->pf_packetize = NULL; -void stream_DemuxSend( stream_t *s, block_t *p_block ) -{ - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + p_packetizer->fmt_in = *p_fmt; + es_format_Init( &p_packetizer->fmt_out, UNKNOWN_ES, 0 ); - if( p_block->i_buffer > 0 ) + vlc_object_attach( p_packetizer, p_demux ); + p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, false ); + if( !p_packetizer->p_module ) { - vlc_mutex_lock( &p_sys->lock ); - - /* Realloc if needed */ - if( p_sys->i_buffer + p_block->i_buffer > p_sys->i_buffer_size ) - { - if( p_sys->i_buffer_size > 5000000 ) - { - vlc_mutex_unlock( &p_sys->lock ); - msg_Err( s, "stream_DemuxSend: buffer size > 5000000" ); - block_Release( p_block ); - return; - } - /* I know, it's more than needed but that's perfect */ - p_sys->i_buffer_size += p_block->i_buffer; - /* FIXME won't work with PEEK -> segfault */ - p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size ); - msg_Dbg( s, "stream_DemuxSend: realloc to %d", - p_sys->i_buffer_size ); - } - - /* copy data */ - memcpy( &p_sys->p_buffer[p_sys->i_buffer], p_block->p_buffer, - p_block->i_buffer ); - p_sys->i_buffer += p_block->i_buffer; - - vlc_mutex_unlock( &p_sys->lock ); + es_format_Clean( p_fmt ); + vlc_object_release( p_packetizer ); + msg_Err( p_demux, "cannot find packetizer for %s", psz_msg ); + return NULL; } - block_Release( p_block ); + return p_packetizer; } -void stream_DemuxDelete( stream_t *s ) +void demux_PacketizerDestroy( decoder_t *p_packetizer ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - - s->b_die = VLC_TRUE; - - vlc_mutex_lock( &p_sys->lock ); - if( p_sys->p_demux ) p_sys->p_demux->b_die = VLC_TRUE; - vlc_mutex_unlock( &p_sys->lock ); - - vlc_thread_join( s ); - - if( p_sys->p_demux ) demux2_Delete( p_sys->p_demux ); - vlc_mutex_destroy( &p_sys->lock ); - free( p_sys->psz_name ); - free( p_sys->p_buffer ); - free( p_sys ); - vlc_object_destroy( s ); + if( p_packetizer->p_module ) + module_unneed( p_packetizer, p_packetizer->p_module ); + es_format_Clean( &p_packetizer->fmt_in ); + if( p_packetizer->p_description ) + vlc_meta_Delete( p_packetizer->p_description ); + vlc_object_release( p_packetizer ); } - -static int DStreamRead( stream_t *s, void *p_read, int i_read ) +static bool SkipID3Tag( demux_t *p_demux ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - int i_copy; + const uint8_t *p_peek; + uint8_t version, revision; + int i_size; + int b_footer; - //msg_Dbg( s, "DStreamRead: wanted %d bytes", i_read ); - for( ;; ) - { - vlc_mutex_lock( &p_sys->lock ); - //msg_Dbg( s, "DStreamRead: buffer %d", p_sys->i_buffer ); - if( p_sys->i_buffer >= i_read || s->b_die ) break; - vlc_mutex_unlock( &p_sys->lock ); - msleep( 10000 ); - } + if( !p_demux->s ) + return false; - //msg_Dbg( s, "DStreamRead: read %d buffer %d", i_read, p_sys->i_buffer ); + /* Get 10 byte id3 header */ + if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) + return false; - i_copy = __MIN( i_read, p_sys->i_buffer ); - if( i_copy > 0 ) - { - if( p_read ) memcpy( p_read, p_sys->p_buffer, i_copy ); + if( memcmp( p_peek, "ID3", 3 ) ) + return false; - p_sys->i_buffer -= i_copy; - p_sys->i_pos += i_copy; + 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( p_sys->i_buffer > 0 ) - { - memmove( p_sys->p_buffer, &p_sys->p_buffer[i_copy], - p_sys->i_buffer ); - } - } - vlc_mutex_unlock( &p_sys->lock ); + if( b_footer ) i_size += 10; + i_size += 10; - return i_copy; -} - -static int DStreamPeek( stream_t *s, uint8_t **pp_peek, int i_peek ) -{ - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - int i_copy; - - //msg_Dbg( s, "DStreamPeek: wanted %d bytes", i_peek ); - for( ;; ) - { - vlc_mutex_lock( &p_sys->lock ); - //msg_Dbg( s, "DStreamPeek: buffer %d", p_sys->i_buffer ); - if( p_sys->i_buffer >= i_peek || s->b_die ) break; - vlc_mutex_unlock( &p_sys->lock ); - msleep( 10000 ); - } - *pp_peek = p_sys->p_buffer; - i_copy = __MIN( i_peek, p_sys->i_buffer ); + /* Skip the entire tag */ + stream_Read( p_demux->s, NULL, i_size ); - vlc_mutex_unlock( &p_sys->lock ); - - return i_copy; + msg_Dbg( p_demux, "ID3v2.%d revision %d tag found, skipping %d bytes", + version, revision, i_size ); + return true; } - -static int DStreamControl( stream_t *s, int i_query, va_list args ) +static bool SkipAPETag( demux_t *p_demux ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - int64_t *p_i64; - vlc_bool_t *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 = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); - *p_b = VLC_FALSE; - return VLC_SUCCESS; - - case STREAM_CAN_FASTSEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); - *p_b = VLC_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; + const uint8_t *p_peek; + int i_version; + int i_size; + uint32_t flags; - case STREAM_CONTROL_ACCESS: - return VLC_EGENERIC; + if( !p_demux->s ) + return false; - default: - msg_Err( s, "invalid DStreamControl query=0x%x", i_query ); - return VLC_EGENERIC; - } -} + /* Get 32 byte ape header */ + if( stream_Peek( p_demux->s, &p_peek, 32 ) < 32 ) + return false; -static int DStreamThread( stream_t *s ) -{ - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - demux_t *p_demux; + if( memcmp( p_peek, "APETAGEX", 8 ) ) + return false; - /* Create the demuxer */ - if( !(p_demux = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out )) ) - { - return VLC_EGENERIC; - } + 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; - vlc_mutex_lock( &p_sys->lock ); - p_sys->p_demux = p_demux; - vlc_mutex_unlock( &p_sys->lock ); + i_size = GetDWLE( &p_peek[8+4] ) + ( (flags&(1<<30)) ? 32 : 0 ); - /* Main loop */ - while( !s->b_die && !p_demux->b_die ) - { - if( p_demux->pf_demux( p_demux ) <= 0 ) break; - } + /* Skip the entire tag */ + stream_Read( p_demux->s, NULL, i_size ); - p_demux->b_die = VLC_TRUE; - return VLC_SUCCESS; + msg_Dbg( p_demux, "AP2 v%d tag found, skipping %d bytes", + i_version/1000, i_size ); + return true; } +