Changeset aba6d6b020f9b407b47c27398149409a29d389b3

Timestamp:

15/09/04 22:21:09 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1095279669 +0000

git-parent:

[5bb58782a719ac8a8719513471f67512e2051640]

git-author:

Gildas Bazin <gbazin@videolan.org> 1095279669 +0000

Message:

* 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.

Files:

• configure.ac (modified) (1 diff)
• modules/misc/rtsp.c (modified) (2 diffs)
• modules/stream_out/Modules.am (modified) (1 diff)
• modules/stream_out/description.c (added)
• src/misc/vlm.c (modified) (3 diffs)

configure.ac

@@ -1182 +1182 @@
-  VLC_ADD_PLUGINS([packetizer_copy])
-
-
+ 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

@@ -215 +215 @@
-    vod_sys_t *p_sys = p_vod->p_sys;
-    vod_media_t *p_media = malloc( 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 );
-
@@ -247 +248 @@
-
-    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

@@ -1 +1 @@
-SOURCES_stream_out_dummy = dummy.c
+SOURCES_stream_out_description = description.c
-SOURCES_stream_out_standard = standard.c \
-                              announce.c \

src/misc/vlm.c

@@ -933 +933 @@
-    if( i_type == VOD_TYPE && !vlm->i_vod )
-    {
-sizeof(vod_t)
+VLC_OBJECT_VOD
-        vlc_object_attach( vlm->vod, vlm );
-        vlm->vod->p_module = module_Need( vlm->vod, "vod server", 0, 0 );
@@ -1099 +1099 @@
-        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;
@@ -1104 +1115 @@
-        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,