Put the preprocessing flags in CPPFLAGS

[vlc] / src / video_output / vout_pictures.c

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 11d8da754b83026fb772396fc0b409ff51344b7c..c6b843126e659d3095fde7efafd4bc10c0f942ed 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vout_pictures.c : picture management functions
  *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -19,22 +19,20 @@
  *
  * 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>                                                /* free() */
-#include <stdio.h>                                              /* sprintf() */
-#include <string.h>                                            /* strerror() */
 
-#include <vlc/vlc.h>
-
-#include "vlc_video.h"
-#include "video_output.h"
-#include "vlc_spu.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#include <vlc/vlc.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
 #include "vout_pictures.h"
 
 /**
@@ -259,13 +257,6 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
     vlc_mutex_lock( &p_vout->picture_lock );
     p_pic->i_refcount--;
 
-    if( p_pic->i_refcount < 0 )
-    {
-        msg_Err( p_vout, "picture %p refcount is %i",
-                 p_pic, p_pic->i_refcount );
-        p_pic->i_refcount = 0;
-    }
-
     if( ( p_pic->i_refcount == 0 ) &&
         ( p_pic->i_status == DISPLAYED_PICTURE ) )
     {
@@ -379,6 +370,8 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
                                   p_vout->fmt_out.i_aspect );
             p_tmp_pic->i_type = MEMORY_PICTURE;
             p_tmp_pic->i_status = RESERVED_PICTURE;
+            /* some modules (such as blend)  needs to know the extra information in picture heap */
+            p_tmp_pic->p_heap = &p_vout->output;
         }
 
         /* Convert image to the first direct buffer */
@@ -440,29 +433,23 @@ void vout_PlacePicture( vout_thread_t *p_vout,
     }
     else
     {
-        *pi_width = __MIN( i_width, p_vout->render.i_width );
-        *pi_height = __MIN( i_height, p_vout->render.i_height );
+        *pi_width = __MIN( i_width, p_vout->fmt_in.i_visible_width );
+        *pi_height = __MIN( i_height, p_vout->fmt_in.i_visible_height );
     }
 
-    if( VOUT_ASPECT_FACTOR * *pi_width / *pi_height < p_vout->render.i_aspect )
+    if( p_vout->fmt_in.i_visible_width * (int64_t)p_vout->fmt_in.i_sar_num *
+        *pi_height / p_vout->fmt_in.i_visible_height /
+        p_vout->fmt_in.i_sar_den > *pi_width )
     {
-        *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
+        *pi_height = p_vout->fmt_in.i_visible_height *
+            (int64_t)p_vout->fmt_in.i_sar_den * *pi_width /
+            p_vout->fmt_in.i_visible_width / p_vout->fmt_in.i_sar_num;
     }
     else
     {
-        *pi_height = *pi_width * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect;
-    }
-
-    if( *pi_width > i_width )
-    {
-        *pi_width = i_width;
-        *pi_height = VOUT_ASPECT_FACTOR * *pi_width / p_vout->render.i_aspect;
-    }
-
-    if( *pi_height > i_height )
-    {
-        *pi_height = i_height;
-        *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
+        *pi_width = p_vout->fmt_in.i_visible_width *
+            (int64_t)p_vout->fmt_in.i_sar_num * *pi_height /
+            p_vout->fmt_in.i_visible_height / p_vout->fmt_in.i_sar_den;
     }
 
     switch( p_vout->i_alignment & VOUT_ALIGN_HMASK )
@@ -579,7 +566,6 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
         case FOURCC_YUY2:
         case FOURCC_UYVY:
         case FOURCC_J422:
-            p_format->i_bits_per_pixel = 16;
             p_format->i_bits_per_pixel = 16;
             break;
         case FOURCC_I411:
@@ -601,6 +587,7 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
             break;
 
         case FOURCC_RV32:
+        case FOURCC_RGBA:
             p_format->i_bits_per_pixel = 32;
             break;
         case FOURCC_RV24:
@@ -613,6 +600,11 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
         case FOURCC_RGB2:
             p_format->i_bits_per_pixel = 8;
             break;
+
+        case FOURCC_GREY:
+            p_format->i_bits_per_pixel = 8;
+            break;
+
         default:
             p_format->i_bits_per_pixel = 0;
             break;
@@ -829,6 +821,7 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
             break;
 
         case FOURCC_RV32:
+        case FOURCC_RGBA:
             p_pic->p->i_lines = i_height_aligned;
             p_pic->p->i_visible_lines = i_height;
             p_pic->p->i_pitch = i_width_aligned * 4;
@@ -837,6 +830,15 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
             p_pic->i_planes = 1;
             break;
 
+        case FOURCC_GREY:
+            p_pic->p->i_lines = i_height_aligned;
+            p_pic->p->i_visible_lines = i_height;
+            p_pic->p->i_pitch = i_width_aligned;
+            p_pic->p->i_visible_pitch = i_width;
+            p_pic->p->i_pixel_pitch = 1;
+            p_pic->i_planes = 1;
+            break;
+
         default:
             msg_Err( p_this, "unknown chroma type 0x%.8x (%4.4s)",
                              i_chroma, (char*)&i_chroma );
@@ -926,7 +928,7 @@ void __vout_CopyPicture( vlc_object_t *p_this,
         if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch )
         {
             /* There are margins, but with the same width : perfect ! */
-            p_this->p_vlc->pf_memcpy(
+            p_this->p_libvlc->pf_memcpy(
                          p_dest->p[i].p_pixels, p_src->p[i].p_pixels,
                          p_src->p[i].i_pitch * p_src->p[i].i_visible_lines );
         }
@@ -939,7 +941,7 @@ void __vout_CopyPicture( vlc_object_t *p_this,
 
             for( i_line = p_src->p[i].i_visible_lines; i_line--; )
             {
-                p_this->p_vlc->pf_memcpy( p_out, p_in,
+                p_this->p_libvlc->pf_memcpy( p_out, p_in,
                                           p_src->p[i].i_visible_pitch );
                 p_in += p_src->p[i].i_pitch;
                 p_out += p_dest->p[i].i_pitch;