mkv.cpp: store silent tracks info

[vlc] / modules / video_filter / wall.c

diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index fe2f7dad6e58159c54bbed679d689bdceabdacf5..258b50a0a7796bccd9db8b394badde65d57678ad 100644 (file)
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -62,8 +62,11 @@ static int  SendEvents( vlc_object_t *, char const *,
 #define ACTIVE_LONGTEXT N_("Comma separated list of active windows, " \
     "defaults to all")
 
+#define ASPECT_TEXT N_("Element aspect ratio")
+#define ASPECT_LONGTEXT N_("The aspect ratio of the individual displays building the display wall")
+
 vlc_module_begin();
-    set_description( _("wall video filter") );
+    set_description( _("Wall video filter") );
     set_shortname( N_("Image wall" ));
     set_capability( "video filter", 0 );
     set_category( CAT_VIDEO );
@@ -72,6 +75,7 @@ vlc_module_begin();
     add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE );
     add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE );
     add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, VLC_FALSE );
+    add_string( "wall-element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, VLC_FALSE );
 
     add_shortcut( "wall" );
     set_callbacks( Create, Destroy );
@@ -225,11 +229,32 @@ static int Init( vout_thread_t *p_vout )
     int i_index, i_row, i_col, i_width, i_height, i_left, i_top;
     unsigned int i_target_width,i_target_height;
     picture_t *p_pic;
+    video_format_t fmt = {0};
     int i_aspect = 4*VOUT_ASPECT_FACTOR/3;
     int i_align = 0;
     unsigned int i_hstart, i_hend, i_vstart, i_vend;
     unsigned int w1,h1,w2,h2;
     int i_xpos, i_ypos;
+    int i_vstart_rounded = 0, i_hstart_rounded = 0;
+    char *psz_aspect;
+
+    psz_aspect = config_GetPsz( p_vout, "wall-element-aspect" );
+    if( psz_aspect && *psz_aspect )
+    {
+        char *psz_parser = strchr( psz_aspect, ':' );
+        if( psz_parser )
+        {
+            *psz_parser++ = '\0';
+            i_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR
+                / atoi( psz_parser );
+        }
+        else
+        {
+            msg_Warn( p_vout, "invalid aspect ratio specification" );
+        }
+        free( psz_aspect );
+    }
+    
 
     i_xpos = var_CreateGetInteger( p_vout, "video-x" );
     i_ypos = var_CreateGetInteger( p_vout, "video-y" );
@@ -245,6 +270,14 @@ static int Init( vout_thread_t *p_vout )
     p_vout->output.i_aspect = p_vout->render.i_aspect;
     var_Create( p_vout, "align", VLC_VAR_INTEGER );
 
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
     w1 = p_vout->output.i_width / p_vout->p_sys->i_col;
     w1 &= ~1;
     h1 = w1 * VOUT_ASPECT_FACTOR / i_aspect&~1;
@@ -257,7 +290,7 @@ static int Init( vout_thread_t *p_vout )
     
     if ( h1 * p_vout->p_sys->i_row < p_vout->output.i_height )
     {
-        int i_tmp;
+        unsigned int i_tmp;
         i_target_width = w2;        
         i_target_height = h2;
         i_vstart = 0;
@@ -265,11 +298,13 @@ static int Init( vout_thread_t *p_vout )
         i_tmp = i_target_width * p_vout->p_sys->i_col;
         while( i_tmp < p_vout->output.i_width ) i_tmp += p_vout->p_sys->i_col;
         i_hstart = (( i_tmp - p_vout->output.i_width ) / 2)&~1;
+        i_hstart_rounded  = ( ( i_tmp - p_vout->output.i_width ) % 2 ) ||
+            ( ( ( i_tmp - p_vout->output.i_width ) / 2 ) & 1 );
         i_hend = i_hstart + p_vout->output.i_width;
     }
     else
     {
-        int i_tmp;
+        unsigned int i_tmp;
         i_target_height = h1;
         i_target_width = w1;
         i_hstart = 0;
@@ -277,6 +312,8 @@ static int Init( vout_thread_t *p_vout )
         i_tmp = i_target_height * p_vout->p_sys->i_row;
         while( i_tmp < p_vout->output.i_height ) i_tmp += p_vout->p_sys->i_row;
         i_vstart = ( ( i_tmp - p_vout->output.i_height ) / 2 ) & ~1;
+        i_vstart_rounded  = ( ( i_tmp - p_vout->output.i_height ) % 2 ) ||
+            ( ( ( i_tmp - p_vout->output.i_height ) / 2 ) & 1 );
         i_vend = i_vstart + p_vout->output.i_height;
     }
     msg_Dbg( p_vout, "target resolution %dx%d", i_target_width, i_target_height );
@@ -310,9 +347,16 @@ static int Init( vout_thread_t *p_vout )
             }
             else
             {
-                i_width = i_target_width - i_hstart % i_target_width;
-                i_align |= i_col > ( p_vout->p_sys->i_col / 2 ) ?
-                    VOUT_ALIGN_LEFT : VOUT_ALIGN_RIGHT;
+                i_width = ( i_target_width - i_hstart % i_target_width );
+                if( i_col >= ( p_vout->p_sys->i_col / 2 ) )
+                {
+                    i_align |= VOUT_ALIGN_LEFT;
+                    i_width -= i_hstart_rounded ? 2: 0;
+                }
+                else
+                {
+                    i_align |= VOUT_ALIGN_RIGHT;
+                }
             }
             
             if( i_row * i_target_height >= i_vstart &&
@@ -327,10 +371,17 @@ static int Init( vout_thread_t *p_vout )
             }
             else
             {
-                i_height = i_target_height -
-                             i_vstart%i_target_height;
-                i_align |= i_row > ( p_vout->p_sys->i_row / 2 ) ?
-                    VOUT_ALIGN_TOP : VOUT_ALIGN_BOTTOM;
+                i_height = ( i_target_height -
+                             i_vstart%i_target_height );
+                if(  i_row >= ( p_vout->p_sys->i_row / 2 ) )
+                {
+                    i_align |= VOUT_ALIGN_TOP;
+                    i_height -= i_vstart_rounded ? 2: 0;
+                }
+                else
+                {
+                    i_align |= VOUT_ALIGN_BOTTOM;
+                }
             }
             if( i_height == 0 || i_width == 0 )
             {
@@ -352,11 +403,14 @@ static int Init( vout_thread_t *p_vout )
             var_SetInteger( p_vout, "video-x", i_left + i_xpos - i_width);
             var_SetInteger( p_vout, "video-y", i_top + i_ypos );
 
+            fmt.i_width = fmt.i_visible_width = i_width;
+            fmt.i_height = fmt.i_visible_height = i_height;
+            fmt.i_aspect = i_aspect * i_target_height / i_height *
+                i_width / i_target_width;
+
             p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout =
-                vout_Create( p_vout, i_width, i_height,
-                             p_vout->render.i_chroma,
-                             VOUT_ASPECT_FACTOR * i_width / i_height );
-            if( p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout == NULL )
+                vout_Create( p_vout, &fmt );
+            if( !p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout )
             {
                 msg_Err( p_vout, "failed to get %ix%i vout threads",
                                  p_vout->p_sys->i_col, p_vout->p_sys->i_row );