Changeset 4855a76128089e15454b0506b149b7d9540127bb

Timestamp:

16/08/07 19:03:40 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1187283820 +0000

git-parent:

[8b7d91f2b71799dfb225641720c7ae352efe7524]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1187283820 +0000

Message:

Made mosaic shared struct per-instance rather than per-process

Files:

• modules/stream_out/mosaic_bridge.c (modified) (4 diffs)
• modules/video_filter/mosaic.c (modified) (2 diffs)
• modules/video_filter/mosaic.h (modified) (1 diff)

modules/stream_out/mosaic_bridge.c

@@ -176 +176 @@
-    sout_stream_t        *p_stream = (sout_stream_t *)p_this;
-    sout_stream_sys_t    *p_sys;
-_global = p_this->p_libvlc_global
+ = p_this->p_libvlc
-    vlc_value_t           val;
-
@@ -191 +191 @@
-    p_sys->b_inited = VLC_FALSE;
-
-_global
-_global
+
+
-    p_sys->p_lock = val.p_address;
-
@@ -317 +317 @@
-    if ( p_bridge == NULL )
-    {
-_global = p_stream->p_libvlc_global
+ = p_stream->p_libvlc
-        vlc_value_t val;
-
-        p_bridge = malloc( sizeof( bridge_t ) );
-
-_global
+
-        val.p_address = p_bridge;
-_global
+
-
-        p_bridge->i_es_num = 0;
@@ -496 +496 @@
-    if ( b_last_es )
-    {
-_global = p_stream->p_libvlc_global
+ = p_stream->p_libvlc
-        for ( i = 0; i < p_bridge->i_es_num; i++ )
-            free( p_bridge->pp_es[i] );
-        free( p_bridge->pp_es );
-        free( p_bridge );
-_global
+
-    }
-

modules/video_filter/mosaic.c

@@ -285 +285 @@
-    filter_t *p_filter = (filter_t *)p_this;
-    filter_sys_t *p_sys;
-_global = p_filter->p_libvlc_global
+ = p_filter->p_libvlc
-    char *psz_order;
-    char *psz_offsets;
@@ -307 +307 @@
-    vlc_mutex_lock( &p_sys->lock );
-
-_global
-_global
+
+
-    p_sys->p_lock = val.p_address;
-

modules/video_filter/mosaic.h

@@ -41 +41 @@
-static bridge_t *__GetBridge( vlc_object_t *p_object )
-{
-_global = p_object->p_libvlc_global
+ = p_object->p_libvlc
-    bridge_t *p_bridge;
-    vlc_value_t val;
-
-_global
+
-    {
-        p_bridge = NULL;