Commit ed096fce authored by Jean-Paul Saman's avatar Jean-Paul Saman

VAAPI: rename va->display to va->send

parent 02681f75
...@@ -564,7 +564,7 @@ static int Open(vlc_va_t *p_external, int codec_id, const es_format_t *fmt) ...@@ -564,7 +564,7 @@ static int Open(vlc_va_t *p_external, int codec_id, const es_format_t *fmt)
external->put = NULL; external->put = NULL;
external->release = Release; external->release = Release;
external->extract = Extract; external->extract = Extract;
external->display = NULL; external->send = NULL;
external->query = NULL; external->query = NULL;
return VLC_SUCCESS; return VLC_SUCCESS;
......
...@@ -42,7 +42,7 @@ struct vlc_va_t { ...@@ -42,7 +42,7 @@ struct vlc_va_t {
void (*release)(vlc_va_t *, AVFrame *frame); void (*release)(vlc_va_t *, AVFrame *frame);
int (*extract)(vlc_va_t *, picture_t *dst, AVFrame *src); int (*extract)(vlc_va_t *, picture_t *dst, AVFrame *src);
void (*put)(vlc_va_t *, AVFrame *dst, picture_t *src); void (*put)(vlc_va_t *, AVFrame *dst, picture_t *src);
int (*display)(vlc_va_t *, picture_t *dst); int (*send)(vlc_va_t *, picture_t *dst);
bool (*query)(vlc_va_t *, picture_t *src); bool (*query)(vlc_va_t *, picture_t *src);
}; };
...@@ -71,9 +71,9 @@ static inline bool vlc_va_QueryReady(vlc_va_t *va, picture_t *src) ...@@ -71,9 +71,9 @@ static inline bool vlc_va_QueryReady(vlc_va_t *va, picture_t *src)
{ {
return va->query(va, src); return va->query(va, src);
} }
static inline int vlc_va_Display(vlc_va_t *va, picture_t *dst) static inline int vlc_va_Send(vlc_va_t *va, picture_t *dst)
{ {
return va->display(va, dst); return va->send(va, dst);
} }
#endif #endif
...@@ -576,7 +576,7 @@ static void Put(vlc_va_t *p_external, AVFrame *p_ff, picture_t *p_picture ) ...@@ -576,7 +576,7 @@ static void Put(vlc_va_t *p_external, AVFrame *p_ff, picture_t *p_picture )
p_va->conn->unlock(); p_va->conn->unlock();
} }
static int DisplayPicture( vlc_va_t *p_external, picture_t *p_picture ) static int Send( vlc_va_t *p_external, picture_t *p_picture )
{ {
vlc_va_sys_t *p_va = p_external->sys; vlc_va_sys_t *p_va = p_external->sys;
...@@ -721,7 +721,7 @@ static int Create( vlc_va_t *p_va, int i_codec_id, const es_format_t *fmt ) ...@@ -721,7 +721,7 @@ static int Create( vlc_va_t *p_va, int i_codec_id, const es_format_t *fmt )
p_va->put = Put; p_va->put = Put;
p_va->release = Release; p_va->release = Release;
p_va->extract = Extract; p_va->extract = Extract;
p_va->display = DisplayPicture; p_va->send = Send;
p_va->query = QuerySurfaceReady; p_va->query = QuerySurfaceReady;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -943,7 +943,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec, ...@@ -943,7 +943,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
case PIX_FMT_VAAPI_VLD: case PIX_FMT_VAAPI_VLD:
if (p_pic->format.i_chroma == VLC_CODEC_VAAPI_SURFACE) if (p_pic->format.i_chroma == VLC_CODEC_VAAPI_SURFACE)
{ {
vlc_va_Display( p_sys->p_va, p_pic ); vlc_va_Send( p_sys->p_va, p_pic );
break; break;
} }
......
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