/*****************************************************************************
* demux.c
*****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN
- * $Id: demux.c,v 1.5 2003/11/30 17:29:56 fenrir Exp $
+ * Copyright (C) 1999-2004 the VideoLAN team
+ * $Id$
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Author: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 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 <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "ninput.h"
+#include <vlc_common.h>
-int demux_vaControl( input_thread_t *p_input, int i_query, va_list args )
+#include "input_internal.h"
+
+static bool SkipID3Tag( demux_t * );
+static bool SkipAPETag( demux_t *p_demux );
+
+/*****************************************************************************
+ * demux_New:
+ * if s is NULL then load a access_demux
+ *****************************************************************************/
+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, bool b_quick )
{
- if( p_input->pf_demux_control )
+ 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;
+
+ /* 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 && *p_demux->psz_demux == '\0' )
+ {
+ 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( "" );
+ }
+
+ if( !b_quick )
{
- return p_input->pf_demux_control( p_input, i_query, args );
+ msg_Dbg( p_obj, "creating demux: access='%s' demux='%s' path='%s'",
+ p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path );
}
- return VLC_EGENERIC;
+
+ p_demux->s = s;
+ p_demux->out = out;
+
+ 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;
+
+ 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, '.' ) )
+ {
+ /* 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" },
+ { "m3u", "playlist" },
+ { "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" },
+ { "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" },
+ { "mod", "mod" }, { "xm", "mod" },
+ { "nsv", "nsv" },
+ { "ogg", "ogg" }, { "ogm", "ogg" },
+ { "pva", "pva" },
+ { "rm", "rm" },
+ { "m4v", "m4v" },
+ { "h264", "h264" },
+ { "", "" },
+ };
+ /* 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" },
+ { "", "" }
+ };
+
+ const char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1;
+ int i;
+
+ if( !b_quick )
+ {
+ for( i = 0; exttodemux[i].ext[0]; i++ )
+ {
+ if( !strcasecmp( psz_ext, exttodemux[i].ext ) )
+ {
+ psz_module = exttodemux[i].demux;
+ break;
+ }
+ }
+ }
+ else
+ {
+ for( i = 0; exttodemux_quick[i].ext[0]; i++ )
+ {
+ if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) )
+ {
+ psz_module = exttodemux_quick[i].demux;
+ break;
+ }
+ }
+
+ }
+ }
+
+ /* 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, "demux", psz_module,
+ !strcmp( psz_module, p_demux->psz_demux ) ?
+ true : false );
+ }
+ else
+ {
+ p_demux->p_module =
+ module_Need( p_demux, "access_demux", psz_module,
+ !strcmp( psz_module, p_demux->psz_access ) ?
+ true : false );
+ }
+
+ 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_release( p_demux );
+ return NULL;
+ }
+
+ return p_demux;
}
-int demux_Control( input_thread_t *p_input, int i_query, ... )
+/*****************************************************************************
+ * demux_Delete:
+ *****************************************************************************/
+void demux_Delete( demux_t *p_demux )
{
- va_list args;
- int i_result;
+ module_Unneed( p_demux, p_demux->p_module );
+ vlc_object_detach( p_demux );
- va_start( args, i_query );
- i_result = demux_vaControl( p_input, i_query, args );
- va_end( args );
+ free( p_demux->psz_path );
+ free( p_demux->psz_demux );
+ free( p_demux->psz_access );
- return i_result;
+ vlc_object_release( p_demux );
}
-static void SeekOffset( input_thread_t *p_input, int64_t i_pos );
-
-int demux_vaControlDefault( input_thread_t *p_input, int i_query,
- va_list args )
+/*****************************************************************************
+ * demux_vaControlHelper:
+ *****************************************************************************/
+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 )
{
- int i_ret;
+ int64_t i_tell;
double f, *pf;
int64_t i64, *pi64;
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ if( i_end < 0 ) i_end = stream_Size( s );
+ if( i_start < 0 ) i_start = 0;
+ if( i_align <= 0 ) i_align = 1;
+ i_tell = stream_Tell( s );
+
switch( i_query )
{
- case DEMUX_GET_POSITION:
- pf = (double*)va_arg( args, double * );
- if( p_input->stream.p_selected_area->i_size <= 0 )
- {
- *pf = 0.0;
- }
- else
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( i_bitrate > 0 && i_end > i_start )
{
- *pf = (double)p_input->stream.p_selected_area->i_tell /
- (double)p_input->stream.p_selected_area->i_size;
+ *pi64 = INT64_C(8000000) * (i_end - i_start) / i_bitrate;
+ return VLC_SUCCESS;
}
- i_ret = VLC_SUCCESS;
- break;
+ return VLC_EGENERIC;
- 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
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( i_bitrate > 0 && i_end > i_start )
{
- i_ret = VLC_EGENERIC;
+ *pi64 = INT64_C(8000000) * (i_tell - i_start) / i_bitrate;
+ return VLC_SUCCESS;
}
- break;
+ return VLC_EGENERIC;
- case DEMUX_GET_TIME:
- pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_input->stream.i_mux_rate > 0 )
+ case DEMUX_GET_POSITION:
+ pf = (double*)va_arg( args, double * );
+ if( i_start < i_end )
{
- *pi64 = (int64_t)1000000 *
- ( p_input->stream.p_selected_area->i_tell / 50 ) /
- p_input->stream.i_mux_rate;
- i_ret = VLC_SUCCESS;
+ *pf = (double)( i_tell - i_start ) /
+ (double)( i_end - i_start );
+ return VLC_SUCCESS;
}
- else
+ return VLC_EGENERIC;
+
+
+ case DEMUX_SET_POSITION:
+ f = (double)va_arg( args, double );
+ if( i_start < i_end && f >= 0.0 && f <= 1.0 )
{
- *pi64 = 0;
- i_ret = VLC_EGENERIC;
+ int64_t i_block = (f * ( i_end - i_start )) / i_align;
+
+ if( stream_Seek( s, i_start + i_block * i_align ) )
+ {
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
}
- break;
+ return VLC_EGENERIC;
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
+ if( i_bitrate > 0 && i64 >= 0 )
{
- i_ret = VLC_EGENERIC;
+ 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;
+ }
+ return VLC_SUCCESS;
}
- break;
+ return VLC_EGENERIC;
- 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:
+ case DEMUX_HAS_UNSUPPORTED_META:
+ case DEMUX_SET_NEXT_DEMUX_TIME:
+ case DEMUX_GET_TITLE_INFO:
+ case DEMUX_SET_GROUP:
+ case DEMUX_GET_ATTACHMENTS:
+ return VLC_EGENERIC;
default:
- msg_Err( p_input, "unknown query in demux_vaControlDefault !!!" );
- i_ret = VLC_EGENERIC;
- break;
+ msg_Err( s, "unknown query in demux_vaControlDefault" );
+ return VLC_EGENERIC;
}
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- return i_ret;
}
-static void SeekOffset( input_thread_t *p_input, int64_t i_pos )
+/****************************************************************************
+ * stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain)
+ ****************************************************************************/
+typedef struct
{
- /* Reinitialize buffer manager. */
- input_AccessReinit( p_input );
+ /* Data buffer */
+ block_fifo_t *p_fifo;
+ block_t *p_block;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- p_input->pf_seek( p_input, i_pos );
- vlc_mutex_lock( &p_input->stream.stream_lock );
-}
+ int64_t i_pos;
+ /* Demuxer */
+ char *psz_name;
+ es_out_t *out;
+ demux_t *p_demux;
-/*****************************************************************************
- * demux2_New:
- *****************************************************************************/
-demux_t *__demux2_New( vlc_object_t *p_obj,
- char *psz_mrl, stream_t *s, es_out_t *out )
+} 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 )
{
- demux_t *p_demux = vlc_object_create( p_obj, sizeof( demux_t ) );
+ /* 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;
- char *psz_dup = strdup( psz_mrl ? psz_mrl : "" );
- char *psz = strchr( psz_dup, ':' );
+ 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;
- if( p_demux == NULL )
+ s->p_sys = malloc( sizeof( d_stream_sys_t) );
+ if( s->p_sys == NULL )
{
- free( psz_dup );
+ vlc_object_release( s );
return NULL;
}
+ p_sys = (d_stream_sys_t*)s->p_sys;
- /* Parse URL */
- p_demux->psz_access = NULL;
- p_demux->psz_demux = NULL;
- p_demux->psz_path = NULL;
+ 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 );
- if( psz )
+ /* decoder fifo */
+ if( ( p_sys->p_fifo = block_FifoNew() ) == NULL )
{
- *psz++ = '\0';
+ 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 );
+}
- if( psz[0] == '/' && psz[1] == '/' )
+
+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 )
+ {
+ block_t *p_block = p_sys->p_block;
+ int i_copy;
+
+ if( !p_block )
{
- psz += 2;
+ p_block = block_FifoGet( p_sys->p_fifo );
+ if( !p_block ) s->b_error = 1;
+ p_sys->p_block = p_block;
}
- p_demux->psz_path = strdup( psz );
- psz = strchr( psz_dup, '/' );
- if( psz )
+ if( p_block && i_read )
{
- *psz++ = '\0';
- p_demux->psz_access = strdup( psz_dup );
- p_demux->psz_demux = strdup( psz );
+ 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;
+ }
}
}
- free( psz_dup );
+ 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 );
- if( p_demux->psz_access == NULL )
+ while( !s->b_die && !s->b_error && i_peek )
{
- p_demux->psz_access = strdup( "" );
+ 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_demux->psz_demux == NULL )
+
+ if( p_sys->p_block )
{
- p_demux->psz_demux = strdup( "" );
+ p_sys->p_block = block_ChainGather( p_sys->p_block );
+ *pp_peek = p_sys->p_block->p_buffer;
}
- if( p_demux->psz_path == 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;
+ bool *p_b;
+ int *p_int;
+
+ switch( i_query )
{
- p_demux->psz_path = strdup( "" );
+ 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, 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:
+ return VLC_EGENERIC;
+
+ default:
+ msg_Err( s, "invalid DStreamControl query=0x%x", i_query );
+ return VLC_EGENERIC;
}
+}
- p_demux->s = s;
- p_demux->out = out;
+static int DStreamThread( stream_t *s )
+{
+ d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+ demux_t *p_demux;
- p_demux->pf_demux = NULL;
- p_demux->pf_control = NULL;
- p_demux->p_sys = NULL;
+ /* Create the demuxer */
+ if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
+ false )) )
+ {
+ return VLC_EGENERIC;
+ }
- vlc_object_attach( p_demux, p_obj ); /* before module_Need (for var_Create...)*/
+ p_sys->p_demux = p_demux;
- p_demux->p_module = module_Need( p_demux, "demux2", p_demux->psz_demux );
- if( p_demux->p_module == NULL )
+ /* Main loop */
+ while( !s->b_die && !p_demux->b_die )
{
- vlc_object_detach( p_demux );
- vlc_object_destroy( p_demux );
- return NULL;
+ if( p_demux->pf_demux( p_demux ) <= 0 ) break;
}
- return p_demux;
+ vlc_object_kill( p_demux );
+ return VLC_SUCCESS;
}
-/*****************************************************************************
- * demux2_Delete:
- *****************************************************************************/
-void demux2_Delete( demux_t *p_demux )
+/****************************************************************************
+ * Utility functions
+ ****************************************************************************/
+static bool SkipID3Tag( demux_t *p_demux )
{
- module_Unneed( p_demux, p_demux->p_module );
- vlc_object_detach( p_demux );
+ const uint8_t *p_peek;
+ uint8_t version, revision;
+ int i_size;
+ int b_footer;
- free( p_demux->psz_path );
- free( p_demux->psz_demux );
- free( p_demux->psz_access );
+ 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 );
- vlc_object_destroy( p_demux );
+ msg_Dbg( p_demux, "AP2 v%d tag found, skipping %d bytes",
+ i_version/1000, i_size );
+ return true;
}
projects / vlc / blobdiff