Commit a15851b2 authored by Laurent Aimar's avatar Laurent Aimar

Added picture_NewFromFormat/Ressource functions.

It is prefered to use picture_NewFromFormat over picture_New (it may replace
it latter).
parent 13d18251
......@@ -51,6 +51,11 @@ typedef struct plane_t
} plane_t;
/**
* Maximum number of plane for a picture
*/
#define PICTURE_PLANE_MAX (VOUT_MAX_PLANES)
/**
* A private definition to help overloading picture release
*/
......@@ -76,7 +81,7 @@ struct picture_t
* wishes, it can even swap p_pixels buffers. */
uint8_t *p_data;
void *p_data_orig; /**< pointer before memalign */
plane_t p[ VOUT_MAX_PLANES ]; /**< description of the planes */
plane_t p[PICTURE_PLANE_MAX]; /**< description of the planes */
int i_planes; /**< number of allocated planes */
/** \name Type and flags
......@@ -132,6 +137,40 @@ struct picture_t
*/
VLC_EXPORT( picture_t *, picture_New, ( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect ) );
/**
* This function will create a new picture using the given format.
*
* When possible, it is prefered to use this function over picture_New
* as more information about the format is kept.
*/
VLC_EXPORT( picture_t *, picture_NewFromFormat, ( const video_format_t *p_fmt ) );
/**
* Resource for a picture.
*/
typedef struct
{
picture_sys_t *p_sys;
/* Plane resources
* XXX all fields MUST be set to the right value.
*/
struct
{
uint8_t *p_pixels; /**< Start of the plane's data */
int i_lines; /**< Number of lines, including margins */
int i_pitch; /**< Number of bytes in a line, including margins */
} p[PICTURE_PLANE_MAX];
} picture_resource_t;
/**
* This function will create a new picture using the provided resource.
*
* If the resource is NULL then a plain picture_NewFromFormat is returned.
*/
VLC_EXPORT( picture_t *, picture_NewFromResource, ( const video_format_t *, const picture_resource_t * ) );
/**
* This function will force the destruction a picture.
* The value of the picture reference count should be 0 before entering this
......
......@@ -284,6 +284,8 @@ picture_fifo_Peek
picture_fifo_Pop
picture_fifo_Push
picture_New
picture_NewFromFormat
picture_NewFromResource
picture_pool_Delete
picture_pool_Get
picture_pool_New
......
......@@ -916,25 +916,65 @@ int picture_Setup( picture_t *p_picture, vlc_fourcc_t i_chroma, int i_width, int
/*****************************************************************************
*
*****************************************************************************/
picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect )
picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_resource_t *p_resource )
{
video_format_t fmt = *p_fmt;
/* It is needed to be sure all informations are filled */
video_format_Setup( &fmt, p_fmt->i_chroma,
p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
/* */
picture_t *p_picture = calloc( 1, sizeof(*p_picture) );
if( !p_picture )
return NULL;
if( __vout_AllocatePicture( NULL, p_picture,
i_chroma, i_width, i_height, i_aspect ) )
if( p_resource )
{
free( p_picture );
return NULL;
}
if( picture_Setup( p_picture, fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect ) )
{
free( p_picture );
return NULL;
}
p_picture->p_sys = p_resource->p_sys;
for( int i = 0; i < p_picture->i_planes; i++ )
{
p_picture->p[i].p_pixels = p_resource->p[i].p_pixels;
p_picture->p[i].i_lines = p_resource->p[i].i_lines;
p_picture->p[i].i_pitch = p_resource->p[i].i_pitch;
}
}
else
{
if( __vout_AllocatePicture( NULL, p_picture,
fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect ) )
{
free( p_picture );
return NULL;
}
}
/* */
p_picture->format = fmt;
p_picture->i_refcount = 1;
p_picture->pf_release = PictureReleaseCallback;
p_picture->i_status = RESERVED_PICTURE;
return p_picture;
}
picture_t *picture_NewFromFormat( const video_format_t *p_fmt )
{
return picture_NewFromResource( p_fmt, NULL );
}
picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect )
{
video_format_t fmt;
memset( &fmt, 0, sizeof(fmt) );
video_format_Setup( &fmt, i_chroma, i_width, i_height, i_aspect );
return picture_NewFromFormat( &fmt );
}
/*****************************************************************************
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment