Changeset 5f782bc34f618ef58e01cd8fcba1f2fc0cb29402

Timestamp:

11/11/03 01:37:59 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[a7a7e7097451c2b7bb70dd7ad59eb1b050090d52]

git-author:

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

Message:

• all: use es_format_t and es_out_*. (Not well tested yet...)
  

Files:

• modules/demux/a52sys.c (modified) (6 diffs)
• modules/demux/aac.c (modified) (5 diffs)
• modules/demux/asf/asf.c (modified) (14 diffs)
• modules/demux/au.c (modified) (11 diffs)

modules/demux/a52sys.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-6 2003/09/12 16:26:40
+7 2003/11/11 00:37:59
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -56 +56 @@
-    mtime_t         i_time;
-
-descriptor_t
+out_id_t    
-};
-
@@ -77 +77 @@
-
-/*****************************************************************************
-AC
+52
- *****************************************************************************/
-static int Open( vlc_object_t * p_this )
@@ -89 +89 @@
-    module_t       *p_id3;
-
+    es_format_t    fmt;
+
-
-    if( p_input->psz_demux && !strncmp( p_input->psz_demux, "a52", 3 ) )
@@ -167 +169 @@
-        goto error;
-    }
-    if( input_AddProgram( p_input, 0, 0) == NULL )
-    {
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-        msg_Err( p_input, "cannot add program" );
-        goto error;
-    }
-    p_input->stream.pp_programs[0]->b_is_ok = 0;
-    p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-
-    p_input->stream.i_mux_rate = 0 / 50;
-
-    p_sys->p_es = input_AddES( p_input,
-                               p_input->stream.p_selected_program,
-                               1 , AUDIO_ES, NULL, 0 );
-
-    p_sys->p_es->i_stream_id = 1;
-    p_sys->p_es->i_fourcc = VLC_FOURCC( 'a', '5', '2', ' ' );
-    input_SelectES( p_input, p_sys->p_es );
-
-    p_input->stream.p_selected_program->b_is_ok = 1;
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
+    es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', ' ' ) );
+    p_sys->p_es = es_out_Add( p_input->p_es_out, &fmt );
-    return VLC_SUCCESS;
-
@@ -266 +251 @@
-                                     p_sys->i_time * 9 / 100 );
-
-
-
-
-
-
-
-
-
+
+
-    p_sys->i_time += (mtime_t)1000000 *
-                     (mtime_t)1536 /

modules/demux/aac.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2003/09/12 16:26:40
+5 2003/11/11 00:37:59
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -57 +57 @@
-    mtime_t         i_time;
-
-descriptor_t
+out_id_t    
-};
-
@@ -101 +101 @@
-    module_t       *p_id3;
-
+    es_format_t    fmt;
+
-
-    if( p_input->psz_demux && !strncmp( p_input->psz_demux, "aac", 3 ) )
@@ -182 +184 @@
-        goto error;
-    }
-    if( input_AddProgram( p_input, 0, 0) == NULL )
-    {
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-        msg_Err( p_input, "cannot add program" );
-        goto error;
-    }
-    p_input->stream.pp_programs[0]->b_is_ok = 0;
-    p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-
-    p_input->stream.i_mux_rate = 0 / 50;
-
-    p_sys->p_es = input_AddES( p_input,
-                               p_input->stream.p_selected_program,
-                               1 , AUDIO_ES, NULL, 0 );
-
-    p_sys->p_es->i_stream_id = 1;
-    p_sys->p_es->i_fourcc = VLC_FOURCC( 'm', 'p', '4', 'a' );
-    input_SelectES( p_input, p_sys->p_es );
-
-    p_input->stream.p_selected_program->b_is_ok = 1;
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+    es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', '4', 'a' ) );
+    p_sys->p_es = es_out_Add( p_input->p_es_out, &fmt );
-
-    return VLC_SUCCESS;
@@ -280 +266 @@
-                                     p_sys->i_time * 9 / 100 );
-
-
-
-
-
-
-
-
-
+
+
-    p_sys->i_time += (mtime_t)1000000 *
-                     (mtime_t)AAC_FRAME_SAMPLES( h ) /

modules/demux/asf/asf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
-8 2003/09/12 16:26:40
+9 2003/11/11 00:37:59
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -55 +55 @@
-{
-    int i_cat;
-
+
+
+
-    asf_object_stream_properties_t *p_sp;
-
@@ -94 +96 @@
-    demux_sys_t     *p_sys;
-    unsigned int    i_stream;
-    unsigned int    i;
-    asf_object_content_description_t *p_cd;
-
@@ -149 +150 @@
-    msg_Dbg( p_input, "found %d streams", p_sys->i_streams );
-
-    /*  create one program */
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    if( input_InitStream( p_input, 0 ) == -1)
@@ -157 +157 @@
-        goto error;
-    }
-    if( input_AddProgram( p_input, 0, 0) == NULL )
-    {
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-        msg_Err( p_input, "cannot add program" );
-        goto error;
-    }
-    p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-    p_input->stream.i_mux_rate = 0 ; /* updated later */
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
@@ -185 +178 @@
-        p_stream->p_es = NULL;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-            p_stream->i_cat = AUDIO_ES;
-
-
-
+
-
-            msg_Dbg( p_input,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            p_stream->i_cat = VIDEO_ES;
-
-
-
-
-
+
+
+
-                     p_sp->i_stream_number );
-            if( p_sp->p_type_specific_data )
-            {
-                p_stream->p_es->i_fourcc =
-                    VLC_FOURCC( p_sp->p_type_specific_data[27],
-                                p_sp->p_type_specific_data[28],
-                                p_sp->p_type_specific_data[29],
-                                p_sp->p_type_specific_data[30] );
-            }
-            else
-            {
-                p_stream->p_es->i_fourcc =
-                    VLC_FOURCC( 'u','n','d','f' );
-            }
-            if( p_sp->i_type_specific_data_length > 11 )
-            {
-                BITMAPINFOHEADER *p_bih;
-                size_t      i_size;
-                uint8_t     *p_data;
-
-                i_size = p_sp->i_type_specific_data_length - 11;
-
-                p_bih = malloc( i_size );
-                p_stream->p_es->p_bitmapinfoheader = (void*)p_bih;
-                p_data = p_sp->p_type_specific_data + 11;
-
-                p_bih->biSize       = GetDWLE( p_data );
-                p_bih->biWidth      = GetDWLE( p_data + 4 );
-                p_bih->biHeight     = GetDWLE( p_data + 8 );
-                p_bih->biPlanes     = GetDWLE( p_data + 12 );
-                p_bih->biBitCount   = GetDWLE( p_data + 14 );
-                p_bih->biCompression= GetDWLE( p_data + 16 );
-                p_bih->biSizeImage  = GetDWLE( p_data + 20 );
-                p_bih->biXPelsPerMeter = GetDWLE( p_data + 24 );
-                p_bih->biYPelsPerMeter = GetDWLE( p_data + 28 );
-                p_bih->biClrUsed       = GetDWLE( p_data + 32 );
-                p_bih->biClrImportant  = GetDWLE( p_data + 36 );
-
-                if( i_size > sizeof( BITMAPINFOHEADER ) )
-                {
-                    memcpy( &p_bih[1],
-                            p_data + sizeof( BITMAPINFOHEADER ),
-                            i_size - sizeof( BITMAPINFOHEADER ) );
-                }
-            }
-
-        }
-        else
@@ -295 +240 @@
-                     p_sp->i_stream_number );
-        }
-
-
-
-
-
-
-
-
-
+
-
-    p_sys->i_data_begin = p_sys->p_root->p_data->i_object_pos + 50;
@@ -346 +283 @@
-        }
-    }
-
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    p_input->stream.p_selected_program->b_is_ok = 1;
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
-
-    /* We add all info about this stream */
@@ -380 +312 @@
-    }
-
+#if 0
+    /* FIXME to port to new way */
-    for( i_stream = 0, i = 0; i < 128; i++ )
-    {
@@ -421 +355 @@
-            input_AddInfo( p_cat, _("Resolution"), "%dx%d",
-                           p_bih->biWidth, p_bih->biHeight );
-            input_AddInfo( p_cat, _("Planes"), "%d", p_bih->biPlanes );
-            input_AddInfo( p_cat, _("Bits Per Pixel"), "%d", p_bih->biBitCount );
-            input_AddInfo( p_cat, _("Image Size"), "%d", p_bih->biSizeImage );
-            input_AddInfo( p_cat, _("X pixels per meter"), "%d",
-                           p_bih->biXPelsPerMeter );
-            input_AddInfo( p_cat, _("Y pixels per meter"), "%d",
-                           p_bih->biYPelsPerMeter );
-        }
-
-        i_stream++;
-    }
+#endif
-
-    return VLC_SUCCESS;
@@ -450 +378 @@
-    vlc_bool_t b_play_audio;
-    int i;
-    vlc_bool_t b_stream;
-
-    b_stream = VLC_FALSE;
-    for( i = 0; i < 128; i++ )
-    {
-        if( p_sys->stream[i] &&
-            p_sys->stream[i]->p_es &&
-            p_sys->stream[i]->p_es->p_decoder_fifo )
-        {
-            b_stream = VLC_TRUE;
-        }
-    }
-    if( !b_stream )
-    {
-        msg_Warn( p_input, "no stream selected, exiting..." );
-        return( 0 );
-    }
-
-    /* catch seek from user */
@@ -587 +498 @@
-    {
-#define p_stream p_sys->stream[i_stream]
-p_es->p_decoder_fifo && p_stream->
+
-        {
-            if( i_time < 0 )
@@ -802 +713 @@
-        }
-
-|| !p_stream->p_es->p_decoder_fifo 
+
-        {
-            i_skip += i_payload_data_length;
@@ -833 +744 @@
-                if( p_stream->p_pes->i_pes_size > 0 )
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                    p_stream->p_pes = NULL;
-                }

modules/demux/au.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-7 2003/09/12 16:26:40
+8 2003/11/11 00:37:59
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -94 +94 @@
-{
-    au_t            au;
-    WAVEFORMATEX    wf;
-
-    mtime_t         i_time;
-
-
+
+
-
-    int             i_frame_size;
@@ -114 +114 @@
-
-    uint8_t         *p_peek;
-
-    vlc_fourcc_t    i_fourcc;
-
-    int             i_cat;
@@ -171 +169 @@
-
-    /* Create WAVEFORMATEX structure */
-
-
-
-
+
+
+
-    switch( p_sys->au.i_encoding )
-    {
-        case AU_ALAW_8:        /* 8-bit ISDN A-law */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_MULAW_8:       /* 8-bit ISDN u-law */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_LINEAR_8:      /* 8-bit linear PCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_LINEAR_16:     /* 16-bit linear PCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_LINEAR_24:     /* 24-bit linear PCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_LINEAR_32:     /* 32-bit linear PCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_FLOAT:         /* 32-bit IEEE floating point */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_DOUBLE:        /* 64-bit IEEE floating point */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_PCM;
-            break;
-
-        case AU_ADPCM_G721:    /* 4-bit CCITT g.721 ADPCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_ADPCM;
-            break;
-
-        case AU_ADPCM_G722:    /* CCITT g.722 ADPCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_ADPCM;
-            break;
-
-        case AU_ADPCM_G723_3:  /* CCITT g.723 3-bit ADPCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_ADPCM;
-            break;
-
-        case AU_ADPCM_G723_5:  /* CCITT g.723 5-bit ADPCM */
-
-
-
-
+
+
+
-            i_cat                    = AU_CAT_ADPCM;
-            break;
@@ -278 +263 @@
-            goto error;
-    }
-wf.nAvgBytesPerSec        = p_sys->wf.nSamplesPerSec * p_sys->wf.nChannels * p_sys->wf.wBitsPerSample / 8;
-
-
+fmt.audio.i_bitrate = p_sys->fmt.audio.i_samplerate *
+
+
-
-    if( i_cat == AU_CAT_UNKNOWN || i_cat == AU_CAT_ADPCM )
@@ -295 +280 @@
-
-        /* read samples for 50ms of */
-wf.nSamplesPerSec
-
-wf.nChannels * ( (p_sys->wf.wBitsPerS
-
-wf.nBlockA
+fmt.audio.i_samplerate
+
+fmt.audio.i_channels * ( (p_sys->fmt.audio.i_bitspers
+
+fmt.audio.i_blocka
-        {
-wf.nBlockA
+fmt.audio.i_blocka
-            {
-wf.nBlockA
+fmt.audio.i_blocka
-            }
-        }
@@ -309 +294 @@
-        p_sys->i_frame_length = (mtime_t)1000000 *
-                                (mtime_t)i_samples /
-wf.nSamplesPerSec
+fmt.audio.i_samplerate
-
-        p_input->pf_demux = DemuxPCM;
@@ -315 +300 @@
-    }
-
-    /*  create one program */
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    if( input_InitStream( p_input, 0 ) == -1)
@@ -323 +307 @@
-        goto error;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
+    p_sys->p_es = es_out_Add( p_input->p_es_out, &p_sys->fmt );
-    return VLC_SUCCESS;
-
@@ -367 +332 @@
-        int64_t i_pos = stream_Tell( p_input->s );
-
-wf.nBlockA
+fmt.audio.i_blocka
-        {
-wf.nBlockAlign - i_pos % p_sys->wf.nBlockA
+fmt.audio.i_blockalign - i_pos % p_sys->fmt.audio.i_blocka
-            if( stream_Seek( p_input->s, i_pos ) )
-            {
@@ -391 +356 @@
-                                     p_sys->i_time * 9 / 100 );
-
-
-
-
-
-
-
-
-
+
+
-    p_sys->i_time += p_sys->i_frame_length;
+
-    return( 1 );
-}