* modules/stream_out/description.c: new "description" stream output module...

* modules/stream_out/description.c: new "description" stream output module which gathers information on elementary streams (pre-parsing).
* src/misc/vlm.c: pre-parse vod media items.

configure.ac

@@ -1181,7 +1181,7 @@ then
   VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
   VLC_ADD_PLUGINS([packetizer_copy])
 
-  VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp])
+  VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp])
   VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode])
 #  VLC_ADD_PLUGINS([stream_out_transrate])
 

modules/misc/rtsp.c

@@ -214,8 +214,9 @@ static vod_media_t *MediaNew( vod_t *p_vod, char *psz_name,
 {
     vod_sys_t *p_sys = p_vod->p_sys;
     vod_media_t *p_media = malloc( sizeof(vod_media_t) );
-    memset( p_media, 0, sizeof(vod_media_t) );
+    int i;
 
+    memset( p_media, 0, sizeof(vod_media_t) );
     asprintf( &p_media->psz_rtsp_path, "%s%s", p_sys->psz_path, psz_name );
 
     p_media->p_rtsp_url =
@@ -247,6 +248,12 @@ static vod_media_t *MediaNew( vod_t *p_vod, char *psz_name,
 
     TAB_APPEND( p_sys->i_media, p_sys->media, p_media );
 
+    vlc_mutex_lock( &p_item->lock );
+    msg_Dbg( p_vod, "media has %i declared ES", p_item->i_es );
+    for( i = 0; i < p_item->i_es; i++ )
+    msg_Dbg( p_vod, "  - ES %i: %4.4s", i, (char *)&p_item->es[i]->i_codec );
+    vlc_mutex_unlock( &p_item->lock );
+
     return p_media;
 }
 

modules/stream_out/Modules.am

 SOURCES_stream_out_dummy = dummy.c
+SOURCES_stream_out_description = description.c
 SOURCES_stream_out_standard = standard.c \
                               announce.c \
                               announce.h

modules/stream_out/description.c

+/*****************************************************************************
+ * description.c: description stream output module (gathers ES info)
+ *****************************************************************************
+ * Copyright (C) 2003-2004 VideoLAN
+ * $Id$
+ *
+ * Authors: Gildas Bazin <gbazin@videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>
+#include <string.h>
+
+#include <vlc/vlc.h>
+#include <vlc/input.h>
+#include <vlc/sout.h>
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static int      Open    ( vlc_object_t * );
+static void     Close   ( vlc_object_t * );
+
+static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
+static int               Del ( sout_stream_t *, sout_stream_id_t * );
+static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Description stream output") );
+    set_capability( "sout stream", 50 );
+    add_shortcut( "description" );
+    set_callbacks( Open, Close );
+vlc_module_end();
+
+struct sout_stream_sys_t
+{
+    input_thread_t *p_input;
+    mtime_t i_stream_start;
+};
+
+struct sout_stream_id_t
+{
+    int i_d_u_m_m_y;
+};
+
+/*****************************************************************************
+ * Open:
+ *****************************************************************************/
+static int Open( vlc_object_t *p_this )
+{
+    sout_stream_t *p_stream = (sout_stream_t*)p_this;
+    sout_stream_sys_t *p_sys;
+
+    p_stream->pf_add  = Add;
+    p_stream->pf_del  = Del;
+    p_stream->pf_send = Send;
+    p_sys = p_stream->p_sys = malloc(sizeof(sout_stream_sys_t));
+
+    p_sys->p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( !p_sys->p_input ) return VLC_EGENERIC;
+
+    p_sys->i_stream_start = 0;
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close:
+ *****************************************************************************/
+static void Close( vlc_object_t *p_this )
+{
+    sout_stream_t *p_stream = (sout_stream_t *)p_this;
+    vlc_object_release( p_stream->p_sys->p_input );
+}
+
+static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
+{
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+    sout_stream_id_t *id;
+    es_format_t *p_fmt_copy = malloc(sizeof(es_format_t));
+
+    id = malloc( sizeof( sout_stream_id_t ) );
+    id->i_d_u_m_m_y = 0;
+
+    es_format_Copy( p_fmt_copy, p_fmt );
+
+    vlc_mutex_lock( &p_sys->p_input->input.p_item->lock );
+    TAB_APPEND( p_sys->p_input->input.p_item->i_es,
+                p_sys->p_input->input.p_item->es, p_fmt_copy );
+    vlc_mutex_unlock( &p_sys->p_input->input.p_item->lock );
+
+    if( p_sys->i_stream_start <= 0 ) p_sys->i_stream_start = mdate();
+
+    return id;
+}
+
+static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
+{
+    free( id );
+    return VLC_SUCCESS;
+}
+
+static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
+                 block_t *p_buffer )
+{
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    block_ChainRelease( p_buffer );
+
+    if( p_sys->i_stream_start + 1500000 > mdate() )
+    {
+        p_sys->p_input->b_eof = VLC_TRUE;
+    }
+
+    return VLC_SUCCESS;
+}

src/misc/vlm.c

@@ -932,7 +932,7 @@ static vlm_media_t *vlm_MediaNew( vlm_t *vlm, char *psz_name, int i_type )
     /* Check if we need to load the VOD server */
     if( i_type == VOD_TYPE && !vlm->i_vod )
     {
-        vlm->vod = vlc_object_create( vlm, sizeof(vod_t) );
+        vlm->vod = vlc_object_create( vlm, VLC_OBJECT_VOD );
         vlc_object_attach( vlm->vod, vlm );
         vlm->vod->p_module = module_Need( vlm->vod, "vod server", 0, 0 );
         if( !vlm->vod->p_module )
@@ -1098,11 +1098,50 @@ static int vlm_MediaSetup( vlm_t *vlm, vlm_media_t *media, char *psz_cmd,
     {
         if( !media->b_enabled && media->vod_media )
         {
+            int i;
+
+            for( i = 0; i < media->item.i_es; i++ )
+            {
+                es_format_Clean( media->item.es[i] );
+                free( media->item.es[i] );
+            }
+            if( media->item.es ) free( media->item.es );
+            media->item.es = 0;
+            media->item.i_es = 0;
+
             vlm->vod->pf_media_del( vlm->vod, media->vod_media );
             media->vod_media = 0;
         }
         else if( media->b_enabled && !media->vod_media )
         {
+            /* Pre-parse the input */
+            char *psz_output = media->psz_output;
+            if( media->psz_output )
+            {
+                asprintf( &media->psz_output, "%s:description",
+                          media->psz_output );
+            }
+            else
+            {
+                asprintf( &media->psz_output, "#description" );
+            }
+
+            if( !vlm_MediaControl( vlm, media, "play", 0 ) && media->p_input )
+            {
+                while( !media->p_input->b_eof && !media->p_input->b_error )
+                {
+                    msleep( 100000 );
+                }
+
+                input_StopThread( media->p_input );
+                input_DestroyThread( media->p_input );
+                vlc_object_detach( media->p_input );
+                vlc_object_destroy( media->p_input );
+                media->p_input = NULL;
+            }
+            free( media->psz_output );
+            media->psz_output = psz_output;
+
             media->vod_media =
                 vlm->vod->pf_media_new( vlm->vod, media->psz_name,
                                         &media->item );