X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fimage.c;h=b0a808f82de35fa62dc996f15bfc905d42a5aaeb;hb=ec5d86115480e2ba0f3b36b11c19570cbc75aa51;hp=811a09c81f62bb9d7e58601a8aaa3bcc22373d56;hpb=5002a535177b1dbed82dd21b1acee23b17099e08;p=vlc diff --git a/src/misc/image.c b/src/misc/image.c index 811a09c81f..b0a808f82d 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -39,11 +39,13 @@ #include #include +#include #include #include #include #include #include +#include #include static picture_t *ImageRead( image_handler_t *, block_t *, @@ -69,7 +71,8 @@ static filter_t *CreateFilter( vlc_object_t *, es_format_t *, video_format_t *, const char * ); static void DeleteFilter( filter_t * ); -static vlc_fourcc_t Ext2Fourcc( const char * ); +vlc_fourcc_t image_Type2Fourcc( const char * ); +vlc_fourcc_t image_Ext2Fourcc( const char * ); /*static const char *Fourcc2Ext( vlc_fourcc_t );*/ /** @@ -78,9 +81,10 @@ static vlc_fourcc_t Ext2Fourcc( const char * ); */ image_handler_t *__image_HandlerCreate( vlc_object_t *p_this ) { - image_handler_t *p_image = malloc( sizeof(image_handler_t) ); + image_handler_t *p_image = calloc( 1, sizeof(image_handler_t) ); + if( !p_image ) + return NULL; - memset( p_image, 0, sizeof(image_handler_t) ); p_image->p_parent = p_this; p_image->pf_read = ImageRead; @@ -232,12 +236,21 @@ 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 ) { /* Try to guess format from file name */ - p_fmt_in->i_chroma = Ext2Fourcc( psz_url ); + p_fmt_in->i_chroma = image_Ext2Fourcc( psz_url ); } p_pic = ImageRead( p_image, p_block, p_fmt_in, p_fmt_out ); @@ -349,7 +362,7 @@ static int ImageWriteUrl( image_handler_t *p_image, picture_t *p_pic, if( !p_fmt_out->i_chroma ) { /* Try to guess format from file name */ - p_fmt_out->i_chroma = Ext2Fourcc( psz_url ); + p_fmt_out->i_chroma = image_Ext2Fourcc( psz_url ); } file = utf8_fopen( psz_url, "wb" ); @@ -531,26 +544,24 @@ static const struct { 0, NULL } }; -static vlc_fourcc_t Ext2Fourcc( const char *psz_name ) +vlc_fourcc_t image_Type2Fourcc( const char *psz_type ) { int i; + for( i = 0; ext_table[i].i_codec; i++ ) + if( !strcasecmp( ext_table[i].psz_ext, psz_type ) ) + return ext_table[i].i_codec; + + return 0; +} + +vlc_fourcc_t image_Ext2Fourcc( const char *psz_name ) +{ psz_name = strrchr( psz_name, '.' ); if( !psz_name ) return 0; psz_name++; - for( i = 0; ext_table[i].i_codec; i++ ) - { - int j; - for( j = 0; toupper(ext_table[i].psz_ext[j]) == toupper(psz_name[j]); - j++ ) - { - if( !ext_table[i].psz_ext[j] && !psz_name[j] ) - return ext_table[i].i_codec; - } - } - - return 0; + return image_Type2Fourcc( psz_name ); } /* @@ -567,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_FOURCC('b','m','p',' '), "image/bmp" }, + { VLC_FOURCC('b','m','p',' '), "image/x-bmp" }, + { VLC_FOURCC('b','m','p',' '), "image/x-bitmap" }, + { VLC_FOURCC('b','m','p',' '), "image/x-ms-bmp" }, + { VLC_FOURCC('p','n','m',' '), "image/x-portable-anymap" }, + { VLC_FOURCC('p','n','m',' '), "image/x-portable-bitmap" }, + { VLC_FOURCC('p','n','m',' '), "image/x-portable-graymap" }, + { VLC_FOURCC('p','n','m',' '), "image/x-portable-pixmap" }, + { VLC_FOURCC('g','i','f',' '), "image/gif" }, + { VLC_FOURCC('j','p','e','g'), "image/jpeg" }, + { VLC_FOURCC('p','c','x',' '), "image/pcx" }, + { VLC_FOURCC('p','n','g',' '), "image/png" }, + { VLC_FOURCC('t','i','f','f'), "image/tiff" }, + { VLC_FOURCC('t','g','a',' '), "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; @@ -619,7 +664,7 @@ static decoder_t *CreateDecoder( vlc_object_t *p_this, video_format_t *fmt ) vlc_object_attach( p_dec, p_this ); /* Find a suitable decoder module */ - p_dec->p_module = module_Need( p_dec, "decoder", "$codec", 0 ); + 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" @@ -637,11 +682,14 @@ static void DeleteDecoder( decoder_t * p_dec ) { vlc_object_detach( p_dec ); - if( p_dec->p_module ) module_Unneed( p_dec, p_dec->p_module ); + if( p_dec->p_module ) module_unneed( p_dec, p_dec->p_module ); es_format_Clean( &p_dec->fmt_in ); es_format_Clean( &p_dec->fmt_out ); + if( p_dec->p_description ) + vlc_meta_Delete( p_dec->p_description ); + vlc_object_release( p_dec ); p_dec = NULL; } @@ -651,7 +699,7 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, { encoder_t *p_enc; - p_enc = vlc_object_create( p_this, VLC_OBJECT_ENCODER ); + p_enc = sout_EncoderCreate( p_this ); if( p_enc == NULL ) return NULL; @@ -698,7 +746,7 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, vlc_object_attach( p_enc, p_this ); /* Find a suitable decoder module */ - p_enc->p_module = module_Need( p_enc, "encoder", 0, 0 ); + p_enc->p_module = module_need( p_enc, "encoder", NULL, false ); if( !p_enc->p_module ) { msg_Err( p_enc, "no suitable encoder module for fourcc `%4.4s'.\n" @@ -717,7 +765,7 @@ static void DeleteEncoder( encoder_t * p_enc ) { vlc_object_detach( p_enc ); - if( p_enc->p_module ) module_Unneed( p_enc, p_enc->p_module ); + if( p_enc->p_module ) module_unneed( p_enc, p_enc->p_module ); es_format_Clean( &p_enc->fmt_in ); es_format_Clean( &p_enc->fmt_out ); @@ -746,8 +794,8 @@ static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in, p_filter->fmt_out = *p_fmt_in; p_filter->fmt_out.i_codec = p_fmt_out->i_chroma; p_filter->fmt_out.video = *p_fmt_out; - p_filter->p_module = module_Need( p_filter, "video filter2", - psz_module, 0 ); + p_filter->p_module = module_need( p_filter, "video filter2", + psz_module, false ); if( !p_filter->p_module ) { @@ -763,7 +811,7 @@ static void DeleteFilter( filter_t * p_filter ) { vlc_object_detach( p_filter ); - if( p_filter->p_module ) module_Unneed( p_filter, p_filter->p_module ); + if( p_filter->p_module ) module_unneed( p_filter, p_filter->p_module ); es_format_Clean( &p_filter->fmt_in ); es_format_Clean( &p_filter->fmt_out );