core: fix time-offset and position-offset callbacks

[vlc] / src / misc / image.c

diff --git a/src/misc/image.c b/src/misc/image.c
index 9120f7cd112338a09efb8781daa2db12b1dad0ee..cc11c30e9d31688d4cbf325332057ca6e352a23e 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -236,6 +236,15 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url,
     p_block = block_New( p_image->p_parent, i_size );
 
     stream_Read( p_stream, p_block->p_buffer, i_size );
+
+    if( !p_fmt_in->i_chroma )
+    {
+        char *psz_mime = NULL;
+        stream_Control( p_stream, STREAM_GET_CONTENT_TYPE, &psz_mime );
+        if( psz_mime )
+            p_fmt_in->i_chroma = image_Mime2Fourcc( psz_mime );
+        free( psz_mime );
+    }
     stream_Delete( p_stream );
 
     if( !p_fmt_in->i_chroma )
@@ -514,23 +523,23 @@ static const struct
 
 } ext_table[] =
 {
-    { VLC_FOURCC('j','p','e','g'), "jpeg" },
-    { VLC_FOURCC('j','p','e','g'), "jpg"  },
-    { VLC_FOURCC('l','j','p','g'), "ljpg" },
-    { VLC_FOURCC('p','n','g',' '), "png" },
-    { VLC_FOURCC('p','g','m',' '), "pgm" },
-    { VLC_FOURCC('p','g','m','y'), "pgmyuv" },
+    { VLC_CODEC_JPEG,              "jpeg" },
+    { VLC_CODEC_JPEG,              "jpg"  },
+    { VLC_CODEC_JPEGLS,            "ljpg" },
+    { VLC_CODEC_PNG,               "png" },
+    { VLC_CODEC_PGM,               "pgm" },
+    { VLC_CODEC_PGMYUV,            "pgmyuv" },
     { VLC_FOURCC('p','b','m',' '), "pbm" },
     { VLC_FOURCC('p','a','m',' '), "pam" },
-    { VLC_FOURCC('t','g','a',' '), "tga" },
-    { VLC_FOURCC('b','m','p',' '), "bmp" },
-    { VLC_FOURCC('p','n','m',' '), "pnm" },
+    { VLC_CODEC_TARGA,             "tga" },
+    { VLC_CODEC_BMP,               "bmp" },
+    { VLC_CODEC_PNM,               "pnm" },
     { VLC_FOURCC('x','p','m',' '), "xpm" },
     { VLC_FOURCC('x','c','f',' '), "xcf" },
-    { VLC_FOURCC('p','c','x',' '), "pcx" },
-    { VLC_FOURCC('g','i','f',' '), "gif" },
-    { VLC_FOURCC('t','i','f','f'), "tif" },
-    { VLC_FOURCC('t','i','f','f'), "tiff" },
+    { VLC_CODEC_PCX,               "pcx" },
+    { VLC_CODEC_GIF,               "gif" },
+    { VLC_CODEC_TIFF,              "tif" },
+    { VLC_CODEC_TIFF,              "tiff" },
     { VLC_FOURCC('l','b','m',' '), "lbm" },
     { 0, NULL }
 };
@@ -540,15 +549,8 @@ vlc_fourcc_t image_Type2Fourcc( const char *psz_type )
     int i;
 
     for( i = 0; ext_table[i].i_codec; i++ )
-    {
-        int j;
-        for( j = 0; toupper(ext_table[i].psz_ext[j]) == toupper(psz_type[j]);
-             j++ )
-        {
-            if( !ext_table[i].psz_ext[j] && !psz_type[j] )
-                return ext_table[i].i_codec;
-        }
-    }
+        if( !strcasecmp( ext_table[i].psz_ext, psz_type ) )
+            return ext_table[i].i_codec;
 
     return 0;
 }
@@ -576,6 +578,40 @@ static const char *Fourcc2Ext( vlc_fourcc_t i_codec )
 }
 */
 
+static const struct
+{
+    vlc_fourcc_t i_codec;
+    const char *psz_mime;
+} mime_table[] =
+{
+    { VLC_CODEC_BMP,               "image/bmp" },
+    { VLC_CODEC_BMP,               "image/x-bmp" },
+    { VLC_CODEC_BMP,               "image/x-bitmap" },
+    { VLC_CODEC_BMP,               "image/x-ms-bmp" },
+    { VLC_CODEC_PNM,               "image/x-portable-anymap" },
+    { VLC_CODEC_PNM,               "image/x-portable-bitmap" },
+    { VLC_CODEC_PNM,               "image/x-portable-graymap" },
+    { VLC_CODEC_PNM,               "image/x-portable-pixmap" },
+    { VLC_CODEC_GIF,               "image/gif" },
+    { VLC_CODEC_JPEG,              "image/jpeg" },
+    { VLC_CODEC_PCX,               "image/pcx" },
+    { VLC_CODEC_PNG,               "image/png" },
+    { VLC_CODEC_TIFF,              "image/tiff" },
+    { VLC_CODEC_TARGA,             "iamge/x-tga" },
+    { VLC_FOURCC('x','p','m',' '), "image/x-xpixmap" },
+    { 0, NULL }
+};
+
+vlc_fourcc_t image_Mime2Fourcc( const char *psz_mime )
+{
+    int i;
+    for( i = 0; mime_table[i].i_codec; i++ )
+        if( !strcmp( psz_mime, mime_table[i].psz_mime ) )
+            return mime_table[i].i_codec;
+    return 0;
+}
+
+
 static picture_t *video_new_buffer( decoder_t *p_dec )
 {
     p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
@@ -631,7 +667,7 @@ static decoder_t *CreateDecoder( vlc_object_t *p_this, video_format_t *fmt )
     p_dec->p_module = module_need( p_dec, "decoder", "$codec", false );
     if( !p_dec->p_module )
     {
-        msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
+        msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'. "
                  "VLC probably does not support this image format.",
                  (char*)&p_dec->fmt_in.i_codec );