# include "config.h"
#endif
-#include <vlc_common.h>
-#include <vlc_codec.h>
-
-#include "input_internal.h"
#include "demux.h"
+#include <libvlc.h>
+#include <vlc_codec.h>
+#include <vlc_meta.h>
+#include <vlc_url.h>
+#include <vlc_modules.h>
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;
+}
+
+
/*****************************************************************************
* demux_New:
* if s is NULL then load a access_demux
*****************************************************************************/
-demux_t *__demux_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,
+ const char *psz_location,
stream_t *s, es_out_t *out, bool b_quick )
{
static const char typename[] = "demux";
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=dump */
if( p_demux->psz_demux && *p_demux->psz_demux == '\0' )
}
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 );
- }
+ 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;
if( s ) psz_module = p_demux->psz_demux;
else psz_module = p_demux->psz_access;
- if( s && *psz_module == '\0' && strrchr( p_demux->psz_path, '.' ) )
+ const char *psz_ext;
+
+ 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
{ "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" },
{ "voc", "voc" },
- { "mid", "smf" },
- { "rmi", "smf" },
+ { "mid", "smf" }, { "rmi", "smf" },
{ "", "" },
};
/* Here, we don't mind if it does not work, it must be quick */
{ "", "" }
};
- const char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1;
- int i;
+ psz_ext++; // skip '.'
if( !b_quick )
{
- for( i = 0; exttodemux[i].ext[0]; i++ )
+ for( unsigned i = 0; exttodemux[i].ext[0]; i++ )
{
if( !strcasecmp( psz_ext, exttodemux[i].ext ) )
{
}
else
{
- for( i = 0; exttodemux_quick[i].ext[0]; i++ )
+ for( unsigned i = 0; exttodemux_quick[i].ext[0]; i++ )
{
if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) )
{
p_demux->p_module =
module_need( p_demux, "demux", psz_module,
- !strcmp( psz_module, p_demux->psz_demux ) ?
- true : false );
+ !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 ) ?
- true : false );
+ !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_release( p_demux );
void demux_Delete( demux_t *p_demux )
{
module_unneed( p_demux, p_demux->p_module );
- 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_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;
+}
+
+
/*****************************************************************************
* 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;
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 = INT64_C(8000000) * (i_tell - i_start) / i_bitrate;
return VLC_SUCCESS;
}
}
-/****************************************************************************
- * 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, unsigned int i_read );
-static int DStreamPeek ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
-static int DStreamControl( stream_t *, int i_query, va_list );
-static void* DStreamThread ( vlc_object_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;
-
- 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, unsigned 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, unsigned 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, (long)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:
- case STREAM_SET_RECORD_STATE:
- return VLC_EGENERIC;
-
- default:
- msg_Err( s, "invalid DStreamControl query=0x%x", i_query );
- return VLC_EGENERIC;
- }
-}
-
-static void* DStreamThread( vlc_object_t* p_this )
-{
- stream_t *s = (stream_t *)p_this;
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
- demux_t *p_demux;
- int canc = vlc_savecancel ();
-
- /* Create the demuxer */
- if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
- false )) )
- {
- return NULL;
- }
-
- 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_restorecancel (canc);
- vlc_object_kill( p_demux );
- return NULL;
-}
-
/****************************************************************************
* 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_PACKETIZER );
-
+ decoder_t *p_packetizer;
+ p_packetizer = vlc_custom_create( p_demux, sizeof( *p_packetizer ),
+ VLC_OBJECT_GENERIC, "demux packetizer" );
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->fmt_in = *p_fmt;
es_format_Init( &p_packetizer->fmt_out, UNKNOWN_ES, 0 );
- p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, 0 );
+ vlc_object_attach( p_packetizer, p_demux );
+ p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, false );
if( !p_packetizer->p_module )
{
es_format_Clean( p_fmt );
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 );
}
projects / vlc / blobdiff