#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>
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_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_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 );
+ p_image->p_filter->pf_video_buffer_del( p_image->p_filter,
+ 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 );
{
/* 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 );
+ p_pif = p_image->p_filter->pf_video_buffer_new( p_image->p_filter );
if( p_pif )
picture_Copy( p_pif, p_pic );
}
{
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 )
return NULL;
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 );
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 );
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;
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 );