Remember the QFileDialog states.

[vlc] / modules / codec / sdl_image.c

diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c
index cf92affb6a4acf81bfce09c3c52ccd96b8a8e783..82022e8873ebecde84bfd913f6e2901ebe3b4684 100644 (file)
--- a/modules/codec/sdl_image.c
+++ b/modules/codec/sdl_image.c
@@ -18,14 +18,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 <vlc/vlc.h>
-#include <vlc/decoder.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_vout.h>
 
 #include SDL_IMAGE_INCLUDE_FILE
 
@@ -51,8 +57,9 @@ static picture_t *DecodeBlock  ( decoder_t *, block_t ** );
 vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_VCODEC );
-    set_description( _("SDL_image video decoder") );
-    set_capability( "decoder", 900 );
+    set_shortname( N_("SDL Image decoder"));
+    set_description( N_("SDL_image video decoder") );
+    set_capability( "decoder", 60 );
     set_callbacks( OpenDecoder, CloseDecoder );
     add_shortcut( "sdl_image" );
 vlc_module_end();
@@ -60,7 +67,7 @@ vlc_module_end();
 static const struct supported_fmt_t
 {
     vlc_fourcc_t i_fourcc;
-    char *psz_sdl_type;
+    const char *psz_sdl_type;
 } p_supported_fmt[] =
 {
     { VLC_FOURCC('t','g','a',' '), "TGA" },
@@ -101,10 +108,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_dec->p_sys = p_sys =
           (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
-    {
-        msg_Err( p_dec, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
     p_sys->psz_sdl_type = p_supported_fmt[i].psz_sdl_type;
 
     /* Set output properties - this is a decoy and isn't used anywhere */
@@ -136,7 +140,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     p_rw = SDL_RWFromConstMem( p_block->p_buffer, p_block->i_buffer );
 
     /* Decode picture. */
-    p_surface = IMG_LoadTyped_RW( p_rw, 1, p_sys->psz_sdl_type );
+    p_surface = IMG_LoadTyped_RW( p_rw, 1, (char*)p_sys->psz_sdl_type );
     if ( p_surface == NULL )
     {
         msg_Warn( p_dec, "SDL_image couldn't load the image (%s)",
@@ -170,42 +174,86 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     p_pic = p_dec->pf_vout_buffer_new( p_dec );
     if ( p_pic == NULL ) goto error;
 
-    if ( p_surface->format->BitsPerPixel == 8 )
+    switch ( p_surface->format->BitsPerPixel )
     {
-        int i, j;
-        uint8_t *r = p_pic->p[0].p_pixels;
-        uint8_t *g = p_pic->p[0].p_pixels + 1;
-        uint8_t *b = p_pic->p[0].p_pixels + 2;
-        SDL_Palette *p_palette = p_surface->format->palette;
-
-        for ( i = 0; i < p_surface->h; i++ )
+        case 8:
         {
-            for ( j = 0; j < p_surface->w; j++ )
+            int i, j;
+            uint8_t *p_src, *p_dst;
+            uint8_t r, g, b;
+            for ( i = 0; i < p_surface->h; i++ )
             {
-                uint8_t i_index = ((uint8_t *)p_surface->pixels)[j];
-                SDL_Color *p_color = &p_palette->colors[i_index];
-                r[j] = p_color->r;
-                g[j] = p_color->g;
-                b[j] = p_color->b;
+                p_src = (uint8_t*)p_surface->pixels + i * p_surface->pitch;
+                p_dst = p_pic->p[0].p_pixels + i * p_pic->p[0].i_pitch;
+                for ( j = 0; j < p_surface->w; j++ )
+                {
+                    SDL_GetRGB( *(p_src++), p_surface->format,
+                                &r, &g, &b );
+                    *(p_dst++) = r;
+                    *(p_dst++) = g;
+                    *(p_dst++) = b;
+                }
             }
+            break;
         }
-        r += p_pic->p[0].i_pitch;
-        g += p_pic->p[0].i_pitch;
-        b += p_pic->p[0].i_pitch;
-    }
-    else
-    {
-        int i;
-        uint8_t *p_src = p_surface->pixels;
-        uint8_t *p_dst = p_pic->p[0].p_pixels;
-        int i_pitch = p_pic->p[0].i_pitch < p_surface->pitch ?
-                      p_pic->p[0].i_pitch : p_surface->pitch;
+        case 16:
+        {
+            int i;
+            uint8_t *p_src = p_surface->pixels;
+            uint8_t *p_dst = p_pic->p[0].p_pixels;
+            int i_pitch = p_pic->p[0].i_pitch < p_surface->pitch ?
+                p_pic->p[0].i_pitch : p_surface->pitch;
 
-        for ( i = 0; i < p_surface->h; i++ )
+            for ( i = 0; i < p_surface->h; i++ )
+            {
+                vlc_memcpy( p_dst, p_src, i_pitch );
+                p_src += p_surface->pitch;
+                p_dst += p_pic->p[0].i_pitch;
+            }
+            break;
+        }
+        case 24:
         {
-            p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_pitch );
-            p_src += p_surface->pitch;
-            p_dst += p_pic->p[0].i_pitch;
+            int i, j;
+            uint8_t *p_src, *p_dst;
+            uint8_t r, g, b;
+            for ( i = 0; i < p_surface->h; i++ )
+            {
+                p_src = (uint8_t*)p_surface->pixels + i * p_surface->pitch;
+                p_dst = p_pic->p[0].p_pixels + i * p_pic->p[0].i_pitch;
+                for ( j = 0; j < p_surface->w; j++ )
+                {
+                    SDL_GetRGB( *(uint32_t*)p_src, p_surface->format,
+                                &r, &g, &b );
+                    *(p_dst++) = r;
+                    *(p_dst++) = g;
+                    *(p_dst++) = b;
+                    p_src += 3;
+                }
+            }
+            break;
+        }
+        case 32:
+        {
+            int i, j;
+            uint8_t *p_src, *p_dst;
+            uint8_t r, g, b, a;
+            for ( i = 0; i < p_surface->h; i++ )
+            {
+                p_src = (uint8_t*)p_surface->pixels + i * p_surface->pitch;
+                p_dst = p_pic->p[0].p_pixels + i * p_pic->p[0].i_pitch;
+                for ( j = 0; j < p_surface->w; j++ )
+                {
+                    SDL_GetRGBA( *(uint32_t*)p_src, p_surface->format,
+                                &r, &g, &b, &a );
+                    *(p_dst++) = b;
+                    *(p_dst++) = g;
+                    *(p_dst++) = r;
+                    *(p_dst++) = a;
+                    p_src += 4;
+                }
+            }
+            break;
         }
     }