/*****************************************************************************
- * libasf.c :
+ * libasf.c : asf stream demux module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: libasf.c,v 1.18 2003/09/07 22:48:29 fenrir Exp $
+ * Copyright (C) 2001-2003 the VideoLAN team
+ * $Id$
+ *
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Gildas Bazin <gbazin@videolan.org>
*
* 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> /* malloc(), free() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "codecs.h" /* BITMAPINFOHEADER, WAVEFORMATEX */
+
+#include <vlc_demux.h>
+
+#include <vlc_codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
#include "libasf.h"
#define ASF_DEBUG 1
-#define FREE( p ) \
- if( p ) {free( p ); p = NULL; }
-
#define GUID_FMT "0x%x-0x%x-0x%x-0x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x"
#define GUID_PRINT( guid ) \
(guid).v1, \
/****************************************************************************
*
****************************************************************************/
-static int ASF_ReadObject( stream_t *,
- asf_object_t *p_obj, asf_object_t *p_father );
-
+static int ASF_ReadObject( stream_t *, asf_object_t *, asf_object_t * );
/****************************************************************************
* GUID functions
****************************************************************************/
-void ASF_GetGUID( guid_t *p_guid, uint8_t *p_data )
+void ASF_GetGUID( guid_t *p_guid, const uint8_t *p_data )
{
p_guid->v1 = GetDWLE( p_data );
p_guid->v2 = GetWLE( p_data + 4);
static int ASF_ReadObjectCommon( stream_t *s, asf_object_t *p_obj )
{
asf_object_common_t *p_common = (asf_object_common_t*)p_obj;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
if( stream_Peek( s, &p_peek, 24 ) < 24 )
{
p_common->i_object_size = GetQWLE( p_peek + 16 );
p_common->i_object_pos = stream_Tell( s );
p_common->p_next = NULL;
+
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Found Object guid: " GUID_FMT " size:"I64Fd,
+ msg_Dbg( s,
+ "found object guid: " GUID_FMT " size:"I64Fd,
GUID_PRINT( p_common->i_object_id ),
p_common->i_object_size );
#endif
if( p_obj->common.i_object_size <= 0 )
{
- return( VLC_EGENERIC );
+ return VLC_EGENERIC;
}
- if( p_obj->common.p_father && p_obj->common.p_father->common.i_object_size != 0 )
+ if( p_obj->common.p_father &&
+ p_obj->common.p_father->common.i_object_size != 0 )
{
- if( p_obj->common.p_father->common.i_object_pos + p_obj->common.p_father->common.i_object_size <
+ if( p_obj->common.p_father->common.i_object_pos +
+ p_obj->common.p_father->common.i_object_size <
p_obj->common.i_object_pos + p_obj->common.i_object_size + 24 )
/* 24 is min size of an object */
{
- return( VLC_EGENERIC );
+ return VLC_EGENERIC;
}
}
- return stream_Seek( s,
- p_obj->common.i_object_pos +
- p_obj->common.i_object_size );
+ return stream_Seek( s, p_obj->common.i_object_pos +
+ p_obj->common.i_object_size );
}
static void ASF_FreeObject_Null( asf_object_t *pp_obj )
{
+ VLC_UNUSED(pp_obj);
return;
}
asf_object_header_t *p_hdr = (asf_object_header_t*)p_obj;
asf_object_t *p_subobj;
int i_peek;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
if( ( i_peek = stream_Peek( s, &p_peek, 30 ) ) < 30 )
{
p_hdr->i_reserved2 = p_peek[29];
p_hdr->p_first = NULL;
p_hdr->p_last = NULL;
+
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Header Object\" subobj:%d, reserved1:%d, reserved2:%d",
+ msg_Dbg( s,
+ "read \"header object\" subobj:%d, reserved1:%d, reserved2:%d",
p_hdr->i_sub_object_count,
p_hdr->i_reserved1,
p_hdr->i_reserved2 );
#endif
- /* Cannot failed as peek succeed */
+
+ /* Cannot fail as peek succeed */
stream_Read( s, NULL, 30 );
/* Now load sub object */
for( ; ; )
{
- p_subobj = malloc( sizeof( asf_object_t ) );
+ p_subobj = malloc( sizeof( asf_object_t ) );
if( ASF_ReadObject( s, p_subobj, (asf_object_t*)p_hdr ) )
{
+ free( p_subobj );
break;
}
if( ASF_NextObject( s, p_subobj ) ) /* Go to the next object */
{
asf_object_data_t *p_data = (asf_object_data_t*)p_obj;
int i_peek;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
if( ( i_peek = stream_Peek( s, &p_peek, 50 ) ) < 50 )
{
ASF_GetGUID( &p_data->i_file_id, p_peek + 24 );
p_data->i_total_data_packets = GetQWLE( p_peek + 40 );
p_data->i_reserved = GetWLE( p_peek + 48 );
+
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Data Object\" file_id:" GUID_FMT " total data packet:"
+ msg_Dbg( s,
+ "read \"data object\" file_id:" GUID_FMT " total data packet:"
I64Fd" reserved:%d",
GUID_PRINT( p_data->i_file_id ),
p_data->i_total_data_packets,
p_data->i_reserved );
#endif
+
return VLC_SUCCESS;
}
static int ASF_ReadObject_Index( stream_t *s, asf_object_t *p_obj )
{
asf_object_index_t *p_index = (asf_object_index_t*)p_obj;
- int i_peek;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
+ int i;
- if( ( i_peek = stream_Peek( s, &p_peek, 56 ) ) < 56 )
+ if( stream_Peek( s, &p_peek, p_index->i_object_size ) <
+ (int)p_index->i_object_size )
{
- return VLC_EGENERIC;
+ /* Just ignore */
+ return VLC_SUCCESS;
}
+
ASF_GetGUID( &p_index->i_file_id, p_peek + 24 );
p_index->i_index_entry_time_interval = GetQWLE( p_peek + 40 );
p_index->i_max_packet_count = GetDWLE( p_peek + 48 );
p_index->i_index_entry_count = GetDWLE( p_peek + 52 );
- p_index->index_entry = NULL; /* FIXME */
+ p_index->index_entry = NULL;
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Index Object\" file_id:" GUID_FMT
+ msg_Dbg( s,
+ "read \"index object\" file_id:" GUID_FMT
" index_entry_time_interval:"I64Fd" max_packet_count:%d "
"index_entry_count:%ld",
GUID_PRINT( p_index->i_file_id ),
p_index->i_max_packet_count,
(long int)p_index->i_index_entry_count );
#endif
+
+ /* Sanity checking */
+ if( p_index->i_index_entry_count > (p_index->i_object_size - 56) / 6 )
+ p_index->i_index_entry_count = (p_index->i_object_size - 56) / 6;
+
+ p_index->index_entry = malloc( sizeof(asf_index_entry_t) *
+ p_index->i_index_entry_count );
+
+ for( i = 0, p_peek += 56; i < (int)p_index->i_index_entry_count;
+ i++, p_peek += 6 )
+ {
+ p_index->index_entry[i].i_packet_number = GetDWLE( p_peek );
+ p_index->index_entry[i].i_packet_count = GetDWLE( p_peek + 4 );
+ }
+
return VLC_SUCCESS;
}
+
static void ASF_FreeObject_Index( asf_object_t *p_obj )
{
asf_object_index_t *p_index = (asf_object_index_t*)p_obj;
- FREE( p_index->index_entry );
+ FREENULL( p_index->index_entry );
}
static int ASF_ReadObject_file_properties( stream_t *s, asf_object_t *p_obj )
{
asf_object_file_properties_t *p_fp = (asf_object_file_properties_t*)p_obj;
- int i_peek;
- uint8_t *p_peek;
+ int i_peek;
+ const uint8_t *p_peek;
- if( ( i_peek = stream_Peek( s, &p_peek, 92) ) < 92 )
+ if( ( i_peek = stream_Peek( s, &p_peek, 104 ) ) < 104 )
{
return VLC_EGENERIC;
}
p_fp->i_file_size = GetQWLE( p_peek + 40 );
p_fp->i_creation_date = GetQWLE( p_peek + 48 );
p_fp->i_data_packets_count = GetQWLE( p_peek + 56 );
- p_fp->i_play_duration = GetQWLE( p_peek + 64 );
- p_fp->i_send_duration = GetQWLE( p_peek + 72 );
- p_fp->i_preroll = GetQWLE( p_peek + 80 );
+ p_fp->i_send_duration = GetQWLE( p_peek + 64 );
+ p_fp->i_play_duration = GetQWLE( p_peek + 72 );
+ p_fp->i_preroll = GetDWLE( p_peek + 80 );
+ p_fp->i_unknown = GetDWLE( p_peek + 84 );
p_fp->i_flags = GetDWLE( p_peek + 88 );
p_fp->i_min_data_packet_size = GetDWLE( p_peek + 92 );
p_fp->i_max_data_packet_size = GetDWLE( p_peek + 96 );
p_fp->i_max_bitrate = GetDWLE( p_peek + 100 );
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"File Properties Object\" file_id:" GUID_FMT
+ msg_Dbg( s,
+ "read \"file properties object\" file_id:" GUID_FMT
" file_size:"I64Fd" creation_date:"I64Fd" data_packets_count:"
- I64Fd" play_duration:"I64Fd" send_duration:"I64Fd" preroll:"
- I64Fd" flags:%d min_data_packet_size:%d max_data_packet_size:%d "
- "max_bitrate:%d",
- GUID_PRINT( p_fp->i_file_id ),
- p_fp->i_file_size,
- p_fp->i_creation_date,
- p_fp->i_data_packets_count,
- p_fp->i_play_duration,
- p_fp->i_send_duration,
- p_fp->i_preroll,
- p_fp->i_flags,
- p_fp->i_min_data_packet_size,
- p_fp->i_max_data_packet_size,
+ I64Fd" send_duration:"I64Fd" play_duration:"I64Fd" preroll:%d"
+ "unknown:%d flags:%d min_data_packet_size:%d "
+ "max_data_packet_size:%d max_bitrate:%d",
+ GUID_PRINT( p_fp->i_file_id ), p_fp->i_file_size,
+ p_fp->i_creation_date, p_fp->i_data_packets_count,
+ p_fp->i_send_duration, p_fp->i_play_duration,
+ p_fp->i_preroll, p_fp->i_unknown, p_fp->i_flags,
+ p_fp->i_min_data_packet_size, p_fp->i_max_data_packet_size,
p_fp->i_max_bitrate );
#endif
+
+ return VLC_SUCCESS;
+}
+
+static void ASF_FreeObject_metadata( asf_object_t *p_obj )
+{
+ asf_object_metadata_t *p_meta =
+ (asf_object_metadata_t *)p_obj;
+ unsigned int i;
+
+ for( i = 0; i < p_meta->i_record_entries_count; i++ )
+ {
+ free( p_meta->record[i].psz_name );
+ free( p_meta->record[i].p_data );
+ }
+ free( p_meta->record );
+}
+
+static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj )
+{
+ asf_object_metadata_t *p_meta =
+ (asf_object_metadata_t *)p_obj;
+
+ int i_peek, i_entries, i;
+ const uint8_t *p_peek;
+#ifdef ASF_DEBUG
+ unsigned int j;
+#endif
+
+ p_meta->i_record_entries_count = 0;
+ p_meta->record = 0;
+
+ if( stream_Peek( s, &p_peek, p_meta->i_object_size ) <
+ (int)p_meta->i_object_size )
+ {
+ return VLC_EGENERIC;
+ }
+
+ i_peek = 24;
+ i_entries = GetWLE( p_peek + i_peek ); i_peek += 2;
+ for( i = 0; i < i_entries && i_peek < (int)p_meta->i_object_size -12; i++ )
+ {
+ asf_metadata_record_t record;
+ int i_name, i_data, j;
+
+ if( GetWLE( p_peek + i_peek ) != 0 )
+ {
+ ASF_FreeObject_metadata( p_obj );
+ return VLC_EGENERIC;
+ }
+
+ i_peek += 2;
+ record.i_stream = GetWLE( p_peek + i_peek ); i_peek += 2;
+ i_name = GetWLE( p_peek + i_peek ); i_peek += 2;
+ record.i_type = GetWLE( p_peek + i_peek ); i_peek += 2;
+ i_data = GetDWLE( p_peek + i_peek ); i_peek += 4;
+
+ if( record.i_type > ASF_METADATA_TYPE_WORD ||
+ i_peek + i_data + i_name > (int)p_meta->i_object_size )
+ {
+ ASF_FreeObject_metadata( p_obj );
+ return VLC_EGENERIC;
+ }
+
+ record.i_val = 0;
+ record.i_data = 0;
+ record.p_data = 0;
+
+ /* get name */
+ record.psz_name = malloc( i_name/2 + 1 );
+ for( j = 0; j < i_name/2; j++ )
+ {
+ record.psz_name[j] = GetWLE( p_peek + i_peek ); i_peek += 2;
+ }
+ record.psz_name[j] = 0; /* just to make sure */
+
+ /* get data */
+ if( record.i_type == ASF_METADATA_TYPE_STRING )
+ {
+ record.p_data = malloc( i_data/2 + 1 );
+ record.i_data = i_data/2;
+ for( j = 0; j < i_data/2; j++ )
+ {
+ record.p_data[j] = GetWLE( p_peek + i_peek ); i_peek += 2;
+ }
+ record.p_data[j] = 0; /* just to make sure */
+ }
+ else if( record.i_type == ASF_METADATA_TYPE_BYTE )
+ {
+ record.p_data = malloc( i_data );
+ record.i_data = i_data;
+ memcpy( record.p_data, p_peek + i_peek, i_data );
+ p_peek += i_data;
+ }
+ else
+ {
+ if( record.i_type == ASF_METADATA_TYPE_QWORD )
+ {
+ record.i_val = GetQWLE( p_peek + i_peek ); i_peek += 8;
+ }
+ else if( record.i_type == ASF_METADATA_TYPE_DWORD )
+ {
+ record.i_val = GetDWLE( p_peek + i_peek ); i_peek += 4;
+ }
+ else
+ {
+ record.i_val = GetWLE( p_peek + i_peek ); i_peek += 2;
+ }
+ }
+
+ p_meta->i_record_entries_count++;
+ p_meta->record =
+ realloc( p_meta->record, p_meta->i_record_entries_count *
+ sizeof(asf_metadata_record_t) );
+ memcpy( &p_meta->record[p_meta->i_record_entries_count-1],
+ &record, sizeof(asf_metadata_record_t) );
+ }
+
+#ifdef ASF_DEBUG
+ msg_Dbg( s,
+ "read \"metadata object\" %d entries",
+ p_meta->i_record_entries_count );
+ for( j = 0; j < p_meta->i_record_entries_count; j++ )
+ {
+ asf_metadata_record_t *p_rec = &p_meta->record[j];
+
+ if( p_rec->i_type == ASF_METADATA_TYPE_STRING )
+ msg_Dbg( s, " - %s=%s",
+ p_rec->psz_name, p_rec->p_data );
+ else if( p_rec->i_type == ASF_METADATA_TYPE_BYTE )
+ msg_Dbg( s, " - %s (%i bytes)",
+ p_rec->psz_name, p_rec->i_data );
+ else
+ msg_Dbg( s, " - %s="I64Fd,
+ p_rec->psz_name, p_rec->i_val );
+ }
+#endif
+
return VLC_SUCCESS;
}
-static int ASF_ReadObject_header_extention( stream_t *s, asf_object_t *p_obj )
+static int ASF_ReadObject_header_extension( stream_t *s, asf_object_t *p_obj )
{
- asf_object_header_extention_t *p_he = (asf_object_header_extention_t*)p_obj;
+ asf_object_header_extension_t *p_he =
+ (asf_object_header_extension_t *)p_obj;
int i_peek;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
if( ( i_peek = stream_Peek( s, &p_peek, p_he->i_object_size ) ) < 46)
{
}
ASF_GetGUID( &p_he->i_reserved1, p_peek + 24 );
p_he->i_reserved2 = GetWLE( p_peek + 40 );
- p_he->i_header_extention_size = GetDWLE( p_peek + 42 );
- if( p_he->i_header_extention_size )
+ p_he->i_header_extension_size = GetDWLE( p_peek + 42 );
+ if( p_he->i_header_extension_size )
{
- p_he->p_header_extention_data = malloc( p_he->i_header_extention_size );
- memcpy( p_he->p_header_extention_data,
- p_peek + 46,
- p_he->i_header_extention_size );
+ p_he->p_header_extension_data =
+ malloc( p_he->i_header_extension_size );
+ memcpy( p_he->p_header_extension_data, p_peek + 46,
+ p_he->i_header_extension_size );
}
else
{
- p_he->p_header_extention_data = NULL;
+ p_he->p_header_extension_data = NULL;
}
+
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Header Extention Object\" reserved1:" GUID_FMT " reserved2:%d header_extention_size:%d",
- GUID_PRINT( p_he->i_reserved1 ),
- p_he->i_reserved2,
- p_he->i_header_extention_size );
+ msg_Dbg( s,
+ "read \"header extension object\" reserved1:" GUID_FMT
+ " reserved2:%d header_extension_size:%d",
+ GUID_PRINT( p_he->i_reserved1 ), p_he->i_reserved2,
+ p_he->i_header_extension_size );
#endif
+
+ if( !p_he->i_header_extension_size ) return VLC_SUCCESS;
+
+ /* Read the extension objects */
+ stream_Read( s, NULL, 46 );
+ for( ; ; )
+ {
+ asf_object_t *p_obj = malloc( sizeof( asf_object_t ) );
+
+ if( ASF_ReadObject( s, p_obj, (asf_object_t*)p_he ) )
+ {
+ free( p_obj );
+ break;
+ }
+
+ if( ASF_NextObject( s, p_obj ) ) /* Go to the next object */
+ {
+ break;
+ }
+ }
+
return VLC_SUCCESS;
}
-static void ASF_FreeObject_header_extention( asf_object_t *p_obj )
+
+static void ASF_FreeObject_header_extension( asf_object_t *p_obj )
{
- asf_object_header_extention_t *p_he = (asf_object_header_extention_t*)p_obj;
+ asf_object_header_extension_t *p_he =
+ (asf_object_header_extension_t *)p_obj;
- FREE( p_he->p_header_extention_data );
+ FREENULL( p_he->p_header_extension_data );
}
static int ASF_ReadObject_stream_properties( stream_t *s, asf_object_t *p_obj )
{
asf_object_stream_properties_t *p_sp =
(asf_object_stream_properties_t*)p_obj;
- int i_peek;
- uint8_t *p_peek;
+ size_t i_peek;
+ const uint8_t *p_peek;
- if( ( i_peek = stream_Peek( s, &p_peek, p_sp->i_object_size ) ) < 74 )
+ if( ( i_peek = stream_Peek( s, &p_peek, p_sp->i_object_size ) ) < 78 )
{
return VLC_EGENERIC;
}
+
ASF_GetGUID( &p_sp->i_stream_type, p_peek + 24 );
ASF_GetGUID( &p_sp->i_error_correction_type, p_peek + 40 );
p_sp->i_time_offset = GetQWLE( p_peek + 56 );
p_sp->i_flags = GetWLE( p_peek + 72 );
p_sp->i_stream_number = p_sp->i_flags&0x07f;
p_sp->i_reserved = GetDWLE( p_peek + 74 );
+ i_peek -= 78;
+
if( p_sp->i_type_specific_data_length )
{
- p_sp->p_type_specific_data = malloc( p_sp->i_type_specific_data_length );
- memcpy( p_sp->p_type_specific_data,
- p_peek + 78,
+ if( i_peek < p_sp->i_type_specific_data_length )
+ return VLC_EGENERIC;
+
+ p_sp->p_type_specific_data =
+ malloc( p_sp->i_type_specific_data_length );
+ if( p_sp->p_type_specific_data == NULL )
+ return VLC_ENOMEM;
+
+ memcpy( p_sp->p_type_specific_data, p_peek + 78,
p_sp->i_type_specific_data_length );
+ i_peek -= p_sp->i_type_specific_data_length;
}
else
{
p_sp->p_type_specific_data = NULL;
}
+
if( p_sp->i_error_correction_data_length )
{
- p_sp->p_error_correction_data = malloc( p_sp->i_error_correction_data_length );
+ if( i_peek < p_sp->i_error_correction_data_length )
+ {
+ free( p_sp->p_type_specific_data );
+ return VLC_EGENERIC;
+ }
+
+ p_sp->p_error_correction_data =
+ malloc( p_sp->i_error_correction_data_length );
+ if( p_sp->p_error_correction_data == NULL )
+ {
+ free( p_sp->p_type_specific_data );
+ return VLC_ENOMEM;
+ }
memcpy( p_sp->p_error_correction_data,
p_peek + 78 + p_sp->i_type_specific_data_length,
p_sp->i_error_correction_data_length );
}
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Stream Properties Object\" stream_type:" GUID_FMT
+ msg_Dbg( s,
+ "read \"stream Properties object\" stream_type:" GUID_FMT
" error_correction_type:" GUID_FMT " time_offset:"I64Fd
" type_specific_data_length:%d error_correction_data_length:%d"
" flags:0x%x stream_number:%d",
asf_object_stream_properties_t *p_sp =
(asf_object_stream_properties_t*)p_obj;
- FREE( p_sp->p_type_specific_data );
- FREE( p_sp->p_error_correction_data );
+ FREENULL( p_sp->p_type_specific_data );
+ FREENULL( p_sp->p_error_correction_data );
}
{
asf_object_codec_list_t *p_cl = (asf_object_codec_list_t*)p_obj;
int i_peek;
- uint8_t *p_peek, *p_data;
+ const uint8_t *p_peek, *p_data;
unsigned int i_codec;
p_cl->i_codec_entries_count = GetWLE( p_peek + 40 );
if( p_cl->i_codec_entries_count > 0 )
{
-
p_cl->codec = calloc( p_cl->i_codec_entries_count,
sizeof( asf_codec_entry_t ) );
memset( p_cl->codec, 0,
}
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Codec List Object\" reserved_guid:" GUID_FMT " codec_entries_count:%d",
- GUID_PRINT( p_cl->i_reserved ),
- p_cl->i_codec_entries_count );
+ msg_Dbg( s, "read \"codec list object\" reserved_guid:" GUID_FMT
+ " codec_entries_count:%d",
+ GUID_PRINT( p_cl->i_reserved ), p_cl->i_codec_entries_count );
for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ )
{
#define codec p_cl->codec[i_codec]
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Codec List Object\" codec[%d] %s name:\"%s\" description:\"%s\" information_length:%d",
- i_codec,
- ( codec.i_type == ASF_CODEC_TYPE_VIDEO ) ? "video" : ( ( codec.i_type == ASF_CODEC_TYPE_AUDIO ) ? "audio" : "unknown" ),
- codec.psz_name,
- codec.psz_description,
+ msg_Dbg( s, " - codec[%d] %s name:\"%s\" "
+ "description:\"%s\" information_length:%d",
+ i_codec, ( codec.i_type == ASF_CODEC_TYPE_VIDEO ) ?
+ "video" : ( ( codec.i_type == ASF_CODEC_TYPE_AUDIO ) ?
+ "audio" : "unknown" ),
+ codec.psz_name, codec.psz_description,
codec.i_information_length );
+#undef codec
}
#endif
+
return VLC_SUCCESS;
}
for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ )
{
#define codec p_cl->codec[i_codec]
- FREE( codec.psz_name );
- FREE( codec.psz_description );
- FREE( codec.p_information );
-
+ FREENULL( codec.psz_name );
+ FREENULL( codec.psz_description );
+ FREENULL( codec.p_information );
#undef codec
}
- FREE( p_cl->codec );
+ FREENULL( p_cl->codec );
}
/* Microsoft should go to hell. This time the length give number of bytes
static int ASF_ReadObject_content_description(stream_t *s, asf_object_t *p_obj)
{
asf_object_content_description_t *p_cd =
- (asf_object_content_description_t*)p_obj;
- int i_peek;
- uint8_t *p_peek, *p_data;
-
- int i_len;
- int i_title;
- int i_author;
- int i_copyright;
- int i_description;
- int i_rating;
+ (asf_object_content_description_t *)p_obj;
+ const uint8_t *p_peek, *p_data;
+ int i_peek, i_title, i_artist, i_copyright, i_description, i_rating;
+ vlc_iconv_t cd = (vlc_iconv_t)-1;
+ const char *ib = NULL;
+ char *ob = NULL;
+ size_t i_ibl, i_obl, i_len;
+
+ cd = vlc_iconv_open("UTF-8", "UTF-16LE");
+ if ( cd == (vlc_iconv_t)-1 ) {
+ msg_Err( s, "vlc_iconv_open failed" );
+ return VLC_EGENERIC;
+ }
+/* FIXME i_size*3 is the worst case. */
#define GETSTRINGW( psz_str, i_size ) \
- psz_str = calloc( i_size/2 + 1, sizeof( char ) ); \
- for( i_len = 0; i_len < i_size/2; i_len++ ) \
- { \
- psz_str[i_len] = GetWLE( p_data + 2*i_len ); \
- } \
- psz_str[i_size/2] = '\0'; \
- p_data += i_size;
+ psz_str = (char *)calloc( i_size*3+1, sizeof( char ) ); \
+ ib = (const char *)p_data; \
+ ob = psz_str; \
+ i_ibl = i_size; \
+ i_obl = i_size*3; \
+ i_len = vlc_iconv(cd, &ib, &i_ibl, &ob, &i_obl); \
+ p_data += i_size;
if( ( i_peek = stream_Peek( s, &p_peek, p_cd->i_object_size ) ) < 34 )
{
p_data = p_peek + 24;
i_title = GetWLE( p_data ); p_data += 2;
- i_author= GetWLE( p_data ); p_data += 2;
+ i_artist= GetWLE( p_data ); p_data += 2;
i_copyright = GetWLE( p_data ); p_data += 2;
i_description = GetWLE( p_data ); p_data += 2;
i_rating = GetWLE( p_data ); p_data += 2;
GETSTRINGW( p_cd->psz_title, i_title );
- GETSTRINGW( p_cd->psz_author, i_author );
+ GETSTRINGW( p_cd->psz_artist, i_artist );
GETSTRINGW( p_cd->psz_copyright, i_copyright );
GETSTRINGW( p_cd->psz_description, i_description );
GETSTRINGW( p_cd->psz_rating, i_rating );
#undef GETSTRINGW
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Read \"Content Description Object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",
+ msg_Dbg( s,
+ "read \"content description object\" title:\"%s\" artist:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",
p_cd->psz_title,
- p_cd->psz_author,
+ p_cd->psz_artist,
p_cd->psz_copyright,
p_cd->psz_description,
p_cd->psz_rating );
#endif
+
+ vlc_iconv_close(cd);
return VLC_SUCCESS;
}
static void ASF_FreeObject_content_description( asf_object_t *p_obj)
{
asf_object_content_description_t *p_cd =
- (asf_object_content_description_t*)p_obj;
+ (asf_object_content_description_t *)p_obj;
+
+ FREENULL( p_cd->psz_title );
+ FREENULL( p_cd->psz_artist );
+ FREENULL( p_cd->psz_copyright );
+ FREENULL( p_cd->psz_description );
+ FREENULL( p_cd->psz_rating );
+}
+
+/* Language list: */
+static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
+{
+ asf_object_language_list_t *p_ll =
+ (asf_object_language_list_t*)p_obj;
+ const uint8_t *p_peek, *p_data;
+ int i_peek;
+ int i;
+
+ if( ( i_peek = stream_Peek( s, &p_peek, p_ll->i_object_size ) ) < 26 )
+ return VLC_EGENERIC;
+
+ p_data = &p_peek[24];
+
+ p_ll->i_language = GetWLE( &p_data[0] ); p_data += 2;
+ if( p_ll->i_language > 0 )
+ {
+ p_ll->ppsz_language = calloc( p_ll->i_language, sizeof( char *) );
+
+ for( i = 0; i < p_ll->i_language; i++ )
+ {
+ char *psz;
+ int i_size = *p_data++;
+ int i_len;
+
+ psz = calloc( i_size/2 + 1, sizeof( char ) );
+ for( i_len = 0; i_len < i_size/2; i_len++ )
+ {
+ psz[i_len] = GetWLE( p_data + 2*i_len );
+ }
+ psz[i_size/2] = '\0'; \
+ p_data += i_size;
+
+ p_ll->ppsz_language[i] = psz;
+ }
+ }
+
+#ifdef ASF_DEBUG
+ msg_Dbg( s, "read \"language list object\" %d entries",
+ p_ll->i_language );
+ for( i = 0; i < p_ll->i_language; i++ )
+ msg_Dbg( s, " - '%s'",
+ p_ll->ppsz_language[i] );
+#endif
+ return VLC_SUCCESS;
+}
+
+static void ASF_FreeObject_language_list( asf_object_t *p_obj)
+{
+ asf_object_language_list_t *p_ll =
+ (asf_object_language_list_t *)p_obj;
+ int i;
+
+ for( i = 0; i < p_ll->i_language; i++ )
+ FREENULL( p_ll->ppsz_language[i] );
+ FREENULL( p_ll->ppsz_language );
+}
+
+/* Stream bitrate properties */
+static int ASF_ReadObject_stream_bitrate_properties( stream_t *s,
+ asf_object_t *p_obj)
+{
+ asf_object_stream_bitrate_properties_t *p_sb =
+ (asf_object_stream_bitrate_properties_t *)p_obj;
+ const uint8_t *p_peek, *p_data;
+ int i_peek;
+ int i;
+
+ if( ( i_peek = stream_Peek( s, &p_peek, p_sb->i_object_size ) ) < 26 )
+ return VLC_EGENERIC;
+
+ p_data = &p_peek[24];
+
+ p_sb->i_bitrate = GetWLE( &p_data[0] ); p_data += 2;
+ if( p_sb->i_bitrate > 127 ) p_sb->i_bitrate = 127; /* Buggy ? */
+ for( i = 0; i < p_sb->i_bitrate; i++ )
+ {
+ p_sb->bitrate[i].i_stream_number = GetWLE( &p_data[0] )& 0x7f;
+ p_sb->bitrate[i].i_avg_bitrate = GetDWLE( &p_data[2] );
+
+ p_data += 2+4;
+ }
+
+#ifdef ASF_DEBUG
+ msg_Dbg( s,"read \"stream bitrate properties object\"" );
+ for( i = 0; i < p_sb->i_bitrate; i++ )
+ {
+ msg_Dbg( s," - stream=%d bitrate=%d",
+ p_sb->bitrate[i].i_stream_number,
+ p_sb->bitrate[i].i_avg_bitrate );
+ }
+#endif
+ return VLC_SUCCESS;
+}
+static void ASF_FreeObject_stream_bitrate_properties( asf_object_t *p_obj)
+{
+}
+
+static int ASF_ReadObject_extended_stream_properties( stream_t *s,
+ asf_object_t *p_obj)
+{
+ asf_object_extended_stream_properties_t *p_esp =
+ (asf_object_extended_stream_properties_t*)p_obj;
+ const uint8_t *p_peek, *p_data;
+ int i_peek, i;
+
+ if( ( i_peek = stream_Peek( s, &p_peek, p_esp->i_object_size ) ) < 88 )
+ return VLC_EGENERIC;
+
+ p_data = &p_peek[24];
+
+ p_esp->i_start_time = GetQWLE( &p_data[0] );
+ p_esp->i_end_time = GetQWLE( &p_data[8] );
+ p_esp->i_data_bitrate = GetDWLE( &p_data[16] );
+ p_esp->i_buffer_size = GetDWLE( &p_data[20] );
+ p_esp->i_initial_buffer_fullness = GetDWLE( &p_data[24] );
+ p_esp->i_alternate_data_bitrate = GetDWLE( &p_data[28] );
+ p_esp->i_alternate_buffer_size = GetDWLE( &p_data[32] );
+ p_esp->i_alternate_initial_buffer_fullness = GetDWLE( &p_data[36] );
+ p_esp->i_maximum_object_size = GetDWLE( &p_data[40] );
+ p_esp->i_flags = GetDWLE( &p_data[44] );
+ p_esp->i_stream_number = GetWLE( &p_data[48] );
+ p_esp->i_language_index = GetWLE( &p_data[50] );
+ p_esp->i_average_time_per_frame= GetQWLE( &p_data[52] );
+ p_esp->i_stream_name_count = GetWLE( &p_data[60] );
+ p_esp->i_payload_extension_system_count = GetWLE( &p_data[62] );
+
+ p_data += 64;
+
+ p_esp->pi_stream_name_language = calloc( sizeof(int),
+ p_esp->i_stream_name_count );
+ p_esp->ppsz_stream_name = calloc( sizeof(char*),
+ p_esp->i_stream_name_count );
+ for( i = 0; i < p_esp->i_stream_name_count; i++ )
+ {
+ int i_size;
+ char *psz;
+ int i_len;
+
+ p_esp->pi_stream_name_language[i] = GetWLE( &p_data[0] );
+ i_size = GetWLE( &p_data[2] );
+ p_data += 2;
+
+ psz = calloc( i_size/2 + 1, sizeof( char ) );
+ for( i_len = 0; i_len < i_size/2; i_len++ )
+ {
+ psz[i_len] = GetWLE( p_data + 2*i_len );
+ }
+ psz[i_size/2] = '\0'; \
+ p_data += i_size;
+
+ p_esp->ppsz_stream_name[i] = psz;
+ }
+
+ for( i = 0; i < p_esp->i_payload_extension_system_count; i++ )
+ {
+ /* Skip them */
+ int i_size = GetDWLE( &p_data[16 + 2] );
+
+ p_data += 16+2+4+i_size;
+ }
+
+ p_esp->p_sp = NULL;
+ if( p_data < &p_peek[i_peek] )
+ {
+ asf_object_t *p_sp;
+ /* Cannot fail as peek succeed */
+ stream_Read( s, NULL, p_data - p_peek );
+
+ p_sp = malloc( sizeof( asf_object_t ) );
+
+ if( ASF_ReadObject( s, p_sp, NULL ) )
+ {
+ free( p_sp );
+ }
+ else
+ {
+ /* This p_sp will be inserted by ReadRoot later */
+ p_esp->p_sp = (asf_object_stream_properties_t*)p_sp;
+ }
+ }
+
+#ifdef ASF_DEBUG
+ msg_Dbg( s, "read \"extended stream properties object\":" );
+ msg_Dbg( s, " - start="I64Fd" end="I64Fd,
+ p_esp->i_start_time, p_esp->i_end_time );
+ msg_Dbg( s, " - data bitrate=%d buffer=%d initial fullness=%d",
+ p_esp->i_data_bitrate,
+ p_esp->i_buffer_size,
+ p_esp->i_initial_buffer_fullness );
+ msg_Dbg( s, " - alternate data bitrate=%d buffer=%d initial fullness=%d",
+ p_esp->i_alternate_data_bitrate,
+ p_esp->i_alternate_buffer_size,
+ p_esp->i_alternate_initial_buffer_fullness );
+ msg_Dbg( s, " - maximum object size=%d", p_esp->i_maximum_object_size );
+ msg_Dbg( s, " - flags=0x%x", p_esp->i_flags );
+ msg_Dbg( s, " - stream number=%d language=%d",
+ p_esp->i_stream_number, p_esp->i_language_index );
+ msg_Dbg( s, " - average time per frame="I64Fd,
+ p_esp->i_average_time_per_frame );
+ msg_Dbg( s, " - stream name count=%d", p_esp->i_stream_name_count );
+ for( i = 0; i < p_esp->i_stream_name_count; i++ )
+ msg_Dbg( s, " - lang id=%d name=%s",
+ p_esp->pi_stream_name_language[i],
+ p_esp->ppsz_stream_name[i] );
+ msg_Dbg( s, " - payload extension system count=%d",
+ p_esp->i_payload_extension_system_count );
+#endif
+ return VLC_SUCCESS;
+}
+static void ASF_FreeObject_extended_stream_properties( asf_object_t *p_obj)
+{
+ asf_object_extended_stream_properties_t *p_esp =
+ (asf_object_extended_stream_properties_t *)p_obj;
+ int i;
+
+ for( i = 0; i < p_esp->i_stream_name_count; i++ )
+ FREENULL( p_esp->ppsz_stream_name[i] );
+ FREENULL( p_esp->pi_stream_name_language );
+ FREENULL( p_esp->ppsz_stream_name );
+}
+
+
+static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
+ asf_object_t *p_obj)
+{
+ asf_object_advanced_mutual_exclusion_t *p_ae =
+ (asf_object_advanced_mutual_exclusion_t *)p_obj;
+ const uint8_t *p_peek, *p_data;
+ int i_peek;
+ int i;
+
+ if( ( i_peek = stream_Peek( s, &p_peek, p_ae->i_object_size ) ) < 42 )
+ return VLC_EGENERIC;
+
+ p_data = &p_peek[24];
+
+ ASF_GetGUID( &p_ae->type, &p_data[0] );
+ p_ae->i_stream_number_count = GetWLE( &p_data[16] );
+
+ p_data += 16 + 2;
+ p_ae->pi_stream_number = calloc( sizeof(int),
+ p_ae->i_stream_number_count );
+ for( i = 0; i < p_ae->i_stream_number_count; i++ )
+ {
+ p_ae->pi_stream_number[i] = GetWLE( p_data );
+ p_data += 2;
+ }
+
+#ifdef ASF_DEBUG
+ msg_Dbg( s, "read \"advanced mutual exclusion object\"" );
+ for( i = 0; i < p_ae->i_stream_number_count; i++ )
+ msg_Dbg( s, " - stream=%d", p_ae->pi_stream_number[i] );
+#endif
+ return VLC_SUCCESS;
+}
+static void ASF_FreeObject_advanced_mutual_exclusion( asf_object_t *p_obj)
+{
+ asf_object_advanced_mutual_exclusion_t *p_ae =
+ (asf_object_advanced_mutual_exclusion_t *)p_obj;
+
+ FREENULL( p_ae->pi_stream_number );
+}
+
+
+static int ASF_ReadObject_stream_prioritization( stream_t *s,
+ asf_object_t *p_obj)
+{
+ asf_object_stream_prioritization_t *p_sp =
+ (asf_object_stream_prioritization_t *)p_obj;
+ const uint8_t *p_peek, *p_data;
+ int i_peek;
+ int i;
+
+ if( ( i_peek = stream_Peek( s, &p_peek, p_sp->i_object_size ) ) < 26 )
+ return VLC_EGENERIC;
+
+ p_data = &p_peek[24];
+
+ p_sp->i_priority_count = GetWLE( &p_data[0] );
+ p_data += 2;
+
+ p_sp->pi_priority_flag = calloc( sizeof(int), p_sp->i_priority_count );
+ p_sp->pi_priority_stream_number =
+ calloc( sizeof(int), p_sp->i_priority_count );
+
+ for( i = 0; i < p_sp->i_priority_count; i++ )
+ {
+ p_sp->pi_priority_stream_number[i] = GetWLE( p_data ); p_data += 2;
+ p_sp->pi_priority_flag[i] = GetWLE( p_data ); p_data += 2;
+ }
+#ifdef ASF_DEBUG
+ msg_Dbg( s, "read \"stream prioritization object\"" );
+ for( i = 0; i < p_sp->i_priority_count; i++ )
+ msg_Dbg( s, " - Stream:%d flags=0x%x",
+ p_sp->pi_priority_stream_number[i],
+ p_sp->pi_priority_flag[i] );
+#endif
+ return VLC_SUCCESS;
+}
+static void ASF_FreeObject_stream_prioritization( asf_object_t *p_obj)
+{
+ asf_object_stream_prioritization_t *p_sp =
+ (asf_object_stream_prioritization_t *)p_obj;
+
+ FREENULL( p_sp->pi_priority_stream_number );
+ FREENULL( p_sp->pi_priority_flag );
+}
+
+
+static int ASF_ReadObject_extended_content_description( stream_t *s,
+ asf_object_t *p_obj)
+{
+ asf_object_extended_content_description_t *p_ec =
+ (asf_object_extended_content_description_t *)p_obj;
+ const uint8_t *p_peek, *p_data;
+ int i_peek;
+ int i;
+
+ if( ( i_peek = stream_Peek( s, &p_peek, p_ec->i_object_size ) ) < 26 )
+ return VLC_EGENERIC;
+
+ p_data = &p_peek[24];
+
+ p_ec->i_count = GetWLE( p_data ); p_data += 2;
+ p_ec->ppsz_name = calloc( sizeof(char*), p_ec->i_count );
+ p_ec->ppsz_value = calloc( sizeof(char*), p_ec->i_count );
+ for( i = 0; i < p_ec->i_count; i++ )
+ {
+ int i_size;
+ int i_type;
+ int i_len;
+#define GETSTRINGW( psz_str, i_size ) \
+ psz_str = calloc( i_size/2 + 1, sizeof( char ) ); \
+ for( i_len = 0; i_len < i_size/2; i_len++ ) \
+ { \
+ psz_str[i_len] = GetWLE( p_data + 2*i_len ); \
+ } \
+ psz_str[i_size/2] = '\0';
+
+ i_size = GetWLE( p_data ); p_data += 2;
+ GETSTRINGW( p_ec->ppsz_name[i], i_size );
+ p_data += i_size;
+
+ /* Grrr */
+ i_type = GetWLE( p_data ); p_data += 2;
+ i_size = GetWLE( p_data ); p_data += 2;
+ if( i_type == 0 )
+ {
+ GETSTRINGW( p_ec->ppsz_value[i], i_size );
+ }
+ else if( i_type == 1 )
+ {
+ int j;
+ /* Byte array */
+ p_ec->ppsz_value[i] = malloc( 2*i_size + 1 );
+ for( j = 0; j < i_size; j++ )
+ {
+ static const char hex[16] = "0123456789ABCDEF";
+ p_ec->ppsz_value[i][2*j+0] = hex[p_data[0]>>4];
+ p_ec->ppsz_value[i][2*j+1] = hex[p_data[0]&0xf];
+ }
+ p_ec->ppsz_value[i][2*i_size] = '\0';
+ }
+ else if( i_type == 2 )
+ {
+ /* Bool */
+ p_ec->ppsz_value[i] = strdup( *p_data ? "true" : "false" );
+ }
+ else if( i_type == 3 )
+ {
+ /* DWord */
+ asprintf( &p_ec->ppsz_value[i], "%d", GetDWLE(p_data));
+ }
+ else if( i_type == 4 )
+ {
+ /* QWord */
+ asprintf( &p_ec->ppsz_value[i], I64Fd, GetQWLE(p_data));
+ }
+ else if( i_type == 5 )
+ {
+ /* Word */
+ asprintf( &p_ec->ppsz_value[i], "%d", GetWLE(p_data));
+ }
+ else
+ p_ec->ppsz_value[i] = NULL;
+
+ p_data += i_size;
+
+
+
+#undef GETSTRINGW
+
+ }
+
+#ifdef ASF_DEBUG
+ msg_Dbg( s, "read \"extended content description object\"" );
+ for( i = 0; i < p_ec->i_count; i++ )
+ msg_Dbg( s, " - '%s' = '%s'",
+ p_ec->ppsz_name[i],
+ p_ec->ppsz_value[i] );
+#endif
+ return VLC_SUCCESS;
+}
+static void ASF_FreeObject_extended_content_description( asf_object_t *p_obj)
+{
+ asf_object_extended_content_description_t *p_ec =
+ (asf_object_extended_content_description_t *)p_obj;
+ int i;
+
+ for( i = 0; i < p_ec->i_count; i++ )
+ {
+ FREENULL( p_ec->ppsz_name[i] );
+ FREENULL( p_ec->ppsz_value[i] );
+ }
+ FREENULL( p_ec->ppsz_name );
+ FREENULL( p_ec->ppsz_value );
+}
+
+
+#if 0
+static int ASF_ReadObject_XXX(stream_t *s, asf_object_t *p_obj)
+{
+ asf_object_XXX_t *p_XX =
+ (asf_object_XXX_t *)p_obj;
+ const uint8_t *p_peek;
+ uint8_t *p_data;
+ int i_peek;
+
+ if( ( i_peek = stream_Peek( s, &p_peek, p_XX->i_object_size ) ) < XXX )
+ return VLC_EGENERIC;
+
+ p_data = &p_peek[24];
- FREE( p_cd->psz_title );
- FREE( p_cd->psz_author );
- FREE( p_cd->psz_copyright );
- FREE( p_cd->psz_description );
- FREE( p_cd->psz_rating );
+#ifdef ASF_DEBUG
+ msg_Dbg( s,
+ "Read \"XXX object\"" );
+#endif
+ return VLC_SUCCESS;
}
+static void ASF_FreeObject_XXX( asf_object_t *p_obj)
+{
+ asf_object_XXX_t *p_XX =
+ (asf_object_XXX_t *)p_obj;
+}
+#endif
+
+/* */
static struct
{
const guid_t *p_id;
int i_type;
int (*ASF_ReadObject_function)( stream_t *, asf_object_t *p_obj );
void (*ASF_FreeObject_function)( asf_object_t *p_obj );
+
} ASF_Object_Function [] =
{
- { &asf_object_header_guid, ASF_OBJECT_TYPE_HEADER, ASF_ReadObject_Header, ASF_FreeObject_Null },
- { &asf_object_data_guid, ASF_OBJECT_TYPE_DATA, ASF_ReadObject_Data, ASF_FreeObject_Null },
- { &asf_object_index_guid, ASF_OBJECT_TYPE_INDEX, ASF_ReadObject_Index, ASF_FreeObject_Index },
- { &asf_object_file_properties_guid, ASF_OBJECT_TYPE_FILE_PROPERTIES, ASF_ReadObject_file_properties, ASF_FreeObject_Null },
- { &asf_object_stream_properties_guid, ASF_OBJECT_TYPE_STREAM_PROPERTIES, ASF_ReadObject_stream_properties,ASF_FreeObject_stream_properties },
- { &asf_object_header_extention_guid, ASF_OBJECT_TYPE_EXTENTION_HEADER, ASF_ReadObject_header_extention, ASF_FreeObject_header_extention},
- { &asf_object_codec_list_guid, ASF_OBJECT_TYPE_CODEC_LIST, ASF_ReadObject_codec_list, ASF_FreeObject_codec_list },
- { &asf_object_marker_guid, ASF_OBJECT_TYPE_MARKER, NULL, NULL },
- { &asf_object_content_description_guid, ASF_OBJECT_TYPE_CONTENT_DESCRIPTION, ASF_ReadObject_content_description, ASF_FreeObject_content_description },
-
- { &asf_object_null_guid, 0, NULL, NULL }
+ { &asf_object_header_guid, ASF_OBJECT_HEADER,
+ ASF_ReadObject_Header, ASF_FreeObject_Null },
+ { &asf_object_data_guid, ASF_OBJECT_DATA,
+ ASF_ReadObject_Data, ASF_FreeObject_Null },
+ { &asf_object_index_guid, ASF_OBJECT_INDEX,
+ ASF_ReadObject_Index, ASF_FreeObject_Index },
+ { &asf_object_file_properties_guid, ASF_OBJECT_FILE_PROPERTIES,
+ ASF_ReadObject_file_properties, ASF_FreeObject_Null },
+ { &asf_object_stream_properties_guid, ASF_OBJECT_STREAM_PROPERTIES,
+ ASF_ReadObject_stream_properties,ASF_FreeObject_stream_properties },
+ { &asf_object_header_extension_guid, ASF_OBJECT_HEADER_EXTENSION,
+ ASF_ReadObject_header_extension, ASF_FreeObject_header_extension},
+ { &asf_object_metadata_guid, ASF_OBJECT_METADATA,
+ ASF_ReadObject_metadata, ASF_FreeObject_metadata},
+ { &asf_object_codec_list_guid, ASF_OBJECT_CODEC_LIST,
+ ASF_ReadObject_codec_list, ASF_FreeObject_codec_list },
+ { &asf_object_marker_guid, ASF_OBJECT_MARKER, NULL, NULL },
+ { &asf_object_padding, ASF_OBJECT_PADDING, NULL, NULL },
+ { &asf_object_content_description_guid, ASF_OBJECT_CONTENT_DESCRIPTION,
+ ASF_ReadObject_content_description, ASF_FreeObject_content_description },
+ { &asf_object_language_list, ASF_OBJECT_OTHER,
+ ASF_ReadObject_language_list, ASF_FreeObject_language_list },
+ { &asf_object_stream_bitrate_properties, ASF_OBJECT_OTHER,
+ ASF_ReadObject_stream_bitrate_properties,
+ ASF_FreeObject_stream_bitrate_properties },
+ { &asf_object_extended_stream_properties, ASF_OBJECT_OTHER,
+ ASF_ReadObject_extended_stream_properties,
+ ASF_FreeObject_extended_stream_properties },
+ { &asf_object_advanced_mutual_exclusion, ASF_OBJECT_OTHER,
+ ASF_ReadObject_advanced_mutual_exclusion,
+ ASF_FreeObject_advanced_mutual_exclusion },
+ { &asf_object_stream_prioritization, ASF_OBJECT_OTHER,
+ ASF_ReadObject_stream_prioritization,
+ ASF_FreeObject_stream_prioritization },
+ { &asf_object_extended_content_description, ASF_OBJECT_OTHER,
+ ASF_ReadObject_extended_content_description,
+ ASF_FreeObject_extended_content_description },
+
+ { &asf_object_null_guid, 0, NULL, NULL }
};
-static int ASF_ReadObject( stream_t *s,
- asf_object_t *p_obj, asf_object_t *p_father )
+static int ASF_ReadObject( stream_t *s, asf_object_t *p_obj,
+ asf_object_t *p_father )
{
int i_result;
int i_index;
if( !p_obj )
- {
return( 0 );
- }
+
+ memset( p_obj, 0, sizeof( p_obj ) );
+
if( ASF_ReadObjectCommon( s, p_obj ) )
{
- msg_Warn( (vlc_object_t*)s, "Cannot read one asf object" );
+ msg_Warn( s, "cannot read one asf object" );
return VLC_EGENERIC;
}
p_obj->common.p_father = p_father;
p_obj->common.p_next = NULL;
p_obj->common.p_last = NULL;
-
if( p_obj->common.i_object_size < 24 )
{
- msg_Warn( (vlc_object_t*)s, "Found a corrupted asf object (size<24)" );
+ msg_Warn( s, "found a corrupted asf object (size<24)" );
return VLC_EGENERIC;
}
+
/* find this object */
for( i_index = 0; ; i_index++ )
{
if( ASF_CmpGUID( ASF_Object_Function[i_index].p_id,
- &p_obj->common.i_object_id )||
+ &p_obj->common.i_object_id ) ||
ASF_CmpGUID( ASF_Object_Function[i_index].p_id,
- &asf_object_null_guid ) )
+ &asf_object_null_guid ) )
{
break;
}
/* Now load this object */
if( ASF_Object_Function[i_index].ASF_ReadObject_function == NULL )
{
- msg_Warn( (vlc_object_t*)s, "Unknown asf object (not loaded)" );
+ msg_Warn( s, "unknown asf object (not loaded)" );
i_result = VLC_SUCCESS;
}
else
}
/* link this object with father */
- if( p_father )
+ if( p_father && ! i_result )
{
if( p_father->common.p_first )
{
int i_index;
asf_object_t *p_child;
- if( !p_obj )
- {
- return;
- }
+ if( !p_obj ) return;
/* Free all child object */
p_child = p_obj->common.p_first;
/* Now free this object */
if( ASF_Object_Function[i_index].ASF_FreeObject_function == NULL )
{
- msg_Warn( (vlc_object_t*)s,
- "Unknown asf object " GUID_FMT,
+ msg_Warn( s,
+ "unknown asf object " GUID_FMT,
GUID_PRINT( p_obj->common.i_object_id ) );
}
else
{
#ifdef ASF_DEBUG
- msg_Dbg( (vlc_object_t*)s,
- "Free asf object " GUID_FMT,
+ msg_Dbg( s,
+ "free asf object " GUID_FMT,
GUID_PRINT( p_obj->common.i_object_id ) );
#endif
(ASF_Object_Function[i_index].ASF_FreeObject_function)( p_obj );
return;
}
+/*****************************************************************************
+ * ASF_ObjectDumpDebug:
+ *****************************************************************************/
+static const struct
+{
+ const guid_t *p_id;
+ const char *psz_name;
+} ASF_ObjectDumpDebugInfo[] =
+{
+ { &asf_object_header_guid, "Header" },
+ { &asf_object_data_guid, "Data" },
+ { &asf_object_index_guid, "Index" },
+ { &asf_object_file_properties_guid, "File Properties" },
+ { &asf_object_stream_properties_guid, "Stream Properties" },
+ { &asf_object_content_description_guid, "Content Description" },
+ { &asf_object_header_extension_guid, "Header Extension" },
+ { &asf_object_metadata_guid, "Metadata" },
+ { &asf_object_codec_list_guid, "Codec List" },
+ { &asf_object_marker_guid, "Marker" },
+ { &asf_object_stream_type_audio, "Stream Type Audio" },
+ { &asf_object_stream_type_video, "Stream Type Video" },
+ { &asf_object_stream_type_command, "Stream Type Command" },
+ { &asf_object_language_list, "Language List" },
+ { &asf_object_stream_bitrate_properties, "Stream Bitrate Propoerties" },
+ { &asf_object_padding, "Padding" },
+ { &asf_object_extended_stream_properties, "Extended Stream Properties" },
+ { &asf_object_advanced_mutual_exclusion, "Advanced Mutual Exclusion" },
+ { &asf_object_stream_prioritization, "Stream Prioritization" },
+ { &asf_object_extended_content_description, "Extended content description"},
+
+ { NULL, "Unknown" },
+};
+
+
+static void ASF_ObjectDumpDebug( vlc_object_t *p_obj,
+ asf_object_common_t *p_node, int i_level )
+{
+ char str[1024];
+ int i;
+ union asf_object_u *p_child;
+ const char *psz_name;
+
+ /* Find the name */
+ for( i = 0; ASF_ObjectDumpDebugInfo[i].p_id != NULL; i++ )
+ {
+ if( ASF_CmpGUID( ASF_ObjectDumpDebugInfo[i].p_id,
+ &p_node->i_object_id ) )
+ break;
+ }
+ psz_name = ASF_ObjectDumpDebugInfo[i].psz_name;
+
+ memset( str, ' ', sizeof( str ) );
+ for( i = 1; i < i_level; i++ )
+ {
+ str[i * 5] = '|';
+ }
+ snprintf( str + 5*i_level, 1024,
+ "+ '%s' GUID "GUID_FMT" size:"I64Fu"pos:"I64Fu,
+ psz_name,
+ GUID_PRINT( p_node->i_object_id ),
+ p_node->i_object_size, p_node->i_object_pos );
+
+ msg_Dbg( p_obj, "%s", str );
+
+ for( p_child = p_node->p_first; p_child != NULL;
+ p_child = p_child->common.p_next )
+ {
+ ASF_ObjectDumpDebug( p_obj, &p_child->common, i_level + 1 );
+ }
+}
+
/*****************************************************************************
* ASF_ReadObjetRoot : parse the entire stream/file
*****************************************************************************/
asf_object_root_t *p_root = malloc( sizeof( asf_object_root_t ) );
asf_object_t *p_obj;
- p_root->i_type = ASF_OBJECT_TYPE_ROOT;
+ p_root->i_type = ASF_OBJECT_ROOT;
memcpy( &p_root->i_object_id, &asf_object_null_guid, sizeof( guid_t ) );
- p_root->i_object_pos = 0;
- p_root->i_object_size = stream_Tell( s );
+ p_root->i_object_pos = stream_Tell( s );
+ p_root->i_object_size = 0;
p_root->p_first = NULL;
p_root->p_last = NULL;
p_root->p_next = NULL;
p_root->p_data = NULL;
p_root->p_fp = NULL;
p_root->p_index = NULL;
+ p_root->p_metadata = NULL;
for( ; ; )
{
- p_obj = malloc( sizeof( asf_object_t ) );
+ p_obj = malloc( sizeof( asf_object_t ) );
if( ASF_ReadObject( s, p_obj, (asf_object_t*)p_root ) )
{
+ free( p_obj );
break;
}
switch( p_obj->common.i_type )
{
- case( ASF_OBJECT_TYPE_HEADER ):
+ case( ASF_OBJECT_HEADER ):
p_root->p_hdr = (asf_object_header_t*)p_obj;
break;
- case( ASF_OBJECT_TYPE_DATA ):
+ case( ASF_OBJECT_DATA ):
p_root->p_data = (asf_object_data_t*)p_obj;
break;
- case( ASF_OBJECT_TYPE_INDEX ):
+ case( ASF_OBJECT_INDEX ):
p_root->p_index = (asf_object_index_t*)p_obj;
break;
default:
- msg_Warn( (vlc_object_t*)s, "Unknow Object found" );
+ msg_Warn( s, "unknow object found" );
break;
}
- if( p_obj->common.i_type == ASF_OBJECT_TYPE_DATA &&
+ if( p_obj->common.i_type == ASF_OBJECT_DATA &&
p_obj->common.i_object_size <= 50 )
{
/* probably a dump of broadcasted asf */
}
if( !b_seekable && p_root->p_hdr && p_root->p_data )
{
- /* For unseekable stream it's enouth to play */
+ /* For unseekable stream it's enough to play */
break;
}
if( p_root->p_fp )
{
+ asf_object_t *p_hdr_ext =
+ ASF_FindObject( p_root->p_hdr,
+ &asf_object_header_extension_guid, 0 );
+ if( p_hdr_ext )
+ {
+ int i_ext_stream;
+ int i;
+
+ p_root->p_metadata =
+ ASF_FindObject( p_hdr_ext,
+ &asf_object_metadata_guid, 0 );
+ /* Special case for broken designed file format :( */
+ i_ext_stream = ASF_CountObject( p_hdr_ext,
+ &asf_object_extended_stream_properties );
+ for( i = 0; i < i_ext_stream; i++ )
+ {
+ asf_object_t *p_esp =
+ ASF_FindObject( p_hdr_ext,
+ &asf_object_extended_stream_properties, i );
+ if( p_esp->ext_stream.p_sp )
+ {
+ asf_object_t *p_sp =
+ (asf_object_t*)p_esp->ext_stream.p_sp;
+
+ /* Insert this p_sp */
+ p_root->p_hdr->p_last->common.p_next = p_sp;
+ p_root->p_hdr->p_last = p_sp;
+
+ p_sp->common.p_father = (asf_object_t*)p_root->p_hdr;
+ }
+ }
+ }
+
+ ASF_ObjectDumpDebug( VLC_OBJECT(s),
+ (asf_object_common_t*)p_root, 0 );
return p_root;
}
- msg_Warn( (vlc_object_t*)s, "cannot fine file properties object" );
+ msg_Warn( s, "cannot find file properties object" );
}
/* Invalid file */
int i_count;
asf_object_t *p_child;
- if( !p_obj )
- {
- return( 0 );
- }
+ if( !p_obj ) return( 0 );
i_count = 0;
p_child = p_obj->common.p_first;
return( i_count );
}
-void *__ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid, int i_number )
+void *__ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid,
+ int i_number )
{
asf_object_t *p_child;
}
return( NULL );
}
-
projects / vlc / blobdiff