Fix a bunch of warnings and errors
[vlc.git] / modules / stream_out / mosaic_bridge.c
index 41c2a98..d5c7897 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mosaic_bridge.c:
  *****************************************************************************
- * Copyright (C) 2004-2005 VideoLAN
+ * Copyright (C) 2004-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
@@ -19,7 +19,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -48,14 +48,18 @@ struct sout_stream_sys_t
     decoder_t       *p_decoder;
     image_handler_t *p_image; /* filter for resizing */
     int i_height, i_width;
+    int i_sar_num, i_sar_den;
     char *psz_id;
     vlc_bool_t b_inited;
 };
 
-#define PICTURE_RING_SIZE 64
+#define PICTURE_RING_SIZE 4
 struct decoder_owner_sys_t
 {
     picture_t *pp_pics[PICTURE_RING_SIZE];
+
+    /* Current format in use by the output */
+    video_format_t video;
 };
 
 typedef void (* pf_release_t)( picture_t * );
@@ -102,10 +106,13 @@ static void video_unlink_picture_decoder( decoder_t *, picture_t * );
 
 #define WIDTH_TEXT N_("Video width")
 #define WIDTH_LONGTEXT N_( \
-    "Allows you to specify the output video width." )
+    "Output video width." )
 #define HEIGHT_TEXT N_("Video height")
 #define HEIGHT_LONGTEXT N_( \
-    "Allows you to specify the output video height." )
+    "Output video height." )
+#define RATIO_TEXT N_("Sample aspect ratio")
+#define RATIO_LONGTEXT N_( \
+    "Sample aspect ratio of the destination (1:1, 3:4, 2:3)." )
 
 #define SOUT_CFG_PREFIX "sout-mosaic-bridge-"
 
@@ -121,6 +128,8 @@ vlc_module_begin();
                  WIDTH_LONGTEXT, VLC_TRUE );
     add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
                  HEIGHT_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "sar", "1:1", NULL, RATIO_TEXT,
+                RATIO_LONGTEXT, VLC_FALSE );
 
     set_callbacks( Open, Close );
 
@@ -128,7 +137,7 @@ vlc_module_begin();
 vlc_module_end();
 
 static const char *ppsz_sout_options[] = {
-    "id", "width", "height", NULL
+    "id", "width", "height", "sar", NULL
 };
 
 /*****************************************************************************
@@ -155,14 +164,35 @@ static int Open( vlc_object_t *p_this )
     p_sys->psz_id = val.psz_string;
 
     var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
-    p_sys->i_height = val.i_int; 
+    p_sys->i_height = val.i_int;
 
     var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
-    p_sys->i_width = val.i_int; 
+    p_sys->i_width = val.i_int;
 
-    if ( p_sys->i_height || p_sys->i_width )
+    var_Get( p_stream, SOUT_CFG_PREFIX "sar", &val );
+    if ( val.psz_string )
     {
-        p_sys->p_image = image_HandlerCreate( p_stream );
+        char *psz_parser = strchr( val.psz_string, ':' );
+
+        if( psz_parser )
+        {
+            *psz_parser++ = '\0';
+            p_sys->i_sar_num = atoi( val.psz_string );
+            p_sys->i_sar_den = atoi( psz_parser );
+            vlc_ureduce( &p_sys->i_sar_num, &p_sys->i_sar_den,
+                         p_sys->i_sar_num, p_sys->i_sar_den, 0 );
+        }
+        else
+        {
+            msg_Warn( p_stream, "bad aspect ratio %s", val.psz_string );
+            p_sys->i_sar_num = p_sys->i_sar_den = 1;
+        }
+
+        free( val.psz_string );
+    }
+    else
+    {
+        p_sys->i_sar_num = p_sys->i_sar_den = 1;
     }
 
     p_stream->pf_add    = Add;
@@ -219,6 +249,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     p_sys->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
     for( i = 0; i < PICTURE_RING_SIZE; i++ )
         p_sys->p_decoder->p_owner->pp_pics[i] = 0;
+    p_sys->p_decoder->p_owner->video = p_fmt->video;
     //p_sys->p_decoder->p_cfg = p_sys->p_video_cfg;
 
     p_sys->p_decoder->p_module =
@@ -276,6 +307,11 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 
     vlc_mutex_unlock( p_sys->p_lock );
 
+    if ( p_sys->i_height || p_sys->i_width )
+    {
+        p_sys->p_image = image_HandlerCreate( p_stream );
+    }
+
     msg_Dbg( p_stream, "mosaic bridge id=%s pos=%d", p_es->psz_id, i );
 
     return (sout_stream_id_t *)p_sys;
@@ -294,12 +330,25 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
         return VLC_SUCCESS;
     }
 
-    if ( p_sys->p_decoder )
+    if ( p_sys->p_decoder != NULL )
     {
+        picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics;
+
         if( p_sys->p_decoder->p_module )
             module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
         vlc_object_detach( p_sys->p_decoder );
         vlc_object_destroy( p_sys->p_decoder );
+
+        for( i = 0; i < PICTURE_RING_SIZE; i++ )
+        {
+            if ( pp_ring[i] != NULL )
+            {
+                if ( pp_ring[i]->p_data_orig != NULL )
+                    free( pp_ring[i]->p_data_orig );
+                free( pp_ring[i]->p_sys );
+                free( pp_ring[i] );
+            }
+        }
     }
 
     vlc_mutex_lock( p_sys->p_lock );
@@ -386,8 +435,26 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
             fmt_in = p_sys->p_decoder->fmt_out.video;
 
             fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
-            fmt_out.i_width = p_sys->i_width;
-            fmt_out.i_height = p_sys->i_height;
+
+            if ( !p_sys->i_height )
+            {
+                fmt_out.i_width = p_sys->i_width;
+                fmt_out.i_height = (p_sys->i_width * VOUT_ASPECT_FACTOR
+                    * p_sys->i_sar_num / p_sys->i_sar_den / fmt_in.i_aspect)
+                      & ~0x1;
+            }
+            else if ( !p_sys->i_width )
+            {
+                fmt_out.i_height = p_sys->i_height;
+                fmt_out.i_width = (p_sys->i_height * fmt_in.i_aspect
+                    * p_sys->i_sar_den / p_sys->i_sar_num / VOUT_ASPECT_FACTOR)
+                      & ~0x1;
+            }
+            else
+            {
+                fmt_out.i_width = p_sys->i_width;
+                fmt_out.i_height = p_sys->i_height;
+            }
             fmt_out.i_visible_width = fmt_out.i_width;
             fmt_out.i_visible_height = fmt_out.i_height;
 
@@ -408,7 +475,6 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 
             vout_CopyPicture( p_stream, p_new_pic, p_pic );
         }
-        p_pic->pf_release( p_pic );
 
         p_new_pic->i_refcount = 1;
         p_new_pic->i_status = DESTROYED_PICTURE;
@@ -417,6 +483,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
         p_new_pic->pf_release = ReleasePicture;
         p_new_pic->date = p_pic->date;
 
+        p_pic->pf_release( p_pic );
         PushPicture( p_stream, p_new_pic );
     }
 
@@ -426,6 +493,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 struct picture_sys_t
 {
     vlc_object_t *p_owner;
+    vlc_bool_t b_dead;
 };
 
 static void video_release_buffer( picture_t *p_pic )
@@ -439,14 +507,67 @@ static void video_release_buffer( picture_t *p_pic )
 
 static picture_t *video_new_buffer( decoder_t *p_dec )
 {
+    decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
     picture_t **pp_ring = p_dec->p_owner->pp_pics;
     picture_t *p_pic;
     int i;
 
+    if( p_dec->fmt_out.video.i_width != p_sys->video.i_width ||
+        p_dec->fmt_out.video.i_height != p_sys->video.i_height ||
+        p_dec->fmt_out.video.i_chroma != p_sys->video.i_chroma ||
+        p_dec->fmt_out.video.i_aspect != p_sys->video.i_aspect )
+    {
+        if( !p_dec->fmt_out.video.i_sar_num ||
+            !p_dec->fmt_out.video.i_sar_den )
+        {
+            p_dec->fmt_out.video.i_sar_num =
+              p_dec->fmt_out.video.i_aspect * p_dec->fmt_out.video.i_height;
+
+            p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
+              p_dec->fmt_out.video.i_width;
+        }
+
+        vlc_ureduce( &p_dec->fmt_out.video.i_sar_num,
+                     &p_dec->fmt_out.video.i_sar_den,
+                     p_dec->fmt_out.video.i_sar_num,
+                     p_dec->fmt_out.video.i_sar_den, 0 );
+
+        if( !p_dec->fmt_out.video.i_visible_width ||
+            !p_dec->fmt_out.video.i_visible_height )
+        {
+            p_dec->fmt_out.video.i_visible_width =
+                p_dec->fmt_out.video.i_width;
+            p_dec->fmt_out.video.i_visible_height =
+                p_dec->fmt_out.video.i_height;
+        }
+
+        p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
+        p_sys->video = p_dec->fmt_out.video;
+
+        for( i = 0; i < PICTURE_RING_SIZE; i++ )
+        {
+            if ( pp_ring[i] != NULL )
+            {
+                if ( pp_ring[i]->i_status == DESTROYED_PICTURE )
+                {
+                    if ( pp_ring[i]->p_data_orig != NULL )
+                        free( pp_ring[i]->p_data_orig );
+                    free( pp_ring[i]->p_sys );
+                    free( pp_ring[i] );
+                }
+                else
+                {
+                    pp_ring[i]->p_sys->b_dead = VLC_TRUE;
+                }
+                pp_ring[i] = NULL;
+            }
+        }
+    }
+
     /* Find an empty space in the picture ring buffer */
     for( i = 0; i < PICTURE_RING_SIZE; i++ )
     {
-        if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
+        if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
         {
             pp_ring[i]->i_status = RESERVED_PICTURE;
             return pp_ring[i];
@@ -454,7 +575,7 @@ static picture_t *video_new_buffer( decoder_t *p_dec )
     }
     for( i = 0; i < PICTURE_RING_SIZE; i++ )
     {
-        if( pp_ring[i] == 0 ) break;
+        if( pp_ring[i] == NULL ) break;
     }
 
     if( i == PICTURE_RING_SIZE )
@@ -481,12 +602,13 @@ static picture_t *video_new_buffer( decoder_t *p_dec )
     if( !p_pic->i_planes )
     {
         free( p_pic );
-        return 0;
+        return NULL;
     }
 
     p_pic->pf_release = video_release_buffer;
     p_pic->p_sys = malloc( sizeof(picture_sys_t) );
     p_pic->p_sys->p_owner = VLC_OBJECT(p_dec);
+    p_pic->p_sys->b_dead = VLC_FALSE;
     p_pic->i_status = RESERVED_PICTURE;
 
     pp_ring[i] = p_pic;
@@ -498,6 +620,13 @@ static void video_del_buffer( decoder_t *p_this, picture_t *p_pic )
 {
     p_pic->i_refcount = 0;
     p_pic->i_status = DESTROYED_PICTURE;
+    if ( p_pic->p_sys->b_dead )
+    {
+        if ( p_pic->p_data_orig != NULL )
+            free( p_pic->p_data_orig );
+        free( p_pic->p_sys );
+        free( p_pic );
+    }
 }
 
 static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )