#include <vlc_common.h>
#include <vlc_codec.h>
+#include <vlc_meta.h>
#include <vlc_filter.h>
#include <vlc_es.h>
#include <vlc_image.h>
#include <vlc_stream.h>
#include <vlc_charset.h>
+#include <vlc_sout.h>
#include <libvlc.h>
static picture_t *ImageRead( image_handler_t *, block_t *,
video_format_t *, const char * );
static void DeleteFilter( filter_t * );
-static vlc_fourcc_t Ext2Fourcc( const char * );
+vlc_fourcc_t image_Ext2Fourcc( const char * );
/*static const char *Fourcc2Ext( vlc_fourcc_t );*/
/**
*/
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;
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 );
p_image->p_filter->fmt_out.video = p_image->p_enc->fmt_in.video;
}
- picture_Yield( p_pic );
+ picture_Hold( p_pic );
p_tmp_pic =
p_image->p_filter->pf_video_filter( p_image->p_filter, 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" );
p_image->p_filter->fmt_out.video = *p_fmt_out;
}
- picture_Yield( p_pic );
+ picture_Hold( p_pic );
p_pif = p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic );
/* 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 );
- if( p_pif ) vout_CopyPicture( p_image->p_parent, p_pif, p_pic );
+ if( p_pif )
+ picture_Copy( p_pif, p_pic );
}
return p_pif;
p_image->p_filter->fmt_out.video = *p_fmt;
}
- picture_Yield( p_pic );
+ 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;
const char *psz_ext;
{ 0, NULL }
};
-static vlc_fourcc_t Ext2Fourcc( const char *psz_name )
+vlc_fourcc_t image_Ext2Fourcc( const char *psz_name )
{
int i;
}
*/
-static void video_release_buffer( picture_t *p_pic )
-{
- picture_Release( p_pic );
-}
-
static picture_t *video_new_buffer( decoder_t *p_dec )
{
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
static void video_link_picture( decoder_t *p_dec, picture_t *p_pic )
{
(void)p_dec;
- picture_Yield( p_pic );
+ picture_Hold( p_pic );
}
static void video_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
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"
{
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 );
+ if( p_dec->p_description )
+ vlc_meta_Delete( p_dec->p_description );
+
vlc_object_release( p_dec );
p_dec = NULL;
}
{
encoder_t *p_enc;
- p_enc = vlc_object_create( p_this, VLC_OBJECT_ENCODER );
+ p_enc = sout_EncoderCreate( p_this );
if( p_enc == NULL )
return NULL;
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"
{
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 );
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",
+ psz_module, false );
if( !p_filter->p_module )
{
{
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 );