Changeset 3c230b2a0ee3bde44059d53b7917dd987e99606f

Timestamp:

07/02/08 21:57:31 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1215028651 +0000

git-parent:

[2536e65c1266d9ec992acf4c516d8eb90acc81b3]

git-author:

Laurent Aimar <fenrir@videolan.org> 1215027588 +0000

Message:

Fixed definition of asf_object_t.
Simplicy asf_object_t use.

Files:

• modules/demux/asf/libasf.c (modified) (27 diffs)
• modules/demux/asf/libasf.h (modified) (1 diff)

modules/demux/asf/libasf.c

@@ -155 +155 @@
-static int ASF_ReadObjectCommon( stream_t *s, asf_object_t *p_obj )
-{
-(asf_object_common_t*)p_obj
+&p_obj->common
-    const uint8_t *p_peek;
-
@@ -214 +214 @@
-static int  ASF_ReadObject_Header( stream_t *s, asf_object_t *p_obj )
-{
-(asf_object_header_t*)p_obj
+&p_obj->header
-    asf_object_t        *p_subobj;
-    int                 i_peek;
@@ -257 +257 @@
-static int ASF_ReadObject_Data( stream_t *s, asf_object_t *p_obj )
-{
-(asf_object_data_t*)p_obj
+&p_obj->data
-    int               i_peek;
-    const uint8_t     *p_peek;
@@ -282 +282 @@
-static int ASF_ReadObject_Index( stream_t *s, asf_object_t *p_obj )
-{
-(asf_object_index_t*)p_obj
+&p_obj->index
-    const uint8_t      *p_peek;
-    int                 i;
@@ -327 +327 @@
-static void ASF_FreeObject_Index( asf_object_t *p_obj )
-{
-(asf_object_index_t*)p_obj
+&p_obj->index
-
-    FREENULL( p_index->index_entry );
@@ -334 +334 @@
-static int ASF_ReadObject_file_properties( stream_t *s, asf_object_t *p_obj )
-{
-(asf_object_file_properties_t*)p_obj
+&p_obj->file_properties
-    int           i_peek;
-    const uint8_t *p_peek;
@@ -373 +373 @@
-static void ASF_FreeObject_metadata( asf_object_t *p_obj )
-{
-
-
+
-    unsigned int i;
-
@@ -387 +386 @@
-static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj )
-{
-
-
+
-
-    int i_peek;
@@ -495 +493 @@
-static int ASF_ReadObject_header_extension( stream_t *s, asf_object_t *p_obj )
-{
-
-
+
-    int     i_peek;
-    const uint8_t *p_peek;
@@ -558 +555 @@
-static void ASF_FreeObject_header_extension( asf_object_t *p_obj )
-{
-
-
+
-
-    FREENULL( p_he->p_header_extension_data );
@@ -566 +562 @@
-static int ASF_ReadObject_stream_properties( stream_t *s, asf_object_t *p_obj )
-{
-
-
+
-    size_t        i_peek;
-    const uint8_t *p_peek;
@@ -647 +642 @@
-static void ASF_FreeObject_stream_properties( asf_object_t *p_obj )
-{
-
-
+
-
-    FREENULL( p_sp->p_type_specific_data );
@@ -657 +651 @@
-static int ASF_ReadObject_codec_list( stream_t *s, asf_object_t *p_obj )
-{
-(asf_object_codec_list_t*)p_obj
+&p_obj->codec_list
-    int     i_peek;
-    const uint8_t *p_peek, *p_data;
@@ -737 +731 @@
-static void ASF_FreeObject_codec_list( asf_object_t *p_obj )
-{
-(asf_object_codec_list_t*)p_obj
+&p_obj->codec_list
-    unsigned int i_codec;
-
@@ -755 +749 @@
-static int ASF_ReadObject_content_description(stream_t *s, asf_object_t *p_obj)
-{
-
-
+
-    const uint8_t *p_peek, *p_data;
-    int i_peek, i_title, i_artist, i_copyright, i_description, i_rating;
@@ -822 +815 @@
-static void ASF_FreeObject_content_description( asf_object_t *p_obj)
-{
-
-
+
-
-    FREENULL( p_cd->psz_title );
@@ -835 +827 @@
-static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
-{
-
-
+
-    const uint8_t *p_peek, *p_data;
-    int i_peek;
@@ -872 +863 @@
-static void ASF_FreeObject_language_list( asf_object_t *p_obj)
-{
-
-
+
-    int i;
-
@@ -885 +875 @@
-                                                     asf_object_t *p_obj)
-{
-
-
+
-    const uint8_t *p_peek, *p_data;
-    int i_peek;
@@ -927 +916 @@
-                                                      asf_object_t *p_obj)
-{
-
-
+
-    const uint8_t *p_peek, *p_data;
-    int i_peek, i;
@@ -1025 +1013 @@
-static void ASF_FreeObject_extended_stream_properties( asf_object_t *p_obj)
-{
-
-
+
-    int i;
-
@@ -1039 +1026 @@
-                                                     asf_object_t *p_obj)
-{
-
-
+
-    const uint8_t *p_peek, *p_data;
-    int i_peek;
@@ -1072 +1058 @@
-static void ASF_FreeObject_advanced_mutual_exclusion( asf_object_t *p_obj)
-{
-
-
+
-
-    FREENULL( p_ae->pi_stream_number );
@@ -1082 +1067 @@
-                                                 asf_object_t *p_obj)
-{
-
-
+
-    const uint8_t *p_peek, *p_data;
-    int i_peek;
@@ -1119 +1103 @@
-static void ASF_FreeObject_stream_prioritization( asf_object_t *p_obj)
-{
-
-
+
-
-    FREENULL( p_sp->pi_priority_stream_number );
@@ -1131 +1114 @@
-{
-    asf_object_extended_content_description_t *p_ec =
-(asf_object_extended_content_description_t *)p_obj
+                                &p_obj->extended_content_description
-    const uint8_t *p_peek, *p_data;
-    int i_peek;
@@ -1224 +1207 @@
-{
-    asf_object_extended_content_description_t *p_ec =
-(asf_object_extended_content_description_t *)p_obj
+                                &p_obj->extended_content_description
-    int i;
-

modules/demux/asf/libasf.h

@@ -443 +443 @@
-    asf_object_codec_list_t         codec_list;
-    asf_object_marker_t             marker;
-
+uage_list
-    asf_object_stream_bitrate_properties_t stream_bitrate;
-    asf_object_extended_stream_properties_t ext_stream;
+    asf_object_content_description_t content_description;
+    asf_object_advanced_mutual_exclusion_t advanced_mutual_exclusion;
+    asf_object_stream_prioritization_t stream_prioritization;
+    asf_object_extended_content_description_t extended_content_description;
-
-} asf_object_t;