Changeset e5fe2b341fad70233788ceb83533c8d1a5a91d87

Timestamp:

29/08/03 03:11:43 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[6c7682e327bb10893077397ab545c9f96dc8c221]

git-author:

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

Message:

• asf: added stream infos object and fix a bug in packetization.
  -> it seems that WMP plays it without problem :))) (tested with DIV3+mp3)
  

Files:

• modules/mux/asf.c (modified) (16 diffs)

modules/mux/asf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003 VideoLAN
-5 2003/08/26 23:14:11
+6 2003/08/29 01:11:43
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -65 +65 @@
-typedef struct
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-} asf_track_t;
-
@@ -117 +123 @@
-static void bo_add_mem  ( bo_t *, uint8_t *, int );
-
+static void bo_addle_str16( bo_t *, char * );
-
-/*****************************************************************************
@@ -238 +245 @@
-        case AUDIO_ES:
-        {
-            uint16_t i_tag;
-            int      i_blockalign = p_input->p_fmt->i_block_align;
-            int      i_bitspersample = 0;
@@ -246 +252 @@
-            {
-                case VLC_FOURCC( 'a', '5', '2', ' ' ):
-
+
+
-                    break;
-                case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
-#if 1
-
+
+
-                    i_blockalign = 1;
-                    i_extra = 12;
-                    break;
-#else
-
+
+
-                    i_blockalign = 1;
-                    i_extra = 22;
@@ -261 +270 @@
-#endif
-                case VLC_FOURCC( 'w', 'm', 'a', '1' ):
-
+
+
-                    break;
-                case VLC_FOURCC( 'w', 'm', 'a', '2' ):
-
+
+
-                    break;
-                case VLC_FOURCC( 'w', 'm', 'a', '3' ):
-
+
+
-                    break;
-                    /* raw codec */
-                case VLC_FOURCC( 'u', '8', ' ', ' ' ):
-
+
+
-                    i_blockalign= p_input->p_fmt->i_channels;
-                    i_bitspersample = 8;
-                    break;
-                case VLC_FOURCC( 's', '1', '6', 'l' ):
-
+
+
-                    i_blockalign= 2 * p_input->p_fmt->i_channels;
-                    i_bitspersample = 16;
-                    break;
-                case VLC_FOURCC( 's', '2', '4', 'l' ):
-
+
+
-                    i_blockalign= 3 * p_input->p_fmt->i_channels;
-                    i_bitspersample = 24;
-                    break;
-                case VLC_FOURCC( 's', '3', '2', 'l' ):
-
+
+
-                    i_blockalign= 4 * p_input->p_fmt->i_channels;
-                    i_bitspersample = 32;
@@ -294 +310 @@
-            }
-
+
-            tk->i_extra = sizeof( WAVEFORMATEX ) +
-                          p_input->p_fmt->i_extra_data + i_extra;
-            tk->p_extra = malloc( tk->i_extra );
-            bo_init( &bo, tk->p_extra, tk->i_extra );
-
+tk->
-            bo_addle_u16( &bo, p_input->p_fmt->i_channels );
-            bo_addle_u32( &bo, p_input->p_fmt->i_sample_rate );
@@ -313 +330 @@
-            {
-                bo_addle_u16( &bo, i_extra );
-
+tk->
-                {
-                    msg_Dbg( p_mux, "adding mp3 header" );
@@ -322 +339 @@
-                    bo_addle_u16( &bo, 1393 );  /* nCodecDelay */
-                }
-
+tk->
-                {
-                    msg_Dbg( p_mux, "adding mp2 header" );
@@ -365 +382 @@
-            if( p_input->p_fmt->i_fourcc == VLC_FOURCC('m','p','4','v') )
-            {
-
+
+
-            }
-            else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('D','I','V','3') )
-            {
-
+
+
-            }
-            else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('D','I','V','2') )
-            {
-
+
+
-            }
-            else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('D','I','V','1') )
-            {
-
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            else
-            {
-
-
+
+
+
+
-            bo_addle_u32( &bo, 0 );
-            bo_addle_u32( &bo, 0 );
@@ -568 +601 @@
-}
-
+static void bo_addle_str16( bo_t *bo, char *str )
+{
+    bo_addle_u16( bo, strlen( str ) + 1 );
+    for( ;; )
+    {
+        uint16_t c;
+
+        c = (uint8_t)*str++;
+        bo_addle_u16( bo, c );
+        if( c == '\0' )
+        {
+            break;
+        }
+    }
+}
+
-/****************************************************************************
- * guid
@@ -659 +708 @@
-    { 0x8E, 0xE6,0x00, 0xC0, 0x0C ,0x20, 0x53, 0x65 }
-};
+static const guid_t asf_object_comment_guid =
+{
+    0x86D15240,
+    0x311D,
+    0x11D0,
+    { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 }
+};
+static const guid_t asf_object_comment_reserved_guid =
+{
+    0x86D15241,
+    0x311D,
+    0x11D0,
+    { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 }
+};
-
-static void asf_chunk_add( bo_t *bo,
@@ -678 +741 @@
-    mtime_t        i_duration = 0;
-    int i_size;
+    int i_ci_size;
-    sout_buffer_t *out;
-    bo_t          bo;
@@ -693 +757 @@
-    /* calculate header size */
-    i_size = 30 + 104 + 46;
+    i_ci_size = 44;
-    for( i = 1; i < p_sys->i_track; i++ )
-    {
-        i_size += 78 + p_sys->track[i].i_extra;
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if( p_sys->b_asf_http )
@@ -766 +842 @@
-    }
-
+    /* Codec Infos */
+    bo_add_guid ( &bo, &asf_object_comment_guid );
+    bo_addle_u64( &bo, i_ci_size );
+    bo_add_guid ( &bo, &asf_object_comment_reserved_guid );
+    bo_addle_u32( &bo, p_sys->i_track - 1 );
+    for( i = 1; i < p_sys->i_track; i++ )
+    {
+        tk = &p_sys->track[i];
+
+        bo_addle_u16( &bo, tk->i_id );
+        bo_addle_str16( &bo, tk->psz_name );
+        bo_addle_u16( &bo, 0 );
+        if( tk->i_cat == AUDIO_ES )
+        {
+            bo_addle_u16( &bo, 2 );
+            bo_addle_u16( &bo, tk->i_tag );
+        }
+        else if( tk->i_cat == VIDEO_ES )
+        {
+            bo_addle_u16( &bo, 4 );
+            bo_add_mem  ( &bo, (uint8_t*)&tk->i_fourcc, 4 );
+
+        }
+    }
+
-    /* data object */
-    bo_add_guid ( &bo, &asf_object_data_guid );
@@ -825 +926 @@
-        p_sys->i_pk_frame++;
-
-4
+7
-        {
-            /* not enough data for another payload, flush the packet */