Changeset 9d349e1ce5812e1d6e7a754368d240d00efe03e2

Timestamp:

02/27/08 20:46:04 (6 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1204141564 +0000

git-parent:

[689d893b4e6d2c86d5b63f5d4c358cf1a09795e0]

git-author:

Rafaël Carré <funman@videolan.org> 1204141564 +0000

Message:

asf demuxer: fix header demuxing & use padding without confusing the user (refs #1404)

Files:

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

modules/demux/asf/asf.c

@@ -90 +90 @@
-
-    unsigned int        i_track;
-
+ /* track number is stored on 7 bits */
-
-    int64_t             i_data_begin;
@@ -150 +150 @@
-        int i_result;
-
-
+
+
+
+
+
-
-        /* Check if we have concatenated files */
@@ -427 +431 @@
-    GETVALUE2b( i_packet_flags >> 3, i_packet_padding_length, 0 );
-
+    if( i_packet_padding_length > i_packet_length )
+    {
+        msg_Warn( p_demux, "Too large padding: %d", i_packet_padding_length );
+        goto loop_error_recovery;
+    }
+
-    i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
-    i_packet_duration  = GetWLE( p_peek + i_skip ); i_skip += 2;
-
-
-
-
+
-
-    if( b_packet_multiple_payload )
@@ -513 +521 @@
-        else
-        {
-
-
-
-
-
+
+
+
+
-        {
-            break;
@@ -617 +624 @@
-    if( i_packet_size_left > 0 )
-    {
+        msg_Warn( p_demux, "Didn't read %d bytes in the packet",
+                            i_packet_size_left );
-        if( stream_Read( p_demux->s, NULL, i_packet_size_left )
-                                                         < i_packet_size_left )
-        {
-Warn
+Err
-            return 0;
-        }
-    }
+
+    if( i_packet_padding_length > 0 )
+        if( stream_Read( p_demux->s, NULL, i_packet_padding_length )
+                                                    < i_packet_padding_length )
+        {
+            msg_Err( p_demux, "cannot skip padding data, EOF ?" );
+            return 0;
+        }
-
-    return 1;

modules/demux/asf/libasf.c

@@ -135 +135 @@
-static void ASF_FreeObject_Null( asf_object_t *pp_obj )
-{
+    VLC_UNUSED(pp_obj);
-    return;
-}
@@ -271 +272 @@
-    const uint8_t *p_peek;
-
-
+ 
-    {
-       return VLC_EGENERIC;
@@ -279 +280 @@
-    p_fp->i_creation_date = GetQWLE( p_peek + 48 );
-    p_fp->i_data_packets_count = GetQWLE( p_peek + 56 );
-
-
-
+
+
+
+
-    p_fp->i_flags = GetDWLE( p_peek + 88 );
-    p_fp->i_min_data_packet_size = GetDWLE( p_peek + 92 );
@@ -291 +293 @@
-            "read \"file properties object\" file_id:" GUID_FMT
-            " file_size:"I64Fd" creation_date:"I64Fd" data_packets_count:"
-play_duration:"I64Fd" send_duration:"I64Fd" preroll:
-I64Fd" flags:%d min_data_packet_size:%d max
-
+send_duration:"I64Fd" play_duration:"I64Fd" preroll:%d
+"unknown:%d flags:%d min
+data_packet_size:%d max_
-            GUID_PRINT( p_fp->i_file_id ), p_fp->i_file_size,
-            p_fp->i_creation_date, p_fp->i_data_packets_count,
-play_duration, p_fp->i_send
-
+send_duration, p_fp->i_play
+unknown, p_fp->i_
-            p_fp->i_min_data_packet_size, p_fp->i_max_data_packet_size,
-            p_fp->i_max_bitrate );

modules/demux/asf/libasf.h

@@ -199 +199 @@
-    uint64_t     i_creation_date;
-    uint64_t     i_data_packets_count;
+    uint64_t     i_send_duration;
-    uint64_t     i_play_duration;
-64_t     i_send_duration
-64_t     i_preroll;
+32_t     i_preroll
+32_t     i_unknown; /* ignored, usually 0 */
-    uint32_t     i_flags;
-    uint32_t     i_min_data_packet_size;