Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
9d189412
Commit
9d189412
authored
Jul 24, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: remove va parameter from hwaccel release callback
parent
534201c5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
12 deletions
+7
-12
modules/codec/avcodec/dxva2.c
modules/codec/avcodec/dxva2.c
+1
-2
modules/codec/avcodec/hwdummy.c
modules/codec/avcodec/hwdummy.c
+1
-2
modules/codec/avcodec/va.h
modules/codec/avcodec/va.h
+2
-2
modules/codec/avcodec/vaapi.c
modules/codec/avcodec/vaapi.c
+1
-1
modules/codec/avcodec/vda.c
modules/codec/avcodec/vda.c
+1
-2
modules/hw/vdpau/avcodec.c
modules/hw/vdpau/avcodec.c
+1
-3
No files found.
modules/codec/avcodec/dxva2.c
View file @
9d189412
...
...
@@ -471,12 +471,11 @@ static int Get(vlc_va_t *external, AVFrame *ff)
ff
->
opaque
=
surface
;
return
VLC_SUCCESS
;
}
static
void
Release
(
vlc_va_t
*
external
,
AVFrame
*
ff
)
static
void
Release
(
AVFrame
*
ff
)
{
vlc_va_surface_t
*
surface
=
ff
->
opaque
;
surface
->
refcount
--
;
(
void
)
external
;
}
static
void
Close
(
vlc_va_t
*
external
)
{
...
...
modules/codec/avcodec/hwdummy.c
View file @
9d189412
...
...
@@ -69,9 +69,8 @@ static int Lock(vlc_va_t *va, AVFrame *ff)
return
VLC_SUCCESS
;
}
static
void
Unlock
(
vlc_va_t
*
va
,
AVFrame
*
ff
)
static
void
Unlock
(
AVFrame
*
ff
)
{
(
void
)
va
;
assert
((
uintptr_t
)
ff
->
opaque
==
SURFACE_MAGIC
);
}
...
...
modules/codec/avcodec/va.h
View file @
9d189412
...
...
@@ -38,7 +38,7 @@ struct vlc_va_t {
int
(
*
setup
)(
vlc_va_t
*
,
void
**
hw
,
vlc_fourcc_t
*
output
,
int
width
,
int
height
);
int
(
*
get
)(
vlc_va_t
*
,
AVFrame
*
frame
);
void
(
*
release
)(
vlc_va_t
*
,
AVFrame
*
frame
);
void
(
*
release
)(
AVFrame
*
frame
);
int
(
*
extract
)(
vlc_va_t
*
,
picture_t
*
dst
,
AVFrame
*
src
);
};
...
...
@@ -94,7 +94,7 @@ static inline int vlc_va_Get(vlc_va_t *va, AVFrame *frame)
*/
static
inline
void
vlc_va_Release
(
vlc_va_t
*
va
,
AVFrame
*
frame
)
{
va
->
release
(
va
,
frame
);
va
->
release
(
frame
);
}
/**
...
...
modules/codec/avcodec/vaapi.c
View file @
9d189412
...
...
@@ -518,7 +518,7 @@ static int Get( vlc_va_t *va, AVFrame *p_ff )
return
VLC_SUCCESS
;
}
static
void
Release
(
vlc_va_t
*
va
,
AVFrame
*
p_ff
)
static
void
Release
(
AVFrame
*
p_ff
)
{
vlc_va_surface_t
*
p_surface
=
p_ff
->
opaque
;
...
...
modules/codec/avcodec/vda.c
View file @
9d189412
...
...
@@ -254,9 +254,8 @@ static int Extract( vlc_va_t *external, picture_t *p_picture, AVFrame *p_ff )
return
VLC_SUCCESS
;
}
static
void
Release
(
vlc_va_t
*
external
,
AVFrame
*
p_ff
)
static
void
Release
(
AVFrame
*
p_ff
)
{
VLC_UNUSED
(
external
);
CVPixelBufferRef
cv_buffer
=
(
CVPixelBufferRef
)
p_ff
->
data
[
3
];
if
(
cv_buffer
)
...
...
modules/hw/vdpau/avcodec.c
View file @
9d189412
...
...
@@ -91,14 +91,12 @@ static int Lock(vlc_va_t *va, AVFrame *ff)
return
VLC_SUCCESS
;
}
static
void
Unlock
(
vlc_va_t
*
va
,
AVFrame
*
ff
)
static
void
Unlock
(
AVFrame
*
ff
)
{
vlc_vdp_video_field_t
*
field
=
ff
->
opaque
;
assert
(
field
!=
NULL
);
field
->
destroy
(
field
);
(
void
)
va
;
}
static
int
Copy
(
vlc_va_t
*
va
,
picture_t
*
pic
,
AVFrame
*
ff
)
...
...
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