X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=981799ff2d7da30693b11f4065824f186f64c405;hb=a61cb21fd61350444abc09c91b55c16d7a4a64cb;hp=2712f96d0064706dc6798cde3dfa358a142f56cd;hpb=40785cad487daf4df6418b07f28bdd03d1ca3f03;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index 2712f96d00..981799ff2d 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -21,37 +21,48 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "input_internal.h" +#include "demux.h" +#include +#include +#include -static void SkipID3Tag( demux_t * ); +static bool SkipID3Tag( demux_t * ); +static bool SkipAPETag( demux_t *p_demux ); /***************************************************************************** - * demux2_New: + * demux_New: * if s is NULL then load a access_demux *****************************************************************************/ -demux_t *__demux2_New( vlc_object_t *p_obj, +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, vlc_bool_t b_quick ) + stream_t *s, es_out_t *out, bool b_quick ) { - demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX ); + 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; + 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 ); /* Take into account "demux" to be able to do :demux=dump */ - if( *p_demux->psz_demux == '\0' ) + 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( "" ); } if( !b_quick ) @@ -89,16 +100,21 @@ demux_t *__demux2_New( vlc_object_t *p_obj, { "au", "au" }, { "flac", "flac" }, { "dv", "dv" }, - { "m3u", "playlist" }, + { "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" }, { "m4v", "m4v" }, - { "h264", "h264" }, + { "h264", "h264" }, + { "voc", "voc" }, + { "mid", "smf" }, { "rmi", "smf" }, { "", "" }, }; /* Here, we don't mind if it does not work, it must be quick */ @@ -138,36 +154,34 @@ demux_t *__demux2_New( vlc_object_t *p_obj, } } - /* Before module_Need (for var_Create...) */ + /* Before module_need (for var_Create...) */ vlc_object_attach( p_demux, p_obj ); if( s ) { - /* ID3 tags will mess-up demuxer probing so we skip it here. - * ID3 parsers will called later on in the demuxer to access the + /* 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. */ - SkipID3Tag( p_demux ); + 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_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); return NULL; } @@ -175,26 +189,34 @@ 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_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); } /***************************************************************************** - * demux2_vaControlHelper: + * 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; +} + + +/***************************************************************************** + * 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; @@ -212,16 +234,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; @@ -255,7 +277,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; @@ -266,10 +288,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: @@ -279,283 +304,67 @@ int demux2_vaControlHelper( stream_t *s, } /**************************************************************************** - * stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain) + * Utility functions ****************************************************************************/ -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 ) +decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) { - /* 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 ); - s->pf_block = NULL; - s->pf_read = DStreamRead; - s->pf_peek = DStreamPeek; - s->pf_control= DStreamControl; - - s->i_char_width = 1; - s->b_little_endian = VLC_FALSE; - - s->p_sys = malloc( sizeof( d_stream_sys_t) ); - 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( s ) ) == NULL ) + decoder_t *p_packetizer; + p_packetizer = vlc_custom_create( p_demux, sizeof( *p_packetizer ), + VLC_OBJECT_GENERIC, "demux packetizer" ); + if( !p_packetizer ) { - msg_Err( s, "out of memory" ); - vlc_object_destroy( s ); - free( p_sys ); + es_format_Clean( p_fmt ); return NULL; } + p_fmt->b_packetized = false; - if( vlc_thread_create( s, "stream out", DStreamThread, - VLC_THREAD_PRIORITY_INPUT, VLC_FALSE ) ) - { - vlc_object_destroy( s ); - free( p_sys ); - return NULL; - } + p_packetizer->pf_decode_audio = NULL; + p_packetizer->pf_decode_video = NULL; + p_packetizer->pf_decode_sub = NULL; + p_packetizer->pf_packetize = NULL; - return s; -} + p_packetizer->fmt_in = *p_fmt; + es_format_Init( &p_packetizer->fmt_out, UNKNOWN_ES, 0 ); -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 ) demux2_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_destroy( 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 ) + vlc_object_attach( p_packetizer, p_demux ); + p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, false ); + if( !p_packetizer->p_module ) { - 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; + es_format_Clean( p_fmt ); + vlc_object_release( p_packetizer ); + msg_Err( p_demux, "cannot find packetizer for %s", psz_msg ); + return NULL; } - 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; - 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; - - case STREAM_CONTROL_ACCESS: - return VLC_EGENERIC; - - default: - msg_Err( s, "invalid DStreamControl query=0x%x", i_query ); - return VLC_EGENERIC; - } + return p_packetizer; } -static int DStreamThread( stream_t *s ) +void demux_PacketizerDestroy( decoder_t *p_packetizer ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - demux_t *p_demux; - - /* Create the demuxer */ - if( !(p_demux = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out, - VLC_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; + 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 ); } -/**************************************************************************** - * Utility functions - ****************************************************************************/ -static void SkipID3Tag( demux_t *p_demux ) +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; + if( !p_demux->s ) + return false; /* Get 10 byte id3 header */ - if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return; + if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) + return false; - if( p_peek[0] != 'I' || p_peek[1] != 'D' || p_peek[2] != '3' ) return; + if( memcmp( p_peek, "ID3", 3 ) ) + return false; version = p_peek[3]; revision = p_peek[4]; @@ -570,6 +379,37 @@ static void SkipID3Tag( demux_t *p_demux ) 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; - return; + 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; } +