Changeset 6c84da28c658041cf1d9090d4414f0b5acfc947b

Timestamp:

10/09/04 13:35:42 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1094816142 +0000

git-parent:

[55cab795f441f0962044912e91645f1dfc723013]

git-author:

Gildas Bazin <gbazin@videolan.org> 1094816142 +0000

Message:

* commit modules/demux/asf/*: load and parse the metadata object + coding style changes.

Files:

• modules/demux/asf/libasf.c (modified) (30 diffs)
• modules/demux/asf/libasf.h (modified) (9 diffs)

modules/demux/asf/libasf.c

@@ -1 +1 @@
-/*****************************************************************************
-
+ asf stream demux module for vlc
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $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
@@ -45 +47 @@
- *
- ****************************************************************************/
-
-
-
+
-
-/****************************************************************************
@@ -88 +88 @@
-    p_common->i_object_pos  = stream_Tell( s );
-    p_common->p_next = NULL;
+
-#ifdef ASF_DEBUG
-    msg_Dbg( (vlc_object_t*)s,
@@ -114 +115 @@
-        return VLC_EGENERIC;
-    }
-
-
-
+
+
+
+
+
-                p_obj->common.i_object_pos + p_obj->common.i_object_size + 24 )
-                                /* 24 is min size of an object */
@@ -125 +128 @@
-    }
-
-
-
-
+
+
-}
-
@@ -152 +154 @@
-    p_hdr->p_first = NULL;
-    p_hdr->p_last  = NULL;
+
-#ifdef ASF_DEBUG
-    msg_Dbg( (vlc_object_t*)s,
@@ -159 +162 @@
-             p_hdr->i_reserved2 );
-#endif
-
+
+
-    stream_Read( s, NULL, 30 );
-
@@ -165 +169 @@
-    for( ; ; )
-    {
- 
+
-
-        if( ASF_ReadObject( s, p_subobj, (asf_object_t*)p_hdr ) )
-        {
+            free( p_subobj );
-            break;
-        }
@@ -192 +197 @@
-    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,
@@ -200 +206 @@
-             p_data->i_reserved );
-#endif
+
-    return VLC_SUCCESS;
-}
@@ -229 +236 @@
-            (long int)p_index->i_index_entry_count );
-#endif
+
-    return VLC_SUCCESS;
-}
+
-static void ASF_FreeObject_Index( asf_object_t *p_obj )
-{
@@ -267 +276 @@
-            I64Fd" flags:%d min_data_packet_size:%d max_data_packet_size:%d "
-            "max_bitrate:%d",
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            p_fp->i_max_bitrate );
-#endif
+
-    return VLC_SUCCESS;
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    int     i_peek;
-    uint8_t *p_peek;
@@ -294 +419 @@
-    ASF_GetGUID( &p_he->i_reserved1, p_peek + 24 );
-    p_he->i_reserved2 = GetWLE( p_peek + 40 );
-t
-t
-
-tion_data = malloc( p_he->i_header_extention_size );
-memcpy( p_he->p_header_extention_data,
-       
-t
+s
+s
+
+sion_data =
+    malloc( p_he->i_header_extension_size );
+memcpy( p_he->p_header_extension_data,
+s
-    }
-    else
-    {
-
-
+
+
+
-#ifdef ASF_DEBUG
-    msg_Dbg( (vlc_object_t*)s,
-tion object\" reserved1:" GUID_FMT " reserved2:%d header_extention_size:%d",
-GUID_PRINT( p_he->i_reserved1 )
-
-t
+sion object\" reserved1:" GUID_FMT
+" reserved2:%d header_extension_size:%d"
+GUID_PRINT( p_he->i_reserved1 ), 
+s
-#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;
-}
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -343 +492 @@
-    if( p_sp->i_type_specific_data_length )
-    {
- malloc( p_sp->i_type_specific_data_length );
-memcpy( p_sp->p_type_specific_data,
-       
+
+    malloc( p_sp->i_type_specific_data_length );
+memcpy( p_sp->p_type_specific_data,
-                p_sp->i_type_specific_data_length );
-    }
@@ -354 +503 @@
-    if( p_sp->i_error_correction_data_length )
-    {
-
+
+
-        memcpy( p_sp->p_error_correction_data,
-                p_peek + 78 + p_sp->i_type_specific_data_length,
@@ -463 +613 @@
-
-#ifdef ASF_DEBUG
-
-
-
-
+
+
+
-
-    for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ )
-    {
-#define codec p_cl->codec[i_codec]
-(vlc_object_t*)s,
-read \"codec list object\" codec[%d] %s name:\"%s\" 
-
-( codec.i_type == ASF_CODEC_TYPE_VIDEO ) ? "video" : ( ( codec.i_type == ASF_CODEC_TYPE_AUDIO ) ? "audio" : "unknown" ),
-codec.psz_name
-
+s, "read \"codec list object\" codec[%d] %s name:\"%s\" "
+
+ ( codec.i_type == ASF_CODEC_TYPE_VIDEO ) ?
+"video" : ( ( codec.i_type == ASF_CODEC_TYPE_AUDIO ) ?
+"audio" : "unknown" )
+name, codec.psz_
-                 codec.i_information_length );
+#undef  codec
-    }
-#endif
+
-    return VLC_SUCCESS;
-}
@@ -494 +645 @@
-        FREE( codec.psz_description );
-        FREE( codec.p_information );
-
-#undef  codec
-    }
@@ -505 +655 @@
-{
-    asf_object_content_description_t *p_cd =
-
-
+
-    uint8_t *p_peek, *p_data;
-
-
-
-
-
-
-
+
+
-
-#define GETSTRINGW( psz_str, i_size ) \
@@ -560 +704 @@
-{
-    asf_object_content_description_t *p_cd =
-                            (asf_object_content_description_t
+(asf_object_content_description_t 
-
-    FREE( p_cd->psz_title );
@@ -575 +719 @@
-    int     (*ASF_ReadObject_function)( stream_t *, asf_object_t *p_obj );
-    void    (*ASF_FreeObject_function)( asf_object_t *p_obj );
+
-} ASF_Object_Function [] =
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
-
-obj, asf_object_t *p_
+ asf_object_t *p_obj,
+
-{
-    int i_result;
-    int i_index;
-
-
-
-
-
+
+
-    if( ASF_ReadObjectCommon( s, p_obj ) )
-    {
@@ -610 +764 @@
-    p_obj->common.p_last = NULL;
-
-
-    if( p_obj->common.i_object_size < 24 )
-    {
@@ -616 +769 @@
-        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,
-
+    
-        {
-            break;
@@ -664 +818 @@
-    asf_object_t *p_child;
-
-
-
-
-
+
-
-    /* Free all child object */
@@ -730 +881 @@
-    p_root->p_fp    = NULL;
-    p_root->p_index = NULL;
+    p_root->p_hdr_ext = NULL;
+    p_root->p_metadata = NULL;
-
-    for( ; ; )
-    {
- 
+
-
-        if( ASF_ReadObject( s, p_obj, (asf_object_t*)p_root ) )
-        {
+            free( p_obj );
-            break;
-        }
@@ -750 +904 @@
-                p_root->p_index = (asf_object_index_t*)p_obj;
-                break;
+            case( ASF_OBJECT_TYPE_HEADER_EXTENSION ):
+                p_root->p_hdr_ext = (asf_object_header_extension_t*)p_obj;
+                break;
-            default:
-                msg_Warn( (vlc_object_t*)s, "unknow object found" );
@@ -762 +919 @@
-        if( !b_seekable && p_root->p_hdr && p_root->p_data )
-        {
-t
+g
-            break;
-        }
@@ -779 +936 @@
-        if( p_root->p_fp )
-        {
+
+            if( p_root->p_hdr_ext != NULL )
+            {
+                p_root->p_metadata =
+                    ASF_FindObject( p_root->p_hdr_ext,
+                                    &asf_object_metadata_guid, 0 );
+            }
+
-            return p_root;
-        }
@@ -809 +974 @@
-    asf_object_t *p_child;
-
-
-
-
-
+
-
-    i_count = 0;
@@ -827 +989 @@
-}
-
-
+
+
-{
-    asf_object_t *p_child;
@@ -849 +1012 @@
-    return( NULL );
-}
-

modules/demux/asf/libasf.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-: libasf.h,v 1.8 2004/01/25 20:05:28 hartman Exp 
+
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -40 +40 @@
-#define ASF_OBJECT_TYPE_FILE_PROPERTIES     0x0005
-#define ASF_OBJECT_TYPE_STREAM_PROPERTIES   0x0006
-EXTENTION_HEADER
+HEADER_EXTENSION
-#define ASF_OBJECT_TYPE_CODEC_LIST          0x0008
-#define ASF_OBJECT_TYPE_MARKER              0x0009
-#define ASF_OBJECT_TYPE_CONTENT_DESCRIPTION 0x000a
+#define ASF_OBJECT_TYPE_METADATA            0x000b
-
-static const guid_t asf_object_null_guid =
@@ -54 +55 @@
-
-static const guid_t asf_object_header_guid =
-
-
-
-
-
-
+
-
-static const guid_t asf_object_data_guid =
-
-
-
-
-
-
-
-
+
-
-static const guid_t asf_object_index_guid =
-
-
-
-
-
-
+
-
-static const guid_t asf_object_file_properties_guid =
-
-
-
-
-
-
-
+
+
-static const guid_t asf_object_stream_properties_guid =
-
-
-
-
-
-
-
+
-
-static const guid_t asf_object_content_description_guid =
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-static const guid_t asf_object_codec_list_guid =
-
-
-
-
-
-
+
-
-static const guid_t asf_object_marker_guid =
-
-
-
-
-
-
-
+
-
-static const guid_t asf_object_stream_type_audio =
-
-
-
-
-
-
+
-
-static const guid_t asf_object_stream_type_video =
-
-
-
-
-
-
+
-
-static const guid_t asf_object_stream_type_command =
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    union asf_object_u *p_father;  \
-    union asf_object_u *p_first;   \
@@ -254 +194 @@
-} asf_object_stream_properties_t;
-
-t
+s
-{
-    ASF_OBJECT_COMMON
@@ -260 +200 @@
-    guid_t      i_reserved1;
-    uint16_t    i_reserved2;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-typedef struct asf_objec_content_description_s
@@ -281 +249 @@
-    uint16_t i_length;
-    uint16_t *i_char;
+
-} string16_t;
-
@@ -340 +309 @@
-    /* could be NULL if !b_seekable or not-present */
-    asf_object_index_t  *p_index;
+    asf_object_header_extension_t *p_hdr_ext;
-
-    /* from asf_object_header_t */
-    asf_object_file_properties_t *p_fp;
-
+
+
+
+
-} asf_object_root_t;
-
@@ -358 +331 @@
-    asf_object_file_properties_t    file_properties;
-    asf_object_stream_properties_t  stream_properties;
-
+
+
-    asf_object_codec_list_t         codec_list;
-    asf_object_marker_t             marker;
@@ -365 +339 @@
-
-
-
-
-
+
+
-
-asf_object_root_t *ASF_ReadObjectRoot( stream_t *, int b_seekable );
-  
+
-
-#define ASF_CountObject( a, b ) __ASF_CountObject( (asf_object_t*)(a), b )
-  
+
-
-#define ASF_FindObject( a, b, c )  __ASF_FindObject( (asf_object_t*)(a), b, c )
-
-
+