Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
ed096fce
Commit
ed096fce
authored
Jun 20, 2013
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VAAPI: rename va->display to va->send
parent
02681f75
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
modules/codec/avcodec/dxva2.c
modules/codec/avcodec/dxva2.c
+1
-1
modules/codec/avcodec/va.h
modules/codec/avcodec/va.h
+3
-3
modules/codec/avcodec/vaapi.c
modules/codec/avcodec/vaapi.c
+2
-2
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+1
-1
No files found.
modules/codec/avcodec/dxva2.c
View file @
ed096fce
...
@@ -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
;
...
...
modules/codec/avcodec/va.h
View file @
ed096fce
...
@@ -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
modules/codec/avcodec/vaapi.c
View file @
ed096fce
...
@@ -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
;
}
}
...
...
modules/codec/avcodec/video.c
View file @
ed096fce
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment