]> git.sesse.net Git - vlc/blobdiff - modules/video_chroma/i420_rgb.c
Swscale: use calloc instead of malloc
[vlc] / modules / video_chroma / i420_rgb.c
index 28303f79a9eb5aa7f1a7929a944c0ada617064c2..194403b605311b2154a1171887d41b11fca44cae 100644 (file)
@@ -1,25 +1,25 @@
 /*****************************************************************************
  * i420_rgb.c : YUV to bitmap RGB conversion module for vlc
  *****************************************************************************
- * Copyright (C) 2000, 2001, 2004, 2008 the VideoLAN team
+ * Copyright (C) 2000, 2001, 2004, 2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Sam Hocevar <sam@zoy.org>
  *          Damien Fouilleul <damienf@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #include "i420_rgb.h"
-#if defined (MODULE_NAME_IS_i420_rgb)
-#   include "i420_rgb_c.h"
+#ifdef PLAIN
+# include "i420_rgb_c.h"
+static picture_t *I420_RGB8_Filter( filter_t *, picture_t * );
+static picture_t *I420_RGB16_Filter( filter_t *, picture_t * );
+static picture_t *I420_RGB32_Filter( filter_t *, picture_t * );
+
+static void SetGammaTable( int *pi_table, double f_gamma );
+static void SetYUV( filter_t * );
+static void Set8bppPalette( filter_t *, uint8_t * );
+#else
+static picture_t *I420_R5G5B5_Filter( filter_t *, picture_t * );
+static picture_t *I420_R5G6B5_Filter( filter_t *, picture_t * );
+static picture_t *I420_A8R8G8B8_Filter( filter_t *, picture_t * );
+static picture_t *I420_R8G8B8A8_Filter( filter_t *, picture_t * );
+static picture_t *I420_B8G8R8A8_Filter( filter_t *, picture_t * );
+static picture_t *I420_A8B8G8R8_Filter( filter_t *, picture_t * );
 #endif
 
 /*****************************************************************************
                        << p_filter->fmt_out.video.i_lbshift))
 
 /*****************************************************************************
- * Local and extern prototypes.
+ * Module descriptor.
  *****************************************************************************/
 static int  Activate   ( vlc_object_t * );
 static void Deactivate ( vlc_object_t * );
 
-#if defined (MODULE_NAME_IS_i420_rgb)
-static void SetGammaTable       ( int *pi_table, double f_gamma );
-static void SetYUV              ( filter_t * );
-static void Set8bppPalette      ( filter_t *, uint8_t * );
-#endif
-
-/*****************************************************************************
- * Module descriptor.
- *****************************************************************************/
 vlc_module_begin ()
-#if defined (MODULE_NAME_IS_i420_rgb)
-    set_description( N_("I420,IYUV,YV12 to "
-                       "RGB2,RV15,RV16,RV24,RV32 conversions") )
-    set_capability( "video filter2", 80 )
-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-    set_description( N_( "MMX I420,IYUV,YV12 to "
-                        "RV15,RV16,RV24,RV32 conversions") )
-    set_capability( "video filter2", 100 )
-    add_requirement( MMX )
-#elif defined (MODULE_NAME_IS_i420_rgb_sse2)
+#if defined (SSE2)
     set_description( N_( "SSE2 I420,IYUV,YV12 to "
                         "RV15,RV16,RV24,RV32 conversions") )
     set_capability( "video filter2", 120 )
-    add_requirement( SSE2 )
+# define vlc_CPU_capable() vlc_CPU_SSE2()
+#elif defined (MMX)
+    set_description( N_( "MMX I420,IYUV,YV12 to "
+                        "RV15,RV16,RV24,RV32 conversions") )
+    set_capability( "video filter2", 100 )
+# define vlc_CPU_capable() vlc_CPU_MMX()
+#else
+    set_description( N_("I420,IYUV,YV12 to "
+                       "RGB2,RV15,RV16,RV24,RV32 conversions") )
+    set_capability( "video filter2", 80 )
+# define vlc_CPU_capable() (true)
 #endif
     set_callbacks( Activate, Deactivate )
 vlc_module_end ()
@@ -94,30 +101,32 @@ vlc_module_end ()
 static int Activate( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
-#if defined (MODULE_NAME_IS_i420_rgb)
+#ifdef PLAIN
     size_t i_tables_size;
 #endif
 
+    if( !vlc_CPU_capable() )
+        return VLC_EGENERIC;
     if( p_filter->fmt_out.video.i_width & 1
      || p_filter->fmt_out.video.i_height & 1 )
     {
         return VLC_EGENERIC;
     }
 
+    if( p_filter->fmt_in.video.orientation != p_filter->fmt_out.video.orientation )
+    {
+        return VLC_EGENERIC;
+    }
+
     switch( p_filter->fmt_in.video.i_chroma )
     {
         case VLC_CODEC_YV12:
         case VLC_CODEC_I420:
             switch( p_filter->fmt_out.video.i_chroma )
             {
-#if defined (MODULE_NAME_IS_i420_rgb)
-                case VLC_CODEC_RGB8:
-                    p_filter->pf_video_filter = I420_RGB8_Filter;
-                    break;
-#endif
+#ifndef PLAIN
                 case VLC_CODEC_RGB15:
                 case VLC_CODEC_RGB16:
-#if ! defined (MODULE_NAME_IS_i420_rgb)
                     /* If we don't have support for the bitmasks, bail out */
                     if( ( p_filter->fmt_out.video.i_rmask == 0x7c00
                        && p_filter->fmt_out.video.i_gmask == 0x03e0
@@ -137,19 +146,8 @@ static int Activate( vlc_object_t *p_this )
                     }
                     else
                         return VLC_EGENERIC;
-#else
-                    // generic C chroma converter */
-                    p_filter->pf_video_filter = I420_RGB16_Filter;
-#endif
                     break;
-
-#if 0
-                /* Hmmm, is there only X11 using 32bits per pixel for RV24 ? */
-                case VLC_CODEC_RGB24:
-#endif
-
                 case VLC_CODEC_RGB32:
-#if ! defined (MODULE_NAME_IS_i420_rgb)
                     /* If we don't have support for the bitmasks, bail out */
                     if( p_filter->fmt_out.video.i_rmask == 0x00ff0000
                      && p_filter->fmt_out.video.i_gmask == 0x0000ff00
@@ -185,12 +183,19 @@ static int Activate( vlc_object_t *p_this )
                     }
                     else
                         return VLC_EGENERIC;
+                    break;
 #else
-                    /* generic C chroma converter */
+                case VLC_CODEC_RGB8:
+                    p_filter->pf_video_filter = I420_RGB8_Filter;
+                    break;
+                case VLC_CODEC_RGB15:
+                case VLC_CODEC_RGB16:
+                    p_filter->pf_video_filter = I420_RGB16_Filter;
+                    break;
+                case VLC_CODEC_RGB32:
                     p_filter->pf_video_filter = I420_RGB32_Filter;
-#endif
                     break;
-
+#endif
                 default:
                     return VLC_EGENERIC;
             }
@@ -208,22 +213,19 @@ static int Activate( vlc_object_t *p_this )
 
     switch( p_filter->fmt_out.video.i_chroma )
     {
-#if defined (MODULE_NAME_IS_i420_rgb)
+#ifdef PLAIN
         case VLC_CODEC_RGB8:
             p_filter->p_sys->p_buffer = malloc( VOUT_MAX_WIDTH );
             break;
 #endif
-
         case VLC_CODEC_RGB15:
         case VLC_CODEC_RGB16:
             p_filter->p_sys->p_buffer = malloc( VOUT_MAX_WIDTH * 2 );
             break;
-
         case VLC_CODEC_RGB24:
         case VLC_CODEC_RGB32:
             p_filter->p_sys->p_buffer = malloc( VOUT_MAX_WIDTH * 4 );
             break;
-
         default:
             p_filter->p_sys->p_buffer = NULL;
             break;
@@ -246,7 +248,7 @@ static int Activate( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-#if defined (MODULE_NAME_IS_i420_rgb)
+#ifdef PLAIN
     switch( p_filter->fmt_out.video.i_chroma )
     {
     case VLC_CODEC_RGB8:
@@ -285,7 +287,7 @@ static void Deactivate( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
 
-#if defined (MODULE_NAME_IS_i420_rgb)
+#ifdef PLAIN
     free( p_filter->p_sys->p_base );
 #endif
     free( p_filter->p_sys->p_offset );
@@ -293,20 +295,18 @@ static void Deactivate( vlc_object_t *p_this )
     free( p_filter->p_sys );
 }
 
-#if defined (MODULE_NAME_IS_i420_rgb)
-VIDEO_FILTER_WRAPPER( I420_RGB8 )
-VIDEO_FILTER_WRAPPER( I420_RGB16 )
-VIDEO_FILTER_WRAPPER( I420_RGB32 )
-#else
+#ifndef PLAIN
 VIDEO_FILTER_WRAPPER( I420_R5G5B5 )
 VIDEO_FILTER_WRAPPER( I420_R5G6B5 )
 VIDEO_FILTER_WRAPPER( I420_A8R8G8B8 )
 VIDEO_FILTER_WRAPPER( I420_R8G8B8A8 )
 VIDEO_FILTER_WRAPPER( I420_B8G8R8A8 )
 VIDEO_FILTER_WRAPPER( I420_A8B8G8R8 )
-#endif
+#else
+VIDEO_FILTER_WRAPPER( I420_RGB8 )
+VIDEO_FILTER_WRAPPER( I420_RGB16 )
+VIDEO_FILTER_WRAPPER( I420_RGB32 )
 
-#if defined (MODULE_NAME_IS_i420_rgb)
 /*****************************************************************************
  * SetGammaTable: return intensity table transformed by gamma curve.
  *****************************************************************************
@@ -522,6 +522,4 @@ static void Set8bppPalette( filter_t *p_filter, uint8_t *p_rgb8 )
         }
     }
 }
-
 #endif
-