X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=d2cddb22e46c5101ab29a3f53e66221fee92275a;hb=d9a43b404dd9fcfb1df775b5ffbe975e3508a752;hp=5b320255d72d8a9c3ee71c6fa064cdecc11551e2;hpb=90c26e78821c74c2c940d957f475c3b49a1f82f3;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index 5b320255d7..d2cddb22e4 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.12 2004/03/03 12:01:38 fenrir Exp $ + * Copyright (C) 1999-2004 the VideoLAN team + * $Id$ * * Author: Laurent Aimar * @@ -18,234 +18,173 @@ * * 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 "demux.h" +#include +#include +#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; -} +static bool SkipID3Tag( demux_t * ); +static bool SkipAPETag( demux_t *p_demux ); -int demux_Control( input_thread_t *p_input, int i_query, ... ) +/***************************************************************************** + * demux_New: + * if s is NULL then load a access_demux + *****************************************************************************/ +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_path, + stream_t *s, es_out_t *out, bool b_quick ) { - va_list args; - int i_result; - - va_start( args, i_query ); - i_result = demux_vaControl( p_input, i_query, args ); - va_end( args ); + 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; - return i_result; -} + if( p_demux == NULL ) return NULL; -static void SeekOffset( input_thread_t *p_input, int64_t i_pos ); + p_demux->p_input = p_parent_input; -int demux_vaControlDefault( input_thread_t *p_input, int i_query, - va_list args ) -{ - int i_ret; - double f, *pf; - int64_t i64, *pi64; + /* Parse URL */ + p_demux->psz_access = strdup( psz_access ); + p_demux->psz_demux = strdup( psz_demux ); + p_demux->psz_path = strdup( psz_path ); - vlc_mutex_lock( &p_input->stream.stream_lock ); - switch( i_query ) + /* Take into account "demux" to be able to do :demux=dump */ + if( p_demux->psz_demux && *p_demux->psz_demux == '\0' ) { - 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; - - 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; - - 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; - - default: - msg_Err( p_input, "unknown query in demux_vaControlDefault" ); - i_ret = VLC_EGENERIC; - break; + 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; - } - - /* Parse URL */ - p_demux->psz_access = NULL; - p_demux->psz_demux = NULL; - p_demux->psz_path = 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" }, + { "drc", "dirac" }, + { "m3u", "m3u" }, + { "m3u8", "m3u8" }, + { "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" }, + { "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" }, + { "nsv", "nsv" }, + { "ogg", "ogg" }, { "ogm", "ogg" }, /* legacy Ogg */ + { "oga", "ogg" }, { "spx", "ogg" }, { "ogv", "ogg" }, + { "ogx", "ogg" }, /*RFC5334*/ + { "pva", "pva" }, + { "rm", "rm" }, + { "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" }, + { "", "" } + }; - if( psz ) - { - *psz++ = '\0'; + const char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1; + int i; - 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 ); 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; } @@ -253,26 +192,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 ); + module_unneed( p_demux, p_demux->p_module ); 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 ); } /***************************************************************************** - * demux2_vaControlHelper: + * demux_GetParentInput: *****************************************************************************/ -int demux2_vaControlHelper( stream_t *s, +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; +} + + +/***************************************************************************** + * demux_vaControlHelper: + *****************************************************************************/ +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; @@ -290,16 +238,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; @@ -333,7 +281,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; @@ -344,6 +292,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: @@ -352,3 +307,111 @@ int demux2_vaControlHelper( stream_t *s, } } +/**************************************************************************** + * Utility functions + ****************************************************************************/ +decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) +{ + decoder_t *p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_DECODER ); + + if( !p_packetizer ) + { + es_format_Clean( p_fmt ); + return NULL; + } + p_fmt->b_packetized = false; + + p_packetizer->pf_decode_audio = NULL; + p_packetizer->pf_decode_video = NULL; + p_packetizer->pf_decode_sub = NULL; + p_packetizer->pf_packetize = NULL; + + p_packetizer->fmt_in = *p_fmt; + es_format_Init( &p_packetizer->fmt_out, UNKNOWN_ES, 0 ); + + p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, false ); + if( !p_packetizer->p_module ) + { + es_format_Clean( p_fmt ); + vlc_object_release( p_packetizer ); + msg_Err( p_demux, "cannot find packetizer for %s", psz_msg ); + return NULL; + } + + return p_packetizer; +} + +void demux_PacketizerDestroy( decoder_t *p_packetizer ) +{ + 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 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; +} +