video_filter: fix warnings
[vlc.git] / modules / video_filter / wall.c
index f907474..45c6ac4 100644 (file)
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * wall.c : Wall video plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: wall.c,v 1.9 2003/03/30 18:14:38 gbazin Exp $
+ * Copyright (C) 2000, 2001, 2002, 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
+#include <vlc_vout.h>
 
 #include "filter_common.h"
 
@@ -50,29 +52,45 @@ static int  SendEvents( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define COLS_TEXT N_("number of columns")
-#define COLS_LONGTEXT N_("Select the number of horizontal videowindows in " \
-    "which to split the video")
+#define COLS_TEXT N_("Number of columns")
+#define COLS_LONGTEXT N_("Number of horizontal windows in " \
+    "which to split the video.")
 
-#define ROWS_TEXT N_("number of rows")
-#define ROWS_LONGTEXT N_("Select the number of vertical videowindows in " \
-    "which to split the video")
+#define ROWS_TEXT N_("Number of rows")
+#define ROWS_LONGTEXT N_("Number of vertical windows in " \
+    "which to split the video.")
 
-#define ACTIVE_TEXT N_("active windows")
-#define ACTIVE_LONGTEXT N_("comma separated list of active windows, " \
+#define ACTIVE_TEXT N_("Active windows")
+#define ACTIVE_LONGTEXT N_("Comma-separated list of active windows, " \
     "defaults to all")
 
+#define ASPECT_TEXT N_("Element aspect ratio")
+#define ASPECT_LONGTEXT N_("Aspect ratio of the individual displays " \
+   "building the wall.")
+
+#define CFG_PREFIX "wall-"
+
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
-    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 );
-    set_description( _("wall video filter") );
+    set_description( _("Wall video filter") );
+    set_shortname( _("Image wall" ));
     set_capability( "video filter", 0 );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
+
+    add_integer( CFG_PREFIX "cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE );
+    add_integer( CFG_PREFIX "rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE );
+    add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT,
+                 VLC_TRUE );
+    add_string( CFG_PREFIX "element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, VLC_FALSE );
+
     add_shortcut( "wall" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
+static const char *ppsz_filter_options[] = {
+    "cols", "rows", "active", "element-aspect", NULL
+};
+
 /*****************************************************************************
  * vout_sys_t: Wall video output method descriptor
  *****************************************************************************
@@ -89,10 +107,31 @@ struct vout_sys_t
         vlc_bool_t b_active;
         int i_width;
         int i_height;
+        int i_left;
+        int i_top;
         vout_thread_t *p_vout;
     } *pp_vout;
 };
 
+/*****************************************************************************
+ * Control: control facility for the vout (forwards to child vout)
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+    int i_row, i_col, i_vout = 0;
+
+    for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ )
+    {
+        for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ )
+        {
+            vout_vaControl( p_vout->p_sys->pp_vout[ i_vout ].p_vout,
+                            i_query, args );
+            i_vout++;
+        }
+    }
+    return VLC_SUCCESS;
+}
+
 /*****************************************************************************
  * Create: allocates Wall video thread output method
  *****************************************************************************
@@ -117,10 +156,14 @@ static int Create( vlc_object_t *p_this )
     p_vout->pf_manage = NULL;
     p_vout->pf_render = Render;
     p_vout->pf_display = NULL;
+    p_vout->pf_control = Control;
+
+    config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options,
+                       p_vout->p_cfg );
 
     /* Look what method was requested */
-    p_vout->p_sys->i_col = config_GetInt( p_vout, "wall-cols" );
-    p_vout->p_sys->i_row = config_GetInt( p_vout, "wall-rows" );
+    p_vout->p_sys->i_col = var_CreateGetInteger( p_vout, CFG_PREFIX "cols" );
+    p_vout->p_sys->i_row = var_CreateGetInteger( p_vout, CFG_PREFIX "rows" );
 
     p_vout->p_sys->i_col = __MAX( 1, __MIN( 15, p_vout->p_sys->i_col ) );
     p_vout->p_sys->i_row = __MAX( 1, __MIN( 15, p_vout->p_sys->i_row ) );
@@ -138,7 +181,8 @@ static int Create( vlc_object_t *p_this )
         return VLC_ENOMEM;
     }
 
-    psz_method_tmp = psz_method = config_GetPsz( p_vout, "wall-active" );
+    psz_method_tmp =
+    psz_method = var_CreateGetNonEmptyString( p_vout, CFG_PREFIX "active" );
 
     /* If no trailing vout are specified, take them all */
     if( psz_method == NULL )
@@ -196,8 +240,42 @@ static int Create( vlc_object_t *p_this )
  *****************************************************************************/
 static int Init( vout_thread_t *p_vout )
 {
-    int i_index, i_row, i_col, i_width, i_height;
+    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;
+    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;
+
+    memset( &fmt, 0, sizeof(video_format_t) );
+
+    psz_aspect = var_CreateGetNonEmptyString( p_vout,
+                                              CFG_PREFIX "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" );
+    if( i_xpos < 0 ) i_xpos = 0;
+    if( i_ypos < 0 ) i_ypos = 0;
 
     I_OUTPUTPICTURES = 0;
 
@@ -206,57 +284,149 @@ static int Init( vout_thread_t *p_vout )
     p_vout->output.i_width  = p_vout->render.i_width;
     p_vout->output.i_height = p_vout->render.i_height;
     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;
+    h1 &= ~1;
+    h2 = p_vout->output.i_height / p_vout->p_sys->i_row&~1;
+    h2 &= ~1;
+    w2 = h2 * i_aspect / VOUT_ASPECT_FACTOR&~1;
+    w2 &= ~1;
+    if ( h1 * p_vout->p_sys->i_row < p_vout->output.i_height )
+    {
+        unsigned int i_tmp;
+        i_target_width = w2;
+        i_target_height = h2;
+        i_vstart = 0;
+        i_vend = p_vout->output.i_height;
+        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
+    {
+        unsigned int i_tmp;
+        i_target_height = h1;
+        i_target_width = w1;
+        i_hstart = 0;
+        i_hend = p_vout->output.i_width;
+        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 );
 
     /* Try to open the real video output */
     msg_Dbg( p_vout, "spawning the real video outputs" );
 
     p_vout->p_sys->i_vout = 0;
+    msg_Dbg( p_vout, "target window (%d,%d)-(%d,%d)", i_hstart,i_vstart,i_hend,i_vend );
 
-    /* FIXME: use bresenham instead of those ugly divisions */
+    i_top = 0;
+    i_height = 0;
     for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ )
     {
+        i_left = 0;
+        i_top += i_height;
         for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ )
         {
-            if( i_col + 1 < p_vout->p_sys->i_col )
+            i_align = 0;
+
+            if( i_col*i_target_width >= i_hstart &&
+                (i_col+1)*i_target_width <= i_hend )
+            {
+                i_width = i_target_width;
+            }
+            else if( ( i_col + 1 ) * i_target_width < i_hstart ||
+                     ( i_col * i_target_width ) > i_hend )
             {
-                i_width = ( p_vout->render.i_width
-                             / p_vout->p_sys->i_col ) & ~0x1;
+                i_width = 0;
             }
             else
             {
-                i_width = p_vout->render.i_width
-                           - ( ( p_vout->render.i_width
-                                  / p_vout->p_sys->i_col ) & ~0x1 ) * i_col;
+                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 + 1 < p_vout->p_sys->i_row )
+            if( i_row * i_target_height >= i_vstart &&
+                ( i_row + 1 ) * i_target_height <= i_vend )
             {
-                i_height = ( p_vout->render.i_height
-                              / p_vout->p_sys->i_row ) & ~0x3;
+                i_height = i_target_height;
+            }
+            else if( ( i_row + 1 ) * i_target_height < i_vstart ||
+                     ( i_row * i_target_height ) > i_vend )
+            {
+                i_height = 0;
             }
             else
             {
-                i_height = p_vout->render.i_height
-                            - ( ( p_vout->render.i_height
-                                   / p_vout->p_sys->i_row ) & ~0x3 ) * i_row;
+                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 )
+            {
+                p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].b_active = VLC_FALSE;
             }
 
             p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].i_width = i_width;
             p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].i_height = i_height;
+            p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].i_left = i_left;
+            p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].i_top = i_top;
+            i_left += i_width;
 
             if( !p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].b_active )
             {
                 p_vout->p_sys->i_vout++;
                 continue;
             }
+            var_SetInteger( p_vout, "align", i_align );
+            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,
-                             p_vout->render.i_aspect
-                              * p_vout->render.i_height / i_height
-                              * i_width / p_vout->render.i_width );
-            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 );
@@ -266,13 +436,14 @@ static int Init( vout_thread_t *p_vout )
             ADD_CALLBACKS(
                 p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout,
                 SendEvents );
-
             p_vout->p_sys->i_vout++;
         }
     }
 
     ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
 
+    ADD_PARENT_CALLBACKS( SendEventsToChild );
+
     return VLC_SUCCESS;
 }
 
@@ -302,6 +473,8 @@ static void Destroy( vlc_object_t *p_this )
 
     RemoveAllVout( p_vout );
 
+    DEL_PARENT_CALLBACKS( SendEventsToChild );
+
     free( p_vout->p_sys->pp_vout );
     free( p_vout->p_sys );
 }
@@ -321,28 +494,18 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 
     i_vout = 0;
 
-    for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
-    {
-        pi_top_skip[i_plane] = 0;
-    }
-
     for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ )
     {
-        for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
-        {
-            pi_left_skip[i_plane] = 0;
-        }
-
         for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ )
         {
+            for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
+            {
+                pi_left_skip[i_plane] = p_vout->p_sys->pp_vout[ i_vout ].i_left * p_pic->p[ i_plane ].i_pitch / p_vout->output.i_width;
+                pi_top_skip[i_plane] = (p_vout->p_sys->pp_vout[ i_vout ].i_top * p_pic->p[ i_plane ].i_lines / p_vout->output.i_height)*p_pic->p[i_plane].i_pitch;
+            }
+
             if( !p_vout->p_sys->pp_vout[ i_vout ].b_active )
             {
-                for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
-                {
-                    pi_left_skip[i_plane] +=
-                        p_vout->p_sys->pp_vout[ i_vout ].i_width
-                         * p_pic->p[i_plane].i_pitch / p_vout->output.i_width;
-                }
                 i_vout++;
                 continue;
             }
@@ -377,19 +540,19 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
                 p_in = p_pic->p[i_plane].p_pixels
                         + pi_top_skip[i_plane] + pi_left_skip[i_plane];
 
-                p_in_end = p_in + p_outpic->p[i_plane].i_lines
+                p_in_end = p_in + p_outpic->p[i_plane].i_visible_lines
                                    * p_pic->p[i_plane].i_pitch;
 
                 p_out = p_outpic->p[i_plane].p_pixels;
 
                 while( p_in < p_in_end )
                 {
-                    p_vout->p_vlc->pf_memcpy( p_out, p_in, i_copy_pitch );
+                    p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch );
                     p_in += i_in_pitch;
                     p_out += i_out_pitch;
                 }
 
-                pi_left_skip[i_plane] += i_out_pitch;
+//                pi_left_skip[i_plane] += i_copy_pitch;
             }
 
             vout_UnlinkPicture( p_vout->p_sys->pp_vout[ i_vout ].p_vout,
@@ -400,13 +563,13 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
             i_vout++;
         }
 
-        for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
-        {
-            pi_top_skip[i_plane] += p_vout->p_sys->pp_vout[ i_vout ].i_height
-                                     * p_pic->p[i_plane].i_lines
-                                     / p_vout->output.i_height
-                                     * p_pic->p[i_plane].i_pitch;
-        }
+/*         for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) */
+/*         { */
+/*             pi_top_skip[i_plane] += p_vout->p_sys->pp_vout[ i_vout ].i_height */
+/*                                      * p_pic->p[i_plane].i_visible_lines */
+/*                                      / p_vout->output.i_height */
+/*                                      * p_pic->p[i_plane].i_pitch; */
+/*         } */
     }
 }
 
@@ -437,6 +600,7 @@ static void RemoveAllVout( vout_thread_t *p_vout )
 static int SendEvents( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *_p_vout )
 {
+    VLC_UNUSED(oldval);
     vout_thread_t *p_vout = (vout_thread_t *)_p_vout;
     int i_vout;
     vlc_value_t sentval = newval;
@@ -474,3 +638,25 @@ static int SendEvents( vlc_object_t *p_this, char const *psz_var,
     return VLC_SUCCESS;
 }
 
+/*****************************************************************************
+ * SendEventsToChild: forward events to the child/children vout
+ *****************************************************************************/
+static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    VLC_UNUSED(p_data); VLC_UNUSED(oldval);
+    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    int i_row, i_col, i_vout = 0;
+
+    for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ )
+    {
+        for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ )
+        {
+            var_Set( p_vout->p_sys->pp_vout[ i_vout ].p_vout, psz_var, newval);
+            if( !strcmp( psz_var, "fullscreen" ) ) break;
+            i_vout++;
+        }
+    }
+
+    return VLC_SUCCESS;
+}