X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fimage.c;h=4e5328473a55c62c77e4c31492b97fcf21ef1f7e;hb=5dbc70c99be39d53beb4d4548fd5767eddd17cf1;hp=6c25a68090dee7cd7221594082815bb9c510557d;hpb=25eabfa92359ae5a16cb862fa9d4f600960d6621;p=vlc diff --git a/src/misc/image.c b/src/misc/image.c index 6c25a68090..4e5328473a 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -1,7 +1,7 @@ /***************************************************************************** * image.c : wrapper for image reading/writing facilities ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2007 the VideoLAN team * $Id$ * * Author: Gildas Bazin @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /** @@ -29,11 +29,22 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include +#include + +#include +#include #include +#include #include +#include +#include +#include static picture_t *ImageRead( image_handler_t *, block_t *, video_format_t *, video_format_t * ); @@ -95,6 +106,7 @@ void image_HandlerDelete( image_handler_t *p_image ) if( p_image->p_filter ) DeleteFilter( p_image->p_filter ); free( p_image ); + p_image = NULL; } /** @@ -127,8 +139,8 @@ static picture_t *ImageRead( image_handler_t *p_image, block_t *p_block, while( (p_tmp = p_image->p_dec->pf_decode_video( p_image->p_dec, &p_block )) != NULL ) { - if ( p_pic != NULL ) - p_pic->pf_release( p_pic ); + if( p_pic != NULL ) + picture_Release( p_pic ); p_pic = p_tmp; } @@ -176,7 +188,7 @@ static picture_t *ImageRead( image_handler_t *p_image, block_t *p_block, if( !p_image->p_filter ) { - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } } @@ -203,24 +215,24 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url, { block_t *p_block; picture_t *p_pic; - FILE *file; + stream_t *p_stream = NULL; int i_size; - file = fopen( psz_url, "rb" ); - if( !file ) + p_stream = stream_UrlNew( p_image->p_parent, psz_url ); + + if( !p_stream ) { - msg_Dbg( p_image->p_parent, "could not open file %s for reading", + msg_Dbg( p_image->p_parent, "could not open %s for reading", psz_url ); return NULL; } - fseek( file, 0, SEEK_END ); - i_size = ftell( file ); - fseek( file, 0, SEEK_SET ); + i_size = stream_Size( p_stream ); p_block = block_New( p_image->p_parent, i_size ); - fread( p_block->p_buffer, sizeof(char), i_size, file ); - fclose( file ); + + stream_Read( p_stream, p_block->p_buffer, i_size ); + stream_Delete( p_stream ); if( !p_fmt_in->i_chroma ) { @@ -238,14 +250,11 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url, * */ -void PicRelease( picture_t *p_pic ){}; - static block_t *ImageWrite( image_handler_t *p_image, picture_t *p_pic, video_format_t *p_fmt_in, video_format_t *p_fmt_out ) { block_t *p_block; - void (*pf_release)( picture_t * ); /* Check if we can reuse the current encoder */ if( p_image->p_enc && @@ -307,11 +316,10 @@ static block_t *ImageWrite( image_handler_t *p_image, picture_t *p_pic, p_image->p_filter->fmt_out.video = p_image->p_enc->fmt_in.video; } - pf_release = p_pic->pf_release; - p_pic->pf_release = PicRelease; /* Small hack */ + picture_Yield( p_pic ); + p_tmp_pic = p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic ); - p_pic->pf_release = pf_release; p_block = p_image->p_enc->pf_encode_video( p_image->p_enc, p_tmp_pic ); @@ -344,25 +352,33 @@ static int ImageWriteUrl( image_handler_t *p_image, picture_t *p_pic, p_fmt_out->i_chroma = Ext2Fourcc( psz_url ); } - file = fopen( psz_url, "wb" ); + file = utf8_fopen( psz_url, "wb" ); if( !file ) { - msg_Dbg( p_image->p_parent, "could not open file %s for writing", - psz_url ); + msg_Err( p_image->p_parent, "%s: %m", psz_url ); return VLC_EGENERIC; } p_block = ImageWrite( p_image, p_pic, p_fmt_in, p_fmt_out ); + int err = 0; if( p_block ) { - fwrite( p_block->p_buffer, sizeof(char), p_block->i_buffer, file ); + if( fwrite( p_block->p_buffer, p_block->i_buffer, 1, file ) != 1 ) + err = errno; block_Release( p_block ); } - fclose( file ); + if( fclose( file ) && !err ) + err = errno; + + if( err ) + { + errno = err; + msg_Err( p_image->p_parent, "%s: %m", psz_url ); + } - return p_block ? VLC_SUCCESS : VLC_EGENERIC; + return err ? VLC_EGENERIC : VLC_SUCCESS; } /** @@ -374,7 +390,6 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic, video_format_t *p_fmt_in, video_format_t *p_fmt_out ) { - void (*pf_release)( picture_t * ); picture_t *p_pif; if( !p_fmt_out->i_width && !p_fmt_out->i_height && @@ -406,7 +421,7 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic, { /* We need to restart a new filter */ DeleteFilter( p_image->p_filter ); - p_image->p_filter = 0; + p_image->p_filter = NULL; } /* Start a filter */ @@ -431,16 +446,16 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic, p_image->p_filter->fmt_out.video = *p_fmt_out; } - pf_release = p_pic->pf_release; - p_pic->pf_release = PicRelease; /* Small hack */ + picture_Yield( p_pic ); + p_pif = p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic ); - p_pic->pf_release = pf_release; if( p_fmt_in->i_chroma == p_fmt_out->i_chroma && p_fmt_in->i_width == p_fmt_out->i_width && p_fmt_in->i_height == p_fmt_out->i_height ) { /* Duplicate image */ + picture_Release( p_pif ); /* XXX: Better fix must be possible */ p_pif = p_image->p_filter->pf_vout_buffer_new( p_image->p_filter ); if( p_pif ) vout_CopyPicture( p_image->p_parent, p_pif, p_pic ); } @@ -456,9 +471,6 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic, static picture_t *ImageFilter( image_handler_t *p_image, picture_t *p_pic, video_format_t *p_fmt, const char *psz_module ) { - void (*pf_release)( picture_t * ); - picture_t *p_pif; - /* Start a filter */ if( !p_image->p_filter ) { @@ -481,12 +493,9 @@ static picture_t *ImageFilter( image_handler_t *p_image, picture_t *p_pic, p_image->p_filter->fmt_out.video = *p_fmt; } - pf_release = p_pic->pf_release; - p_pic->pf_release = PicRelease; /* Small hack */ - p_pif = p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic ); - p_pic->pf_release = pf_release; + picture_Yield( p_pic ); - return p_pif; + return p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic ); } /** @@ -496,7 +505,7 @@ static picture_t *ImageFilter( image_handler_t *p_image, picture_t *p_pic, static struct { vlc_fourcc_t i_codec; - char *psz_ext; + const char *psz_ext; } ext_table[] = { @@ -559,48 +568,36 @@ static const char *Fourcc2Ext( vlc_fourcc_t i_codec ) static void video_release_buffer( picture_t *p_pic ) { - if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig ); - if( p_pic && p_pic->p_sys ) free( p_pic->p_sys ); - if( p_pic ) free( p_pic ); + picture_Release( p_pic ); } static picture_t *video_new_buffer( decoder_t *p_dec ) { - picture_t *p_pic = malloc( sizeof(picture_t) ); - - p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec; - vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic, - p_dec->fmt_out.video.i_chroma, - p_dec->fmt_out.video.i_width, - p_dec->fmt_out.video.i_height, - p_dec->fmt_out.video.i_aspect ); - - if( !p_pic->i_planes ) - { - free( p_pic ); - return 0; - } - - p_pic->pf_release = video_release_buffer; - p_pic->i_status = RESERVED_PICTURE; - p_pic->p_sys = NULL; - - return p_pic; + return picture_New( p_dec->fmt_out.video.i_chroma, + p_dec->fmt_out.video.i_width, + p_dec->fmt_out.video.i_height, + p_dec->fmt_out.video.i_aspect ); } static void video_del_buffer( decoder_t *p_dec, picture_t *p_pic ) { - if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig ); - if( p_pic && p_pic->p_sys ) free( p_pic->p_sys ); - if( p_pic ) free( p_pic ); + if( p_pic->i_refcount != 1 ) + msg_Err( p_dec, "invalid picture reference count" ); + + p_pic->i_refcount = 0; + picture_Delete( p_pic ); } static void video_link_picture( decoder_t *p_dec, picture_t *p_pic ) { + (void)p_dec; + picture_Yield( p_pic ); } static void video_unlink_picture( decoder_t *p_dec, picture_t *p_pic ) { + (void)p_dec; + picture_Release( p_pic ); } static decoder_t *CreateDecoder( vlc_object_t *p_this, video_format_t *fmt ) @@ -609,16 +606,13 @@ static decoder_t *CreateDecoder( vlc_object_t *p_this, video_format_t *fmt ) p_dec = vlc_object_create( p_this, VLC_OBJECT_DECODER ); if( p_dec == NULL ) - { - msg_Err( p_this, "out of memory" ); return NULL; - } p_dec->p_module = NULL; es_format_Init( &p_dec->fmt_in, VIDEO_ES, fmt->i_chroma ); es_format_Init( &p_dec->fmt_out, VIDEO_ES, 0 ); p_dec->fmt_in.video = *fmt; - p_dec->b_pace_control = VLC_TRUE; + p_dec->b_pace_control = true; p_dec->pf_vout_buffer_new = video_new_buffer; p_dec->pf_vout_buffer_del = video_del_buffer; @@ -651,7 +645,8 @@ static void DeleteDecoder( decoder_t * p_dec ) es_format_Clean( &p_dec->fmt_in ); es_format_Clean( &p_dec->fmt_out ); - vlc_object_destroy( p_dec ); + vlc_object_release( p_dec ); + p_dec = NULL; } static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, @@ -661,10 +656,7 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, p_enc = vlc_object_create( p_this, VLC_OBJECT_ENCODER ); if( p_enc == NULL ) - { - msg_Err( p_this, "out of memory" ); return NULL; - } p_enc->p_module = NULL; es_format_Init( &p_enc->fmt_in, VIDEO_ES, fmt_in->i_chroma ); @@ -733,16 +725,19 @@ static void DeleteEncoder( encoder_t * p_enc ) es_format_Clean( &p_enc->fmt_in ); es_format_Clean( &p_enc->fmt_out ); - vlc_object_destroy( p_enc ); + vlc_object_release( p_enc ); + p_enc = NULL; } static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in, video_format_t *p_fmt_out, const char *psz_module ) { + static const char typename[] = "filter"; filter_t *p_filter; - p_filter = vlc_object_create( p_this, VLC_OBJECT_FILTER ); + p_filter = vlc_custom_create( p_this, sizeof(filter_t), + VLC_OBJECT_GENERIC, typename ); vlc_object_attach( p_filter, p_this ); p_filter->pf_vout_buffer_new = @@ -754,8 +749,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, 0 ); if( !p_filter->p_module ) { @@ -776,5 +771,5 @@ static void DeleteFilter( filter_t * p_filter ) es_format_Clean( &p_filter->fmt_in ); es_format_Clean( &p_filter->fmt_out ); - vlc_object_destroy( p_filter ); + vlc_object_release( p_filter ); }