From e7cde2e65f9e21b9f0926781e0b7c1aed6f104be Mon Sep 17 00:00:00 2001 From: Christophe Massiot Date: Mon, 1 Aug 2005 16:38:56 +0000 Subject: [PATCH] * src/misc/image.c: New image_Filter call to apply a filter on a picture_t (for instance deinterlace filter). --- include/vlc_image.h | 3 +++ src/misc/image.c | 65 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/include/vlc_image.h b/include/vlc_image.h index a641d02681..264a76fc1f 100644 --- a/include/vlc_image.h +++ b/include/vlc_image.h @@ -43,6 +43,8 @@ struct image_handler_t picture_t * (*pf_convert) ( image_handler_t *, picture_t *, video_format_t *, video_format_t * ); + picture_t * (*pf_filter) ( image_handler_t *, picture_t *, + video_format_t *, const char * ); /* Private properties */ vlc_object_t *p_parent; @@ -60,6 +62,7 @@ VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) ); #define image_Write( a, b, c, d ) a->pf_write( a, b, c, d ) #define image_WriteUrl( a, b, c, d, e ) a->pf_write_url( a, b, c, d, e ) #define image_Convert( a, b, c, d ) a->pf_convert( a, b, c, d ) +#define image_Filter( a, b, c, d ) a->pf_filter( a, b, c, d ) # ifdef __cplusplus } diff --git a/src/misc/image.c b/src/misc/image.c index 9a17d8079c..6dc8e9f5f5 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -46,6 +46,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,7 +55,7 @@ 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 * ); @@ -75,6 +77,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; } @@ -138,6 +141,13 @@ 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; + 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; 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 ) @@ -163,7 +173,7 @@ 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 ) { @@ -282,7 +292,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 ) { @@ -402,7 +412,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 ) { @@ -433,6 +443,47 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *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; + } + + 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; +} + /** * Misc functions * @@ -681,7 +732,8 @@ static void DeleteEncoder( encoder_t * p_enc ) } 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 ) { filter_t *p_filter; @@ -697,7 +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", 0, 0 ); + p_filter->p_module = module_Need( p_filter, "video filter2", psz_module, + 0 ); if( !p_filter->p_module ) { -- 2.39.2