Commit 94e0618b authored by Laurent Aimar's avatar Laurent Aimar

Removed now unused picture_t fields and associated enums.

They are p_data, i_status, i_type and b_slow.
parent a114568c
......@@ -63,11 +63,6 @@ typedef struct picture_release_sys_t picture_release_sys_t;
/**
* Video picture
*
* Any picture destined to be displayed by a video output thread should be
* stored in this structure from it's creation to it's effective display.
* Picture type and flags should only be modified by the output thread. Note
* that an empty picture MUST have its flags set to 0.
*/
struct picture_t
{
......@@ -76,22 +71,10 @@ struct picture_t
*/
video_frame_format_t format;
/** Picture data - data can always be freely modified, but p_data may
* NEVER be modified. A direct buffer can be handled as the plugin
* wishes, it can even swap p_pixels buffers. */
uint8_t *p_data;
void *p_data_orig; /**< pointer before memalign */
plane_t p[PICTURE_PLANE_MAX]; /**< description of the planes */
int i_planes; /**< number of allocated planes */
/** \name Type and flags
* Should NOT be modified except by the vout thread
* @{*/
int i_status; /**< picture flags */
int i_type; /**< is picture a direct buffer ? */
bool b_slow; /**< is picture in slow memory ? */
/**@}*/
/** \name Picture management properties
* These properties can be modified using the video output thread API,
* but should never be written directly */
......@@ -300,25 +283,6 @@ VLC_EXPORT( int, picture_Setup, ( picture_t *, vlc_fourcc_t i_chroma, int i_widt
* Flags used to describe the status of a picture
*****************************************************************************/
/* Picture type
* FIXME are the values meaningfull ? */
enum
{
EMPTY_PICTURE = 0, /* empty buffer */
MEMORY_PICTURE = 100, /* heap-allocated buffer */
DIRECT_PICTURE = 200, /* direct buffer */
};
/* Picture status */
enum
{
FREE_PICTURE, /* free and not allocated */
RESERVED_PICTURE, /* allocated and reserved */
READY_PICTURE, /* ready for display */
DISPLAYED_PICTURE, /* been displayed but is linked */
DESTROYED_PICTURE, /* allocated but no more used */
};
/* Quantification type */
enum
{
......
......@@ -562,7 +562,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
if ((p_vout->p_sys->p_opencv) && (p_vout->p_sys->p_opencv->p_module))
p_vout->p_sys->p_opencv->pf_video_filter( p_vout->p_sys->p_opencv, &(p_vout->p_sys->hacked_pic));
//copy the processed image into the output image
if ((p_vout->p_sys->p_proc_image) && (p_vout->p_sys->p_proc_image->p_data))
if ((p_vout->p_sys->p_proc_image) && (p_vout->p_sys->p_proc_image->i_planes > 0))
picture_Copy( p_outpic, p_vout->p_sys->p_proc_image );
}
......
......@@ -144,15 +144,15 @@ static int vout_AllocatePicture( picture_t *p_pic,
i_bytes += p->i_pitch * p->i_lines;
}
p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
if( p_pic->p_data == NULL )
uint8_t *p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
if( !p_data )
{
p_pic->i_planes = 0;
return VLC_EGENERIC;
}
/* Fill the p_pixels field for each plane */
p_pic->p[0].p_pixels = p_pic->p_data;
p_pic->p[0].p_pixels = p_data;
for( int i = 1; i < p_pic->i_planes; i++ )
{
p_pic->p[i].p_pixels = &p_pic->p[i-1].p_pixels[ p_pic->p[i-1].i_lines *
......@@ -373,7 +373,6 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r
p_picture->format = fmt;
p_picture->i_refcount = 1;
p_picture->pf_release = PictureReleaseCallback;
p_picture->i_status = RESERVED_PICTURE;
return p_picture;
}
......
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