]> git.sesse.net Git - vlc/blobdiff - modules/video_filter/mosaic.c
Test pointers against NULL instead of 0.
[vlc] / modules / video_filter / mosaic.c
index 768cca722ace294679aa39cbb4daa1b0924d7cb3..4a16f224ac364daf264c6dba0e1e6a124f588a29 100644 (file)
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * mosaic.c : Mosaic video plugin for vlc
  *****************************************************************************
- * Copyright (C) 2004-2007 the VideoLAN team
+ * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
  *
- * Authors: Antoine Cellerier <dionoea@via.ecp.fr>
+ * Authors: Antoine Cellerier <dionoea at videolan dot org>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include <math.h>
@@ -40,7 +41,7 @@
 
 #include "mosaic.h"
 
-#define BLANK_DELAY I64C(1000000)
+#define BLANK_DELAY INT64_C(1000000)
 
 /*****************************************************************************
  * Local prototypes
@@ -162,27 +163,27 @@ enum
 {
     position_auto = 0, position_fixed = 1, position_offsets = 2
 };
-static int pi_pos_values[] = { 0, 1, 2 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2 };
+static const char *const ppsz_pos_descriptions[] =
     { N_("auto"), N_("fixed"), N_("offsets") };
 
-static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_align_descriptions[] =
+static const int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_align_descriptions[] =
      { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
      N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
 #define CFG_PREFIX "mosaic-"
 
-vlc_module_begin();
-    set_description( _("Mosaic video sub filter") );
-    set_shortname( _("Mosaic") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC);
-    set_capability( "sub filter", 0 );
-    set_callbacks( CreateFilter, DestroyFilter );
+vlc_module_begin ()
+    set_description( N_("Mosaic video sub filter") )
+    set_shortname( N_("Mosaic") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC)
+    set_capability( "sub filter", 0 )
+    set_callbacks( CreateFilter, DestroyFilter )
 
-    add_integer( CFG_PREFIX "alpha", 255, NULL,
-                 ALPHA_TEXT, ALPHA_LONGTEXT, false );
+    add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
+                            ALPHA_TEXT, ALPHA_LONGTEXT, false );
 
     add_integer( CFG_PREFIX "height", 100, NULL,
                  HEIGHT_TEXT, HEIGHT_LONGTEXT, false );
@@ -191,7 +192,7 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "align", 5, NULL,
                  ALIGN_TEXT, ALIGN_LONGTEXT, true);
-        change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
+        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL );
 
     add_integer( CFG_PREFIX "xoffset", 0, NULL,
                  XOFFSET_TEXT, XOFFSET_LONGTEXT, true );
@@ -200,14 +201,14 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "borderw", 0, NULL,
                  BORDERW_TEXT, BORDERW_LONGTEXT, true );
-        add_deprecated_alias( CFG_PREFIX "vborder" );
+        add_deprecated_alias( CFG_PREFIX "vborder" )
     add_integer( CFG_PREFIX "borderh", 0, NULL,
                  BORDERH_TEXT, BORDERH_LONGTEXT, true );
-        add_deprecated_alias( CFG_PREFIX "hborder" );
+        add_deprecated_alias( CFG_PREFIX "hborder" )
 
     add_integer( CFG_PREFIX "position", 0, NULL,
                  POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_integer( CFG_PREFIX "rows", 2, NULL,
                  ROWS_TEXT, ROWS_LONGTEXT, false );
     add_integer( CFG_PREFIX "cols", 2, NULL,
@@ -226,9 +227,9 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
                  false );
-vlc_module_end();
+vlc_module_end ()
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "alpha", "height", "width", "align", "xoffset", "yoffset",
     "borderw", "borderh", "position", "rows", "cols",
     "keep-aspect-ratio", "keep-picture", "order", "offsets",
@@ -283,7 +284,7 @@ static int CreateFilter( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
     vlc_object_t *p_libvlc = VLC_OBJECT( p_filter->p_libvlc );
-    char *psz_order;
+    char *psz_order, *_psz_order;
     char *psz_offsets;
     int i_index;
     vlc_value_t val;
@@ -294,14 +295,11 @@ static int CreateFilter( vlc_object_t *p_this )
     /* Allocate structure */
     p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     p_filter->pf_sub_filter = Filter;
 
-    vlc_mutex_init( p_filter, &p_sys->lock );
+    vlc_mutex_init( &p_sys->lock );
     vlc_mutex_lock( &p_sys->lock );
 
     var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
@@ -349,6 +347,7 @@ static int CreateFilter( vlc_object_t *p_this )
     p_sys->i_order_length = 0;
     p_sys->ppsz_order = NULL;
     psz_order = var_CreateGetStringCommand( p_filter, CFG_PREFIX "order" );
+    _psz_order = psz_order;
     var_AddCallback( p_filter, CFG_PREFIX "order", MosaicCallback, p_sys );
 
     if( *psz_order )
@@ -368,12 +367,15 @@ static int CreateFilter( vlc_object_t *p_this )
         p_sys->i_order_length = i_index;
     }
 
+    free( _psz_order );
+
     /* Manage specific offsets for substreams */
     psz_offsets = var_CreateGetStringCommand( p_filter, CFG_PREFIX "offsets" );
     p_sys->i_offsets_length = 0;
     p_sys->pi_x_offsets = NULL;
     p_sys->pi_y_offsets = NULL;
     mosaic_ParseSetOffsets( p_filter, p_sys, psz_offsets );
+    free( psz_offsets );
     var_AddCallback( p_filter, CFG_PREFIX "offsets", MosaicCallback, p_sys );
 
     vlc_mutex_unlock( &p_sys->lock );
@@ -424,7 +426,7 @@ static void MosaicReleasePicture( picture_t *p_picture )
 {
     picture_t *p_original_pic = (picture_t *)p_picture->p_sys;
 
-    p_original_pic->pf_release( p_original_pic );
+    picture_Release( p_original_pic );
 }
 
 /*****************************************************************************
@@ -446,11 +448,9 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     subpicture_region_t *p_region_prev = NULL;
 
     /* Allocate the subpicture internal data. */
-    p_spu = p_filter->pf_sub_buffer_new( p_filter );
+    p_spu = filter_NewSubpicture( p_filter );
     if( !p_spu )
-    {
         return NULL;
-    }
 
     /* Initialize subpicture */
     p_spu->i_channel = 0;
@@ -458,7 +458,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     p_spu->i_stop = 0;
     p_spu->b_ephemer = true;
     p_spu->i_alpha = p_sys->i_alpha;
-    p_spu->i_flags = p_sys->i_align;
     p_spu->b_absolute = false;
 
     vlc_mutex_lock( &p_sys->lock );
@@ -496,7 +495,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             if ( !p_es->b_empty )
             {
                 i_numpics ++;
-                if( p_sys->i_order_length && p_es->psz_id != 0 )
+                if( p_sys->i_order_length && p_es->psz_id != NULL )
                 {
                     /* We also want to leave slots for images given in
                      * mosaic-order that are not available in p_vout_picture */
@@ -544,21 +543,21 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             if ( p_es->p_picture->p_next != NULL )
             {
                 picture_t *p_next = p_es->p_picture->p_next;
-                p_es->p_picture->pf_release( p_es->p_picture );
+                picture_Release( p_es->p_picture );
                 p_es->p_picture = p_next;
             }
             else if ( p_es->p_picture->date + p_sys->i_delay + BLANK_DELAY <
                         date )
             {
                 /* Display blank */
-                p_es->p_picture->pf_release( p_es->p_picture );
+                picture_Release( p_es->p_picture );
                 p_es->p_picture = NULL;
                 p_es->pp_last = &p_es->p_picture;
                 break;
             }
             else
             {
-                msg_Dbg( p_filter, "too late picture for %s (" I64Fd ")",
+                msg_Dbg( p_filter, "too late picture for %s (%"PRId64 ")",
                          p_es->psz_id,
                          date - p_es->p_picture->date - p_sys->i_delay );
                 break;
@@ -597,7 +596,11 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             fmt_in.i_height = p_es->p_picture->format.i_height;
             fmt_in.i_width = p_es->p_picture->format.i_width;
 
-            fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
+            if( fmt_in.i_chroma == VLC_FOURCC('Y','U','V','A') ||
+                fmt_in.i_chroma == VLC_FOURCC('R','G','B','A') )
+                fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
+            else
+                fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
             fmt_out.i_width = col_inner_width;
             fmt_out.i_height = row_inner_height;
 
@@ -631,7 +634,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         else
         {
             p_converted = p_es->p_picture;
-            p_converted->i_refcount++;
             fmt_in.i_width = fmt_out.i_width = p_converted->format.i_width;
             fmt_in.i_height = fmt_out.i_height = p_converted->format.i_height;
             fmt_in.i_chroma = fmt_out.i_chroma = p_converted->format.i_chroma;
@@ -639,8 +641,13 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             fmt_out.i_visible_height = fmt_out.i_height;
         }
 
-        p_region = p_spu->pf_make_region( VLC_OBJECT(p_filter), &fmt_out,
-                                          p_converted );
+        p_region = subpicture_region_New( &fmt_out );
+        /* FIXME the copy is probably not needed anymore */
+        if( p_region )
+            picture_Copy( p_region->p_picture, p_converted );
+        if( !p_sys->b_keep )
+            picture_Release( p_converted );
+
         if( !p_region )
         {
             msg_Err( p_filter, "cannot allocate SPU region" );
@@ -650,64 +657,56 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             return p_spu;
         }
 
-        /* HACK ALERT: let's fix the pointers to avoid picture duplication.
-         * This is necessary because p_region->picture is not a pointer
-         * as it ought to be. */
-        if( !p_sys->b_keep )
+        if( p_es->i_x >= 0 && p_es->i_y >= 0 )
         {
-            free( p_converted );
+            p_region->i_x = p_es->i_x;
+            p_region->i_y = p_es->i_y;
         }
-        else
-        {
-            /* Keep a pointer to the original picture (and its refcount...). */
-            p_region->picture.p_sys = (picture_sys_t *)p_converted;
-            p_region->picture.pf_release = MosaicReleasePicture;
-        }
-
-        if( p_sys->i_position == position_offsets )
+        else if( p_sys->i_position == position_offsets )
         {
             p_region->i_x = p_sys->pi_x_offsets[i_real_index];
-        }
-        else if( fmt_out.i_width > col_inner_width ||
-            p_sys->b_ar || p_sys->b_keep )
-        {
-            /* we don't have to center the video since it takes the
-            whole rectangle area or it's larger than the rectangle */
-            p_region->i_x = p_sys->i_xoffset
-                        + i_col * ( p_sys->i_width / p_sys->i_cols )
-                        + ( i_col * p_sys->i_borderw ) / p_sys->i_cols;
-        }
-        else
-        {
-            /* center the video in the dedicated rectangle */
-            p_region->i_x = p_sys->i_xoffset
-                    + i_col * ( p_sys->i_width / p_sys->i_cols )
-                    + ( i_col * p_sys->i_borderw ) / p_sys->i_cols
-                    + ( col_inner_width - fmt_out.i_width ) / 2;
-        }
-
-        if( p_sys->i_position == position_offsets )
-        {
             p_region->i_y = p_sys->pi_y_offsets[i_real_index];
         }
-        else if( fmt_out.i_height > row_inner_height
-            || p_sys->b_ar || p_sys->b_keep )
-        {
-            /* we don't have to center the video since it takes the
-            whole rectangle area or it's taller than the rectangle */
-            p_region->i_y = p_sys->i_yoffset
-                    + i_row * ( p_sys->i_height / p_sys->i_rows )
-                    + ( i_row * p_sys->i_borderh ) / p_sys->i_rows;
-        }
         else
         {
-            /* center the video in the dedicated rectangle */
-            p_region->i_y = p_sys->i_yoffset
-                    + i_row * ( p_sys->i_height / p_sys->i_rows )
-                    + ( i_row * p_sys->i_borderh ) / p_sys->i_rows
-                    + ( row_inner_height - fmt_out.i_height ) / 2;
+            if( fmt_out.i_width > col_inner_width ||
+                p_sys->b_ar || p_sys->b_keep )
+            {
+                /* we don't have to center the video since it takes the
+                whole rectangle area or it's larger than the rectangle */
+                p_region->i_x = p_sys->i_xoffset
+                            + i_col * ( p_sys->i_width / p_sys->i_cols )
+                            + ( i_col * p_sys->i_borderw ) / p_sys->i_cols;
+            }
+            else
+            {
+                /* center the video in the dedicated rectangle */
+                p_region->i_x = p_sys->i_xoffset
+                        + i_col * ( p_sys->i_width / p_sys->i_cols )
+                        + ( i_col * p_sys->i_borderw ) / p_sys->i_cols
+                        + ( col_inner_width - fmt_out.i_width ) / 2;
+            }
+
+            if( fmt_out.i_height > row_inner_height
+                || p_sys->b_ar || p_sys->b_keep )
+            {
+                /* we don't have to center the video since it takes the
+                whole rectangle area or it's taller than the rectangle */
+                p_region->i_y = p_sys->i_yoffset
+                        + i_row * ( p_sys->i_height / p_sys->i_rows )
+                        + ( i_row * p_sys->i_borderh ) / p_sys->i_rows;
+            }
+            else
+            {
+                /* center the video in the dedicated rectangle */
+                p_region->i_y = p_sys->i_yoffset
+                        + i_row * ( p_sys->i_height / p_sys->i_rows )
+                        + ( i_row * p_sys->i_borderh ) / p_sys->i_rows
+                        + ( row_inner_height - fmt_out.i_height ) / 2;
+            }
         }
         p_region->i_align = p_sys->i_align;
+        p_region->i_alpha = p_es->i_alpha;
 
         if( p_region_prev == NULL )
         {