/*****************************************************************************
* image.c : wrapper for image reading/writing facilities
*****************************************************************************
- * Copyright (C) 2004-2007 the VideoLAN team
+ * Copyright (C) 2004-2007 VLC authors and VideoLAN
* $Id$
*
* Author: Gildas Bazin <gbazin@videolan.org>
*
- * 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.
*****************************************************************************/
/**
#include <vlc_es.h>
#include <vlc_image.h>
#include <vlc_stream.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_sout.h>
#include <libvlc.h>
+#include <vlc_modules.h>
static picture_t *ImageRead( image_handler_t *, block_t *,
video_format_t *, video_format_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 * );
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 * );
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 = calloc( 1, sizeof(image_handler_t) );
if( !p_image )
p_image->pf_write = ImageWrite;
p_image->pf_write_url = ImageWriteUrl;
p_image->pf_convert = ImageConvert;
- p_image->pf_filter = ImageFilter;
return p_image;
}
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 ||
{
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 )
{
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 );
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 )
{
p_tmp_pic =
p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic );
- 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 );
+ 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
{
p_fmt_out->i_chroma = image_Ext2Fourcc( psz_url );
}
- file = utf8_fopen( psz_url, "wb" );
+ file = vlc_fopen( psz_url, "wb" );
if( !file )
{
- msg_Err( p_image->p_parent, "%s: %m", psz_url );
+ msg_Err( p_image->p_parent, "%s: %s", psz_url, vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
if( err )
{
errno = err;
- msg_Err( p_image->p_parent, "%s: %m", psz_url );
+ msg_Err( p_image->p_parent, "%s: %s", psz_url, vlc_strerror_c(errno) );
}
return err ? VLC_EGENERIC : VLC_SUCCESS;
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 )
{
{
/* Duplicate image */
picture_Release( p_pif ); /* XXX: Better fix must be possible */
- p_pif = p_image->p_filter->pf_video_buffer_new( p_image->p_filter );
+ p_pif = filter_NewPicture( 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 const struct
{
vlc_fourcc_t i_codec;
- const char *psz_ext;
+ const char psz_ext[7];
} ext_table[] =
{
{ VLC_CODEC_JPEG, "jpeg" },
{ VLC_CODEC_JPEG, "jpg" },
{ VLC_CODEC_JPEGLS, "ljpg" },
+ { VLC_CODEC_BPG, "bpg" },
{ VLC_CODEC_PNG, "png" },
{ VLC_CODEC_PGM, "pgm" },
{ VLC_CODEC_PGMYUV, "pgmyuv" },
{ VLC_FOURCC('x','c','f',' '), "xcf" },
{ 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" },
{ VLC_CODEC_PPM, "ppm" },
- { 0, NULL }
};
vlc_fourcc_t image_Type2Fourcc( const char *psz_type )
{
- int i;
-
- for( i = 0; ext_table[i].i_codec; 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;
/*
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;
}
{ VLC_CODEC_PNM, "image/x-portable-pixmap" },
{ VLC_CODEC_GIF, "image/gif" },
{ VLC_CODEC_JPEG, "image/jpeg" },
+ { VLC_CODEC_BPG, "image/bpg" },
{ VLC_CODEC_PCX, "image/pcx" },
{ VLC_CODEC_PNG, "image/png" },
+ { VLC_CODEC_SVG, "image/svg+xml" },
{ VLC_CODEC_TIFF, "image/tiff" },
- { VLC_CODEC_TARGA, "iamge/x-tga" },
+ { VLC_CODEC_TARGA, "image/x-tga" },
{ VLC_FOURCC('x','p','m',' '), "image/x-xpixmap" },
{ 0, NULL }
};
return 0;
}
-
-static picture_t *video_new_buffer( decoder_t *p_dec )
+static int video_update_format( decoder_t *p_dec )
{
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
- return picture_NewFromFormat( &p_dec->fmt_out.video );
-}
-
-static void video_del_buffer( decoder_t *p_dec, picture_t *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 );
+ 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 )
{
- (void)p_dec;
- picture_Release( p_pic );
+ 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 )
return NULL;
p_dec->fmt_in.video = *fmt;
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", false );
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 );
es_format_Clean( &p_dec->fmt_in );
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;
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", NULL, false );
if( !p_enc->p_module )
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 );
es_format_Clean( &p_enc->fmt_in );
}
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 )
{
- static const char typename[] = "filter";
filter_t *p_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_video_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_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",
- psz_module, false );
+ p_filter->p_module = module_need( p_filter, "video filter2", NULL, false );
if( !p_filter->p_module )
{
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 );
es_format_Clean( &p_filter->fmt_in );
projects / vlc / blobdiff