Changeset 5d0cd08833ac4ab692b2091f7e2b67c362f0268f

Timestamp:

03/10/04 13:02:58 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[4c29602d3802b5d72143b5093036a4e347b8c96a]

git-author:

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

Message:

• include/input_ext-plugins.h: exported input_RunDecoder/input_EndDecoder.
  
• modules/stream_out/display.c: use input_RunDecoder/input_EndDecoder
  (fixed dead lock and no more duplicated stream in audio/video menu).
  

Files:

• include/input_ext-plugins.h (modified) (2 diffs)
• modules/stream_out/display.c (modified) (4 diffs)

include/input_ext-plugins.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1999-2002 VideoLAN
-: input_ext-plugins.h,v 1.47 2004/01/26 20:48:09 fenrir Exp 
+
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -56 +56 @@
- * Prototypes from input_dec.c
- *****************************************************************************/
-decoder_t * input_RunDecoder( input_thread_t *, es_descriptor_t *
-void input_EndDecoder( input_thread_t *, es_descriptor_t *
+VLC_EXPORT( decoder_t *, input_RunDecoder, ( input_thread_t *, es_descriptor_t * )
+VLC_EXPORT( void, input_EndDecoder, ( input_thread_t *, es_descriptor_t * )
-
-VLC_EXPORT( void, input_DecodePES, ( decoder_t *, pes_packet_t * ) );

modules/stream_out/display.c

@@ -143 +143 @@
-    id = malloc( sizeof( sout_stream_id_t ) );
-
-vlc_mutex_lock( &p_sys->p_input->stream.stream_lock
-id->p_es = input_AddES( p_sys->p_input,
-                        NULL,           /* no program */
-                        12,             /* es_id */
-                        p_fmt->i_cat,   /* es category */
-                        NULL,           /* description */
-
-
-!id->p_es
-
-vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
-msg_Err( p_stream, "cannot create es"
+id->p_es = malloc( sizeof( es_descriptor_t )
+memset( id->p_es, 0, sizeof( es_descriptor_t ) );
+id->p_es->i_cat         = p_fmt->i_cat;
+id->p_es->i_fourcc      = p_fmt->i_codec;
+id->p_es->b_force_decoder = VLC_TRUE;
+es_format_Copy( &id->p_es->fmt, p_fmt );
+
+
+id->p_es->p_dec == NULL
+
+msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",
+
+free( id->p_es
-        free( id );
-        return NULL;
-    }
-    id->p_es->i_stream_id   = 1;
-    id->p_es->i_fourcc      = p_fmt->i_codec;
-    id->p_es->b_force_decoder = VLC_TRUE;
-
-    es_format_Copy( &id->p_es->fmt, p_fmt );
-
-    if( input_SelectES( p_sys->p_input, id->p_es ) )
-    {
-        input_DelES( p_sys->p_input, id->p_es );
-        vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
-        msg_Err( p_stream, "cannot select es" );
-        free( id );
-        return NULL;
-    }
-    vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
-    return id;
@@ -183 +167 @@
-    sout_stream_sys_t *p_sys = p_stream->p_sys;
-
-
-
+
+
+
-    free( id );
-
@@ -200 +185 @@
-        block_t *p_block;
-
-        vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
-        if( id->p_es->p_dec && p_buffer->i_size > 0 &&
-            (p_block = block_New( p_stream, p_buffer->i_size )) )
@@ -214 +198 @@
-            input_DecodeBlock( id->p_es->p_dec, p_block );
-        }
-        vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
-        /* *** go to next buffer *** */