* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_codec.h>
#include "input_internal.h"
-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,
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->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 )
}
}
- /* 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,
+ module_need( p_demux, "demux", psz_module,
!strcmp( psz_module, p_demux->psz_demux ) ?
- VLC_TRUE : VLC_FALSE );
+ true : false );
}
else
{
p_demux->p_module =
- module_Need( p_demux, "access_demux", psz_module,
+ module_need( p_demux, "access_demux", psz_module,
!strcmp( psz_module, p_demux->psz_access ) ?
- VLC_TRUE : VLC_FALSE );
+ true : false );
}
if( p_demux->p_module == NULL )
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;
}
}
/*****************************************************************************
- * 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_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 )
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;
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;
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;
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:
} 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 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 int DStreamThread ( stream_t * );
+static void* DStreamThread ( vlc_object_t * );
stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
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 = VLC_FALSE;
+ 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->psz_name = strdup( psz_demux );
/* decoder fifo */
- if( ( p_sys->p_fifo = block_FifoNew( s ) ) == NULL )
+ if( ( p_sys->p_fifo = block_FifoNew() ) == NULL )
{
- msg_Err( s, "out of memory" );
- vlc_object_destroy( s );
+ 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, VLC_FALSE ) )
+ VLC_THREAD_PRIORITY_INPUT, false ) )
{
- vlc_object_destroy( s );
+ vlc_object_release( s );
+ free( p_sys->psz_name );
free( p_sys );
return NULL;
}
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_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_destroy( s );
+ vlc_object_release( s );
}
-static int DStreamRead( stream_t *s, void *p_read, int i_read )
+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;
return i_out;
}
-static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, int i_peek )
+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;
{
d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
int64_t *p_i64;
- vlc_bool_t *p_b;
+ bool *p_b;
int *p_int;
switch( i_query )
return VLC_SUCCESS;
case STREAM_CAN_SEEK:
- p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
- *p_b = VLC_FALSE;
+ p_b = (bool*) va_arg( args, bool * );
+ *p_b = false;
return VLC_SUCCESS;
case STREAM_CAN_FASTSEEK:
- p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
- *p_b = VLC_FALSE;
+ p_b = (bool*) va_arg( args, bool * );
+ *p_b = false;
return VLC_SUCCESS;
case STREAM_GET_POSITION:
while( i_skip > 0 )
{
- int i_read = DStreamRead( s, NULL, i_skip );
+ 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_CONTROL_ACCESS:
+ case STREAM_GET_CONTENT_TYPE:
+ case STREAM_SET_RECORD_STATE:
return VLC_EGENERIC;
default:
}
}
-static int DStreamThread( stream_t *s )
+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 = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out,
- VLC_FALSE )) )
+ if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
+ false )) )
{
- return VLC_EGENERIC;
+ return NULL;
}
p_sys->p_demux = p_demux;
if( p_demux->pf_demux( p_demux ) <= 0 ) break;
}
+ vlc_restorecancel (canc);
vlc_object_kill( p_demux );
- return VLC_SUCCESS;
+ return NULL;
}
/****************************************************************************
* Utility functions
****************************************************************************/
-static void SkipID3Tag( demux_t *p_demux )
+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 );
+
+ if( !p_packetizer )
+ {
+ es_format_Clean( p_fmt );
+ 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;
+
+ 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 );
+ 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 );
+ 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;
+ 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];
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;
- return;
+ /* 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;
}
+
projects / vlc / blobdiff