Signed-off-by: Laurent Aimar <fenrir@videolan.org>
memset( p_va, 0, sizeof(*p_va) );
p_va->i_config_id = VA_INVALID_ID;
p_va->i_context_id = VA_INVALID_ID;
memset( p_va, 0, sizeof(*p_va) );
p_va->i_config_id = VA_INVALID_ID;
p_va->i_context_id = VA_INVALID_ID;
+ p_va->image.image_id = VA_INVALID_ID;
/* Create a VA display */
if( !XInitThreads() )
/* Create a VA display */
if( !XInitThreads() )
static void DestroySurfaces( vlc_va_vaapi_t *p_va )
{
static void DestroySurfaces( vlc_va_vaapi_t *p_va )
{
- if( p_va->image.image_id != VA_INVALID_SURFACE )
+ if( p_va->image.image_id != VA_INVALID_ID )
{
CopyCleanCache( &p_va->image_cache );
vaDestroyImage( p_va->p_display, p_va->image.image_id );
{
CopyCleanCache( &p_va->image_cache );
vaDestroyImage( p_va->p_display, p_va->image.image_id );
free( p_va->p_surface );
/* */
free( p_va->p_surface );
/* */
- p_va->image.image_id = VA_INVALID_SURFACE;
+ p_va->image.image_id = VA_INVALID_ID;
p_va->i_context_id = VA_INVALID_ID;
p_va->p_surface = NULL;
p_va->i_surface_width = 0;
p_va->i_context_id = VA_INVALID_ID;
p_va->p_surface = NULL;
p_va->i_surface_width = 0;
p_va->p_surface = calloc( p_va->i_surface_count, sizeof(*p_va->p_surface) );
if( !p_va->p_surface )
return VLC_EGENERIC;
p_va->p_surface = calloc( p_va->i_surface_count, sizeof(*p_va->p_surface) );
if( !p_va->p_surface )
return VLC_EGENERIC;
- p_va->image.image_id = VA_INVALID_SURFACE;
+ p_va->image.image_id = VA_INVALID_ID;
p_va->i_context_id = VA_INVALID_ID;
/* Create surfaces */
p_va->i_context_id = VA_INVALID_ID;
/* Create surfaces */
{
if( vaCreateImage( p_va->p_display, &p_fmt[i], i_width, i_height, &p_va->image ) )
{
{
if( vaCreateImage( p_va->p_display, &p_fmt[i], i_width, i_height, &p_va->image ) )
{
- p_va->image.image_id = VA_INVALID_SURFACE;
+ p_va->image.image_id = VA_INVALID_ID;
continue;
}
/* Validate that vaGetImage works with this format */
continue;
}
/* Validate that vaGetImage works with this format */
p_va->image.image_id) )
{
vaDestroyImage( p_va->p_display, p_va->image.image_id );
p_va->image.image_id) )
{
vaDestroyImage( p_va->p_display, p_va->image.image_id );
- p_va->image.image_id = VA_INVALID_SURFACE;
+ p_va->image.image_id = VA_INVALID_ID;