X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fimage.c;h=497ed2bed947d8081c3c33f06ada7435c02a1dfb;hb=188599631a113eece314d79b896e93952cc4fdbc;hp=0741d34f01674a4c571a43aaa9502724d373613f;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/src/misc/image.c b/src/misc/image.c index 0741d34f01..497ed2bed9 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,23 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#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 * ); @@ -46,6 +58,8 @@ static int ImageWriteUrl( image_handler_t *, picture_t *, static picture_t *ImageConvert( image_handler_t *, picture_t *, video_format_t *, video_format_t * ); +static picture_t *ImageFilter( image_handler_t *, picture_t *, + video_format_t *, const char *psz_module ); static decoder_t *CreateDecoder( vlc_object_t *, video_format_t * ); static void DeleteDecoder( decoder_t * ); @@ -53,21 +67,24 @@ static encoder_t *CreateEncoder( vlc_object_t *, video_format_t *, video_format_t * ); static void DeleteEncoder( encoder_t * ); static filter_t *CreateFilter( vlc_object_t *, es_format_t *, - video_format_t * ); + video_format_t *, const char * ); static void DeleteFilter( filter_t * ); -static vlc_fourcc_t Ext2Fourcc( const char * ); -static const char *Fourcc2Ext( vlc_fourcc_t ); +vlc_fourcc_t image_Type2Fourcc( const char * ); +vlc_fourcc_t image_Ext2Fourcc( const char * ); +/*static const char *Fourcc2Ext( vlc_fourcc_t );*/ +#undef image_HandlerCreate /** * Create an image_handler_t instance * */ -image_handler_t *__image_HandlerCreate( vlc_object_t *p_this ) +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; @@ -75,6 +92,7 @@ image_handler_t *__image_HandlerCreate( vlc_object_t *p_this ) p_image->pf_write = ImageWrite; p_image->pf_write_url = ImageWriteUrl; p_image->pf_convert = ImageConvert; + p_image->pf_filter = ImageFilter; return p_image; } @@ -92,6 +110,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; } /** @@ -103,7 +122,7 @@ static picture_t *ImageRead( image_handler_t *p_image, block_t *p_block, video_format_t *p_fmt_in, video_format_t *p_fmt_out ) { - picture_t *p_pic; + picture_t *p_pic = NULL, *p_tmp; /* Check if we can reuse the current decoder */ if( p_image->p_dec && @@ -121,17 +140,35 @@ static picture_t *ImageRead( image_handler_t *p_image, block_t *p_block, } p_block->i_pts = p_block->i_dts = mdate(); - p_pic = p_image->p_dec->pf_decode_video( p_image->p_dec, &p_block ); - p_image->p_dec->pf_decode_video( p_image->p_dec, &p_block ); + while( (p_tmp = p_image->p_dec->pf_decode_video( p_image->p_dec, &p_block )) + != NULL ) + { + if( p_pic != NULL ) + picture_Release( p_pic ); + p_pic = p_tmp; + } - if( !p_pic ) + if( p_pic == NULL ) { - msg_Dbg( p_image->p_parent, "no image decoded" ); + msg_Warn( p_image->p_parent, "no image decoded" ); return 0; } if( !p_fmt_out->i_chroma ) p_fmt_out->i_chroma = p_image->p_dec->fmt_out.video.i_chroma; + if( !p_fmt_out->i_width && p_fmt_out->i_height ) + p_fmt_out->i_width = (int64_t)p_image->p_dec->fmt_out.video.i_width * + p_image->p_dec->fmt_out.video.i_sar_num * + p_fmt_out->i_height / + p_image->p_dec->fmt_out.video.i_height / + p_image->p_dec->fmt_out.video.i_sar_den; + + if( !p_fmt_out->i_height && p_fmt_out->i_width ) + p_fmt_out->i_height = (int64_t)p_image->p_dec->fmt_out.video.i_height * + p_image->p_dec->fmt_out.video.i_sar_den * + p_fmt_out->i_width / + p_image->p_dec->fmt_out.video.i_width / + p_image->p_dec->fmt_out.video.i_sar_num; if( !p_fmt_out->i_width ) p_fmt_out->i_width = p_image->p_dec->fmt_out.video.i_width; if( !p_fmt_out->i_height ) @@ -157,11 +194,11 @@ static picture_t *ImageRead( image_handler_t *p_image, block_t *p_block, { p_image->p_filter = CreateFilter( p_image->p_parent, &p_image->p_dec->fmt_out, - p_fmt_out ); + p_fmt_out, NULL ); if( !p_image->p_filter ) { - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } } @@ -188,29 +225,38 @@ 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 ); + + 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 ); @@ -223,14 +269,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 && @@ -255,7 +298,7 @@ static block_t *ImageWrite( image_handler_t *p_image, picture_t *p_pic, p_image->p_enc->fmt_in.video.i_width != p_fmt_in->i_width || p_image->p_enc->fmt_in.video.i_height != p_fmt_in->i_height ) { - picture_t *p_pif; + picture_t *p_tmp_pic; if( p_image->p_filter ) if( p_image->p_filter->fmt_in.video.i_chroma != p_fmt_in->i_chroma || @@ -276,7 +319,7 @@ static block_t *ImageWrite( image_handler_t *p_image, picture_t *p_pic, p_image->p_filter = CreateFilter( p_image->p_parent, &fmt_in, - &p_image->p_enc->fmt_in.video ); + &p_image->p_enc->fmt_in.video, NULL ); if( !p_image->p_filter ) { @@ -292,14 +335,25 @@ 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 */ - p_pif = p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic ); - p_pic->pf_release = pf_release; - p_pic = p_pif; - } + picture_Hold( p_pic ); - p_block = p_image->p_enc->pf_encode_video( p_image->p_enc, p_pic ); + p_tmp_pic = + p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic ); + + if( likely(p_tmp_pic != NULL) ) + { + p_block = p_image->p_enc->pf_encode_video( p_image->p_enc, + p_tmp_pic ); + p_image->p_filter->pf_video_buffer_del( p_image->p_filter, + p_tmp_pic ); + } + else + p_block = NULL; + } + else + { + p_block = p_image->p_enc->pf_encode_video( p_image->p_enc, p_pic ); + } if( !p_block ) { @@ -320,28 +374,36 @@ 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 = fopen( psz_url, "wb" ); + file = vlc_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; } /** @@ -353,7 +415,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 && @@ -377,7 +438,6 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic, p_fmt_out->i_height = p_fmt_out->i_visible_height = p_fmt_in->i_height; if( !p_fmt_out->i_sar_num ) p_fmt_out->i_sar_num = p_fmt_in->i_sar_num; if( !p_fmt_out->i_sar_den ) p_fmt_out->i_sar_den = p_fmt_in->i_sar_den; - if( !p_fmt_out->i_aspect ) p_fmt_out->i_aspect = p_fmt_in->i_aspect; if( p_image->p_filter ) if( p_image->p_filter->fmt_in.video.i_chroma != p_fmt_in->i_chroma || @@ -385,7 +445,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 */ @@ -396,7 +456,7 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic, fmt_in.video = *p_fmt_in; p_image->p_filter = - CreateFilter( p_image->p_parent, &fmt_in, p_fmt_out ); + CreateFilter( p_image->p_parent, &fmt_in, p_fmt_out, NULL ); if( !p_image->p_filter ) { @@ -410,67 +470,113 @@ 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_Hold( 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 */ - 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 ); + picture_Release( p_pif ); /* XXX: Better fix must be possible */ + p_pif = p_image->p_filter->pf_video_buffer_new( p_image->p_filter ); + if( p_pif ) + picture_Copy( p_pif, p_pic ); } return p_pif; } +/** + * Filter an image with a psz_module filter + * + */ + +static picture_t *ImageFilter( image_handler_t *p_image, picture_t *p_pic, + video_format_t *p_fmt, const char *psz_module ) +{ + /* Start a filter */ + if( !p_image->p_filter ) + { + es_format_t fmt; + es_format_Init( &fmt, VIDEO_ES, p_fmt->i_chroma ); + fmt.video = *p_fmt; + + p_image->p_filter = + CreateFilter( p_image->p_parent, &fmt, &fmt.video, psz_module ); + + if( !p_image->p_filter ) + { + return NULL; + } + } + else + { + /* Filters should handle on-the-fly size changes */ + p_image->p_filter->fmt_in.video = *p_fmt; + p_image->p_filter->fmt_out.video = *p_fmt; + } + + picture_Hold( p_pic ); + + return p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic ); +} + /** * Misc functions * */ -static struct +static const struct { vlc_fourcc_t i_codec; - char *psz_ext; + const char *psz_ext; } 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_CODEC_TARGA, "tga" }, + { VLC_CODEC_BMP, "bmp" }, + { VLC_CODEC_PNM, "pnm" }, + { VLC_FOURCC('x','p','m',' '), "xpm" }, + { VLC_FOURCC('x','c','f',' '), "xcf" }, + { VLC_CODEC_PCX, "pcx" }, + { VLC_CODEC_GIF, "gif" }, + { VLC_CODEC_TIFF, "tif" }, + { VLC_CODEC_TIFF, "tiff" }, + { VLC_FOURCC('l','b','m',' '), "lbm" }, + { VLC_CODEC_PPM, "ppm" }, { 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 ); } +/* static const char *Fourcc2Ext( vlc_fourcc_t i_codec ) { int i; @@ -482,69 +588,83 @@ static const char *Fourcc2Ext( vlc_fourcc_t i_codec ) return NULL; } +*/ + +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 } +}; -static void video_release_buffer( picture_t *p_pic ) +vlc_fourcc_t image_Mime2Fourcc( const char *psz_mime ) { - 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 ); + 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 ) { - 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_NewFromFormat( &p_dec->fmt_out.video ); } 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_Hold( 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 ) { decoder_t *p_dec; - p_dec = vlc_object_create( p_this, VLC_OBJECT_DECODER ); + p_dec = vlc_custom_create( p_this, sizeof( *p_dec ), VLC_OBJECT_GENERIC, + "image 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; @@ -554,10 +674,10 @@ 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" + 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 ); @@ -570,14 +690,16 @@ static decoder_t *CreateDecoder( vlc_object_t *p_this, video_format_t *fmt ) 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 ); - vlc_object_destroy( p_dec ); + if( p_dec->p_description ) + vlc_meta_Delete( p_dec->p_description ); + + vlc_object_release( p_dec ); + p_dec = NULL; } static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, @@ -585,12 +707,9 @@ 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 ) - { - 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 ); @@ -635,7 +754,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" @@ -652,34 +771,37 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, 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 ); - 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 ) + 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 = + p_filter->pf_video_buffer_new = (picture_t *(*)(filter_t *))video_new_buffer; - p_filter->pf_vout_buffer_del = + p_filter->pf_video_buffer_del = (void (*)(filter_t *, picture_t *))video_del_buffer; p_filter->fmt_in = *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", 0, 0 ); + p_filter->p_module = module_need( p_filter, "video filter2", + psz_module, false ); if( !p_filter->p_module ) { @@ -693,12 +815,10 @@ static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in, 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 ); - vlc_object_destroy( p_filter ); + vlc_object_release( p_filter ); }