p_pic->i_planes = 0;
return VLC_EGENERIC;
}
- p_pic->gc.p_sys = (void *)p_data;
/* Fill the p_pixels field for each plane */
p_pic->p[0].p_pixels = p_data;
}
}
-static void PictureDestroy( picture_t *p_picture )
+/**
+ * Destroys a picture allocated by picture_NewFromResource() but without
+ * a custom destruction callback.
+ */
+static void picture_DestroyFromResource( picture_t *p_picture )
{
- assert( p_picture &&
- atomic_load( &p_picture->gc.refcount ) == 0 );
-
- vlc_free( p_picture->gc.p_sys );
free( p_picture->p_sys );
free( p_picture );
}
+/**
+ * Destroys a picture allocated with picture_NewFromFormat()
+ * (and thus AllocatePicture()).
+ */
+static void picture_Destroy( picture_t *p_picture )
+{
+ vlc_free( p_picture->p[0].p_pixels );
+ free( p_picture );
+}
+
/*****************************************************************************
*
*****************************************************************************/
}
atomic_init( &p_picture->gc.refcount, 0 );
- p_picture->gc.pf_destroy = NULL;
p_picture->gc.p_sys = NULL;
p_picture->i_nb_fields = 2;
{
p_picture->p_sys = p_resource->p_sys;
p_picture->gc.pf_destroy = p_resource->pf_destroy;
- assert( p_picture->gc.p_sys == NULL );
+ if( p_picture->gc.pf_destroy == NULL )
+ p_picture->gc.pf_destroy = picture_DestroyFromResource;
for( int i = 0; i < p_picture->i_planes; i++ )
{
free( p_picture );
return NULL;
}
+ p_picture->gc.pf_destroy = picture_Destroy;
}
/* */
p_picture->format = fmt;
atomic_init( &p_picture->gc.refcount, 1 );
- if( p_picture->gc.pf_destroy == NULL )
- p_picture->gc.pf_destroy = PictureDestroy;
return p_picture;
}
void picture_Release( picture_t *p_picture )
{
+ assert( p_picture != NULL );
+
uintptr_t refs = atomic_fetch_sub( &p_picture->gc.refcount, 1 );
assert( refs != 0 );
if( refs > 1 )