Changeset 14aec2164042b834c59c5ba53c0ea6def78a79cd

Timestamp:

10/21/02 11:18:37 (6 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[df45b8c5e0549eb599fe4ee643e901ddff9f9eb0]

git-author:

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

Message:

• configure.ac.in Makefile.am: enable asf demuxer plugin
  
• modules/demux/asf/*: some clean up
  

Files:

• configure.ac.in (modified) (1 diff)
• modules/Makefile.am (modified) (1 diff)
• modules/demux/asf/asf.c (modified) (23 diffs)
• modules/demux/asf/libasf.c (modified) (3 diffs)
• modules/demux/asf/libasf.h (modified) (2 diffs)

configure.ac.in

@@ -1041 +1041 @@
-then
-  PLUGINS="${PLUGINS} avi"
+fi
+
+dnl
+dnl  ASF demux plugin
+dnl
+AC_ARG_ENABLE(asf,
+  [  --enable-asf            ASF demux module (default enabled)])
+if test "x${enable_asf}" != "xno"
+then
+  PLUGINS="${PLUGINS} asf"
-fi
-

modules/Makefile.am

@@ -33 +33 @@
-    demux/aac/Modules.am \
-    demux/avi/Modules.am \
+    demux/asf/Modules.am \
-    demux/mp4/Modules.am \
-    demux/mpeg/Modules.am \

modules/demux/asf/asf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/10/20 17:22:33
+2 2002/10/21 09:18:37
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * 
@@ -84 +84 @@
-
-    /* a little test to see if it could be a asf stream */
-8
+16
-    {
-        msg_Warn( p_input, "ASF v1.0 plugin discarded (cannot peek)" );
@@ -104 +104 @@
-    }
-    memset( p_demux, 0, sizeof( demux_sys_t ) );
-    p_input->p_demux_data = p_demux;
-       
-
-    /* Now load all object ( except raw data ) */
@@ -123 +121 @@
-    }
-   
-(asf_object_t*)
+
-                                    &asf_object_file_properties_guid, 0 ) ) )
-    {
@@ -140 +138 @@
-    }
-    
-(asf_object_t*)
+
-                                          &asf_object_stream_properties_guid );
-    if( !p_demux->i_streams )
@@ -177 +175 @@
-        asf_object_stream_properties_t *p_sp;
-        
-
-
-
-
-
-
+
+
+
+
+
+
+
-        memset( p_stream, 0, sizeof( asf_stream_t ) );
-        p_stream->p_sp = p_sp;
@@ -219 +218 @@
-            switch( i_codec )
-            {
+                case( 0x01 ):
+                    p_stream->p_es->i_fourcc = 
+                        VLC_FOURCC( 'a', 'r', 'a', 'w' );
+                    break;
-                case( 0x50 ):
-                case( 0x55 ):
@@ -277 +280 @@
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
-    // go to first packet
-    p_demux->i_data_begin = p_demux->root.p_data->i_object_pos + 50;
-    if( p_demux->root.p_data->i_object_size != 0 )
@@ -288 +290 @@
-        p_demux->i_data_end = -1;
-    }
+
+
+    // go to first packet
-    ASF_SeekAbsolute( p_input, p_demux->i_data_begin );
-    return( 0 );
@@ -296 +301 @@
- *****************************************************************************/
-#define GETVALUE2b( bits, var, def ) \
-bits
+(bits)&0x03
-    { \
-        case 1: var = p_peek[i_skip]; i_skip++; break; \
@@ -314 +319 @@
-    {
-        off_t i_offset;
+        
-        i_offset = ASF_TellAbsolute( p_input ) - p_demux->i_data_begin;
-
+
-        if( i_offset  < 0 )
-        {
@@ -325 +331 @@
-
-        p_demux->i_time = 0;
-7
+8
-        {
-#define p_stream p_demux->stream[i]
@@ -344 +350 @@
-    /* update pcr XXX in mpeg scale so in 90000 unit/s */
-    p_demux->i_pcr = p_demux->i_time * 9 / 100;
-    
-//    /* we will read 100ms for each stream so */
-//    p_demux->i_time += 100 * 1000;
-
-    for( i = 0; i < 10; i++ ) // parse 10 packets
@@ -410 +413 @@
-
-        /* read some value */
-( i_packet_flags >> 5 )&0x3
-( i_packet_flags >> 1 )&0x3
-( i_packet_flags >> 3 )&0x
+i_packet_flags >> 5
+i_packet_flags >> 1
+i_packet_flags >> 
-
-        i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
@@ -450 +453 @@
-            i_skip++;
-            
-( i_packet_property >> 4 )&0x03
-( i_packet_property >> 2 )&0x03
-&0x03
+i_packet_property >> 4
+i_packet_property >> 2
+
-            
-            if( i_replicated_data_length > 1 ) // should be at least 8 bytes
@@ -491 +494 @@
-            }
-            
+#if 0
-             msg_Dbg( p_input, 
-                      "payload(%d/%d) stream_number:%d media_object_number:%d media_object_offset:%d replicated_data_length:%d payload_data_length %d",
@@ -500 +504 @@
-                      i_replicated_data_length, 
-                      i_payload_data_length );
-
+
-
-            if( !( p_stream = p_demux->stream[i_stream_number] ) )
@@ -516 +520 @@
-
-
-
+
+
+
+
-            {
-                data_packet_t  *p_data;
@@ -531 +538 @@
-                }
-
-
-
-
-
+
+
+
-                    if( p_stream->p_pes->i_pes_size > 0 )
-                    {
@@ -544 +550 @@
-                if( !p_stream->p_pes )  // add a new PES
-                {
-                    mtime_t i_date;
-                    p_stream->i_time = ( (mtime_t)i_pts + i_payload * (mtime_t)i_pts_delta );
-                    
@@ -582 +587 @@
-
-                i_skip = 0;
-<=
+>
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        if( i_packet_size_left > 0 )
-        {
-            if( !ASF_SkipBytes( p_input, i_packet_size_left ) )
-            {
-Err
+Warn
-                return( 0 );
-            }
-        }
-
-
-        continue;
@@ -623 +619 @@
-        ASF_SkipBytes( p_input, i_data_packet_min );
-
-        continue;
-    }   // loop over packet
-    
-    p_demux->i_time = 0;
-7
+8
-    {
-#define p_stream p_demux->stream[i]
@@ -650 +645 @@
-    input_thread_t *  p_input = (input_thread_t *)p_this;
-    demux_sys_t *p_demux = p_input->p_demux_data;
+    int i_stream;
-    
-    msg_Dbg( p_input, "Freeing all memory" );
-    ASF_FreeObjectRoot( p_input, &p_demux->root );
+    for( i_stream = 0; i_stream < 128; i_stream++ )
+    {
+#define p_stream p_demux->stream[i_stream]
+        if( p_stream )
+        {
+            if( p_stream->p_pes )
+            {
+                input_DeletePES( p_input->p_method_data, p_stream->p_pes );
+            }
+            free( p_stream );
+        }
+#undef p_stream
+    }
-    
-#undef FREE

modules/demux/asf/libasf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/10/20 17:22:33
+2 2002/10/21 09:18:37
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * 
@@ -893 +893 @@
-}
-
-
+__
-{
-    int i_count;
@@ -916 +916 @@
-}
-
-asf_object_t *
+void *__
-{
-    asf_object_t *p_child;

modules/demux/asf/libasf.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/10/20 17:22:33
+2 2002/10/21 09:18:37
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * 
@@ -441 +441 @@
-void ASF_FreeObjectRoot( input_thread_t *p_input,
-                         asf_object_root_t *p_root );
-
-
-
-
-
+
+
+
+
+
+
+