X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fimage.c;h=906470a3ea90bc505e274e8206ac11f92efac620;hb=68ead3cb1ecdc4affb88c86a14777884b3e6ac2f;hp=f788a4d052338e0302e11d51ddbf5f7d0a499975;hpb=20c4707de5a87ba0ed3c66b5f52bff9453c6abe7;p=vlc diff --git a/src/misc/image.c b/src/misc/image.c index f788a4d052..906470a3ea 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -1,24 +1,24 @@ /***************************************************************************** * image.c : wrapper for image reading/writing facilities ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2007 VLC authors and VideoLAN * $Id$ * * Author: Gildas Bazin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /** @@ -29,13 +29,24 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#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 * ); @@ -48,8 +59,6 @@ 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 * ); @@ -57,21 +66,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 *, const char * ); + video_format_t * ); 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 );*/ +#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; @@ -79,7 +91,6 @@ 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; } @@ -97,6 +108,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; } /** @@ -129,8 +141,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; } @@ -143,16 +155,26 @@ static picture_t *ImageRead( image_handler_t *p_image, block_t *p_block, 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 = p_fmt_out->i_height - * p_image->p_dec->fmt_out.video.i_aspect - / VOUT_ASPECT_FACTOR; + 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 = p_fmt_out->i_width * VOUT_ASPECT_FACTOR - / p_image->p_dec->fmt_out.video.i_aspect; + 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 ) p_fmt_out->i_height = p_image->p_dec->fmt_out.video.i_height; + if( !p_fmt_out->i_visible_width ) + p_fmt_out->i_visible_width = p_fmt_out->i_width; + if( !p_fmt_out->i_visible_height ) + p_fmt_out->i_visible_height = p_fmt_out->i_height; /* Check if we need chroma conversion or resizing */ if( p_image->p_dec->fmt_out.video.i_chroma != p_fmt_out->i_chroma || @@ -174,11 +196,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, NULL ); + p_fmt_out ); if( !p_image->p_filter ) { - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } } @@ -209,6 +231,7 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url, int i_size; p_stream = stream_UrlNew( p_image->p_parent, psz_url ); + if( !p_stream ) { msg_Dbg( p_image->p_parent, "could not open %s for reading", @@ -218,15 +241,24 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url, i_size = stream_Size( p_stream ); - p_block = block_New( p_image->p_parent, i_size ); + p_block = block_Alloc( 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 ); @@ -239,14 +271,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 && @@ -292,7 +321,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, NULL ); + &p_image->p_enc->fmt_in.video ); if( !p_image->p_filter ) { @@ -308,15 +337,19 @@ 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_Hold( 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 ); - p_image->p_filter->pf_vout_buffer_del( p_image->p_filter, p_tmp_pic ); + if( likely(p_tmp_pic != NULL) ) + { + p_block = p_image->p_enc->pf_encode_video( p_image->p_enc, + p_tmp_pic ); + picture_Release( p_tmp_pic ); + } + else + p_block = NULL; } else { @@ -342,28 +375,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 = utf8_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: %s", psz_url, vlc_strerror_c(errno) ); 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; - return p_block ? VLC_SUCCESS : VLC_EGENERIC; + if( err ) + { + errno = err; + msg_Err( p_image->p_parent, "%s: %s", psz_url, vlc_strerror_c(errno) ); + } + + return err ? VLC_EGENERIC : VLC_SUCCESS; } /** @@ -375,7 +416,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 && @@ -399,7 +439,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 || @@ -407,7 +446,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 */ @@ -418,7 +457,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, NULL ); + CreateFilter( p_image->p_parent, &fmt_in, p_fmt_out ); if( !p_image->p_filter ) { @@ -432,61 +471,21 @@ 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 ); - } - - 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 ) -{ - void (*pf_release)( picture_t * ); - picture_t *p_pif; - - /* 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_Release( p_pif ); /* XXX: Better fix must be possible */ + p_pif = filter_NewPicture( p_image->p_filter ); + if( p_pif ) + picture_Copy( p_pif, p_pic ); } - 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; - return p_pif; } @@ -494,145 +493,131 @@ static picture_t *ImageFilter( image_handler_t *p_image, picture_t *p_pic, * Misc functions * */ -static struct +static const struct { vlc_fourcc_t i_codec; - char *psz_ext; + const char psz_ext[7]; } 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_SVG, "svg" }, + { VLC_CODEC_TIFF, "tif" }, + { VLC_CODEC_TIFF, "tiff" }, { VLC_FOURCC('l','b','m',' '), "lbm" }, - { 0, NULL } + { VLC_CODEC_PPM, "ppm" }, }; -static vlc_fourcc_t Ext2Fourcc( const char *psz_name ) +vlc_fourcc_t image_Type2Fourcc( const char *psz_type ) { - int i; + for( unsigned i = 0; i < ARRAY_SIZE(ext_table); 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; - - for( i = 0; ext_table[i].i_codec != 0; i++ ) - { - if( ext_table[i].i_codec == i_codec ) return ext_table[i].psz_ext; - } + for( unsigned i = 0; i < ARRAY_SIZE(ext_table); i++ ) + if( ext_table[i].i_codec == i_codec ) + return ext_table[i].psz_ext; return NULL; } */ -static void video_release_buffer( picture_t *p_pic ) +static const struct { - 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 ); -} - -static picture_t *video_new_buffer( decoder_t *p_dec ) + vlc_fourcc_t i_codec; + const char *psz_mime; +} mime_table[] = { - 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; -} + { 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_SVG, "image/svg+xml" }, + { VLC_CODEC_TIFF, "image/tiff" }, + { VLC_CODEC_TARGA, "image/x-tga" }, + { VLC_FOURCC('x','p','m',' '), "image/x-xpixmap" }, + { 0, NULL } +}; -static void video_del_buffer( decoder_t *p_dec, 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 void video_link_picture( decoder_t *p_dec, picture_t *p_pic ) +static int video_update_format( decoder_t *p_dec ) { + p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec; + return 0; } -static void video_unlink_picture( decoder_t *p_dec, picture_t *p_pic ) +static picture_t *video_new_buffer( decoder_t *p_dec ) { + return picture_NewFromFormat( &p_dec->fmt_out.video ); } 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 ), "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_format_update = video_update_format; p_dec->pf_vout_buffer_new = video_new_buffer; - p_dec->pf_vout_buffer_del = video_del_buffer; - p_dec->pf_picture_link = video_link_picture; - p_dec->pf_picture_unlink = video_unlink_picture; - - 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 ); @@ -645,14 +630,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, @@ -660,44 +647,46 @@ 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 ); p_enc->fmt_in.video = *fmt_in; - if( fmt_out->i_width > 0 && fmt_out->i_height > 0 ) - { - p_enc->fmt_in.video.i_width = fmt_out->i_width; - p_enc->fmt_in.video.i_height = fmt_out->i_height; - if( fmt_out->i_visible_width > 0 && - fmt_out->i_visible_height > 0 ) + if( p_enc->fmt_in.video.i_visible_width == 0 || + p_enc->fmt_in.video.i_visible_height == 0 ) + { + if( fmt_out->i_width > 0 && fmt_out->i_height > 0 ) { - p_enc->fmt_in.video.i_visible_width = fmt_out->i_visible_width; - p_enc->fmt_in.video.i_visible_height = fmt_out->i_visible_height; + p_enc->fmt_in.video.i_width = fmt_out->i_width; + p_enc->fmt_in.video.i_height = fmt_out->i_height; + + if( fmt_out->i_visible_width > 0 && + fmt_out->i_visible_height > 0 ) + { + p_enc->fmt_in.video.i_visible_width = fmt_out->i_visible_width; + p_enc->fmt_in.video.i_visible_height = fmt_out->i_visible_height; + } + else + { + p_enc->fmt_in.video.i_visible_width = fmt_out->i_width; + p_enc->fmt_in.video.i_visible_height = fmt_out->i_height; + } } - else + else if( fmt_out->i_sar_num && fmt_out->i_sar_den && + fmt_out->i_sar_num * fmt_in->i_sar_den != + fmt_out->i_sar_den * fmt_in->i_sar_num ) { - p_enc->fmt_in.video.i_visible_width = fmt_out->i_width; - p_enc->fmt_in.video.i_visible_height = fmt_out->i_height; + p_enc->fmt_in.video.i_width = + fmt_in->i_sar_num * (int64_t)fmt_out->i_sar_den * fmt_in->i_width / + fmt_in->i_sar_den / fmt_out->i_sar_num; + p_enc->fmt_in.video.i_visible_width = + fmt_in->i_sar_num * (int64_t)fmt_out->i_sar_den * + fmt_in->i_visible_width / fmt_in->i_sar_den / fmt_out->i_sar_num; } } - else if( fmt_out->i_sar_num && fmt_out->i_sar_den && - fmt_out->i_sar_num * fmt_in->i_sar_den != - fmt_out->i_sar_den * fmt_in->i_sar_num ) - { - p_enc->fmt_in.video.i_width = - fmt_in->i_sar_num * (int64_t)fmt_out->i_sar_den * fmt_in->i_width / - fmt_in->i_sar_den / fmt_out->i_sar_num; - p_enc->fmt_in.video.i_visible_width = - fmt_in->i_sar_num * (int64_t)fmt_out->i_sar_den * - fmt_in->i_visible_width / fmt_in->i_sar_den / fmt_out->i_sar_num; - } p_enc->fmt_in.video.i_frame_rate = 25; p_enc->fmt_in.video.i_frame_rate_base = 1; @@ -707,10 +696,8 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, p_enc->fmt_out.video.i_width = p_enc->fmt_in.video.i_width; p_enc->fmt_out.video.i_height = p_enc->fmt_in.video.i_height; - 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" @@ -727,36 +714,29 @@ 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, - const char *psz_module ) + video_format_t *p_fmt_out ) { filter_t *p_filter; - p_filter = vlc_object_create( p_this, VLC_OBJECT_FILTER ); - vlc_object_attach( p_filter, p_this ); - - p_filter->pf_vout_buffer_new = + p_filter = vlc_custom_create( p_this, sizeof(filter_t), "filter" ); + p_filter->owner.video.buffer_new = (picture_t *(*)(filter_t *))video_new_buffer; - p_filter->pf_vout_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", psz_module, - 0 ); + p_filter->p_module = module_need( p_filter, "video filter2", NULL, false ); if( !p_filter->p_module ) { @@ -770,12 +750,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 ); }