Add options to give a specific channel order in mosaic

 * picture.* : add picture-id option. its a string that identifies the
               video.
 * mosaic.c : add mosaic-order option. its a comma separated list of
              picture-ids. Any picture who's id isn't found in the list
              will be placed after skiping the necessary number of
              slots needed to place all pictures defined in this list.

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index dc2aca90d17ef00bc803f976872e68ad8826595c..5349fb06e8ab083304d1e61b180e4a7bd32321dd 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -69,6 +69,9 @@ struct filter_sys_t
     int i_vborder, i_hborder; /* border width/height between miniatures */
     int i_alpha; /* subfilter alpha blending */
 
+    char **ppsz_order; /* list of picture-id */
+    int i_order_length;
+
 };
 
 /*****************************************************************************
@@ -91,6 +94,8 @@ struct filter_sys_t
 #define COLS_TEXT N_("Mosaic number of columns")
 #define AR_TEXT N_("Keep aspect ratio when resizing")
 
+#define ORDER_TEXT N_("Order as a comma separated list of picture-id(s)")
+
 static int pi_pos_values[] = { 0, 1 };
 static char * ppsz_pos_descriptions[] =
 { N_("auto"), N_("fixed") };
@@ -117,6 +122,7 @@ vlc_module_begin();
     add_integer( "mosaic-rows", 2, NULL, ROWS_TEXT, ROWS_TEXT, VLC_FALSE );
     add_integer( "mosaic-cols", 2, NULL, COLS_TEXT, COLS_TEXT, VLC_FALSE );
     add_bool( "mosaic-keep-aspect-ratio", 0, NULL, AR_TEXT, AR_TEXT, VLC_FALSE );
+    add_string( "mosaic-order", "", NULL, ORDER_TEXT, ORDER_TEXT, VLC_FALSE );
 vlc_module_end();
 
 
@@ -128,6 +134,8 @@ static int CreateFilter( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
+    char *psz_order;
+    int i_index;
 
     /* Allocate structure */
     p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
@@ -162,6 +170,33 @@ static int CreateFilter( vlc_object_t *p_this )
 
     p_sys->i_ar = var_CreateGetInteger( p_filter->p_libvlc, "mosaic-keep-aspect-ratio" );
 
+    p_sys->i_order_length = 0;
+    p_sys->ppsz_order = NULL;
+    psz_order = var_CreateGetString( p_filter->p_libvlc, "mosaic-order" );
+
+    fprintf( stderr, "psz_order : %s (%p)\n", psz_order, psz_order );
+    if( psz_order[0] != 0 )
+    {
+        i_index = 0;
+        char* psz_end=NULL;
+        do
+        { 
+            psz_end = strchr( psz_order, ',' );
+            i_index++;
+            p_sys->ppsz_order = realloc( p_sys->ppsz_order,
+                                         i_index * sizeof(char *) );
+            p_sys->ppsz_order[i_index - 1] = strndup( psz_order,
+                                           psz_end - psz_order );
+            psz_order = psz_end+1;
+        } while( NULL !=  psz_end );
+        p_sys->i_order_length = i_index;
+    }
+
+    for( i_index = 0; i_index < p_sys->i_order_length; i_index ++ )
+    {
+        fprintf( stderr, "%d/%d : %s\n", i_index, p_sys->i_order_length, p_sys->ppsz_order[i_index] );
+    }
+
     var_AddCallback( p_filter->p_libvlc, "mosaic-alpha",
                      MosaicCallback, p_sys );
     var_AddCallback( p_filter->p_libvlc, "mosaic-height",
@@ -228,6 +263,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     libvlc_t *p_libvlc = p_filter->p_libvlc;
     vlc_value_t val;
     int i_index, i_real_index, i_row, i_col;
+    int i_greatest_real_index_used = p_sys->i_order_length - 1;
 
     subpicture_region_t *p_region;
     subpicture_region_t *p_region_prev = NULL;
@@ -295,7 +331,24 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             msg_Dbg( p_filter, "Picture Vout Element is empty");
             break;
         }
-        i_real_index ++;
+        if( p_sys->i_order_length == 0 )
+            i_real_index ++;
+        else
+        {
+            int i;
+            for( i =0; i <= p_sys->i_order_length; i++ )
+            {
+                if( i == p_sys->i_order_length ) break;
+                if( strcmp( p_picture_vout->p_pic[i_index].psz_id,
+                    p_sys->ppsz_order[ i ] ) == 0 )
+                {
+                    i_real_index = i;
+                    break;
+                }
+            }
+            if( i == p_sys->i_order_length )
+                i_real_index = ++i_greatest_real_index_used;
+        }
         i_row = ( i_real_index / p_sys->i_cols ) % p_sys->i_rows ;
         i_col = i_real_index % p_sys->i_cols ;
 

diff --git a/modules/video_output/picture.c b/modules/video_output/picture.c
index dcf49d29349665d79d60dc2a14066a559acf1647..4f7ee5269e52f2f0f86c10f542a54174affc1f01 100644 (file)
--- a/modules/video_output/picture.c
+++ b/modules/video_output/picture.c
@@ -48,6 +48,8 @@ struct vout_sys_t
 
 #include "picture.h"
 
+#define ID_TEXT N_("ID")
+
 /***********************************************************************
 * Local prototypes
 ***********************************************************************/
@@ -66,6 +68,7 @@ vlc_module_begin();
     set_description(_("VLC Internal Picture video output") );
     set_capability( "video output", 70 );
     set_callbacks( Open, Close );
+    add_string( "picture-id", "Id", NULL, ID_TEXT, ID_TEXT, VLC_FALSE );
 vlc_module_end();
 
 /***********************************************************************
@@ -119,6 +122,14 @@ static int Open ( vlc_object_t *p_this )
     p_picture_vout->p_pic[p_picture_vout->i_picture_num].p_picture = NULL;
     p_picture_vout->p_pic[p_picture_vout->i_picture_num].i_status
       = PICTURE_VOUT_E_OCCUPIED;
+
+    var_Create( p_vout, "picture-id", VLC_VAR_STRING );
+    var_Change( p_vout, "picture-id", VLC_VAR_INHERITVALUE, &val, NULL);
+    p_picture_vout->p_pic[p_picture_vout->i_picture_num].psz_id
+      = (char *)malloc( sizeof(char) * ( strlen( val.psz_string) + 1 ) );
+    strcpy( p_picture_vout->p_pic[p_picture_vout->i_picture_num].psz_id,
+            val.psz_string );
+
     p_picture_vout->i_picture_num++;
 
     vlc_mutex_unlock( &p_picture_vout->lock );

diff --git a/modules/video_output/picture.h b/modules/video_output/picture.h
index f8e8abc5f93a73969ebefc1757370fbee44a5b86..6742c86ecb5e8bfb6cadc24f97bae7c0243b92a4 100644 (file)
--- a/modules/video_output/picture.h
+++ b/modules/video_output/picture.h
@@ -29,6 +29,7 @@
 struct picture_vout_e_t {
     picture_t *p_picture;
     int i_status;
+    char *psz_id;
 };
 struct picture_vout_t
 {