/*****************************************************************************
* image.c : wrapper for image reading/writing facilities
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Author: Gildas Bazin <gbazin@videolan.org>
/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <ctype.h>
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
+#include <errno.h>
+
+#include <vlc_common.h>
+#include <vlc_codec.h>
#include <vlc_filter.h>
+#include <vlc_es.h>
#include <vlc_image.h>
#include <vlc_stream.h>
-#include <charset.h>
+#include <vlc_charset.h>
+#include <libvlc.h>
static picture_t *ImageRead( image_handler_t *, block_t *,
video_format_t *, video_format_t * );
if( p_image->p_filter ) DeleteFilter( p_image->p_filter );
free( p_image );
+ p_image = NULL;
}
/**
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;
}
if( !p_image->p_filter )
{
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
return NULL;
}
}
p_block = block_New( p_image->p_parent, i_size );
- if( !p_block )
- {
- msg_Dbg( p_image->p_parent, "error while allocating memory to read %s",
- psz_url );
- return NULL;
- }
-
stream_Read( p_stream, p_block->p_buffer, i_size );
stream_Delete( p_stream );
*
*/
-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 &&
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_Yield( 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 );
file = utf8_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: %m", psz_url );
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;
+
+ if( err )
+ {
+ errno = err;
+ msg_Err( p_image->p_parent, "%s: %m", psz_url );
+ }
- return p_block ? VLC_SUCCESS : VLC_EGENERIC;
+ return err ? VLC_EGENERIC : VLC_SUCCESS;
}
/**
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 &&
{
/* 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 */
p_image->p_filter->fmt_out.video = *p_fmt_out;
}
- pf_release = p_pic->pf_release;
- p_pic->pf_release = PicRelease; /* Small hack */
+ picture_Yield( 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 */
+ 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 );
}
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 )
{
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;
+ picture_Yield( p_pic );
- return p_pif;
+ return p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic );
}
/**
static struct
{
vlc_fourcc_t i_codec;
- char *psz_ext;
+ const char *psz_ext;
} ext_table[] =
{
static void video_release_buffer( picture_t *p_pic )
{
- 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 );
+ picture_Release( p_pic );
}
static picture_t *video_new_buffer( decoder_t *p_dec )
{
- 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;
+ return picture_New( 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 );
}
static void video_del_buffer( decoder_t *p_dec, picture_t *p_pic )
{
- 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 );
+ 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_Yield( p_pic );
}
static void video_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
{
+ (void)p_dec;
+ picture_Release( p_pic );
}
static decoder_t *CreateDecoder( vlc_object_t *p_this, video_format_t *fmt )
p_dec = vlc_object_create( p_this, VLC_OBJECT_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_buffer_new = video_new_buffer;
p_dec->pf_vout_buffer_del = video_del_buffer;
es_format_Clean( &p_dec->fmt_in );
es_format_Clean( &p_dec->fmt_out );
- vlc_object_destroy( p_dec );
+ vlc_object_release( p_dec );
+ p_dec = NULL;
}
static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in,
p_enc = vlc_object_create( p_this, VLC_OBJECT_ENCODER );
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 );
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 )
{
+ static const char typename[] = "filter";
filter_t *p_filter;
- p_filter = vlc_object_create( p_this, VLC_OBJECT_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_vout_buffer_new =
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, 0 );
if( !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 );
}
projects / vlc / blobdiff