Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
c4da95eb
Commit
c4da95eb
authored
Jul 08, 2011
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
codec/avcodec/vaapi_x11.c: Cleanup
Simplify check for valid surface and chroma.
parent
df3cbd54
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
15 deletions
+4
-15
modules/codec/avcodec/vaapi_x11.c
modules/codec/avcodec/vaapi_x11.c
+4
-15
No files found.
modules/codec/avcodec/vaapi_x11.c
View file @
c4da95eb
...
@@ -1165,27 +1165,16 @@ static void DisplayPicture(vout_display_t *vd, picture_t *pic, subpicture_t *sub
...
@@ -1165,27 +1165,16 @@ static void DisplayPicture(vout_display_t *vd, picture_t *pic, subpicture_t *sub
{
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
if
(
pic
->
p_sys
==
NULL
)
{
assert
(
pic
->
format
.
i_chroma
==
VLC_CODEC_VAAPI_SURFACE
);
assert
(
pic
->
format
.
i_chroma
==
VLC_CODEC_VAAPI_SURFACE
);
msg_Err
(
vd
,
"discarding picture without picture_sys_t information"
);
if
(
subpicture
)
subpicture_Delete
(
subpicture
);
picture_Release
(
pic
);
return
;
}
if
(
pic
->
p_sys
->
i_id
==
VA_INVALID_SURFACE
)
if
(
(
pic
->
p_sys
==
NULL
)
||
(
pic
->
p_sys
->
i_id
==
VA_INVALID_SURFACE
)
)
{
{
assert
(
pic
->
format
.
i_chroma
==
VLC_CODEC_VAAPI_SURFACE
);
msg_Err
(
vd
,
"discarding picture without picture_sys_t information"
);
msg_Err
(
vd
,
"discarding picture without surface information: %p (refcount %d, forced %s)"
,
pic
,
pic
->
i_refcount
,
pic
->
b_force
?
"true"
:
"false"
);
if
(
subpicture
)
if
(
subpicture
)
subpicture_Delete
(
subpicture
);
subpicture_Delete
(
subpicture
);
picture_Release
(
pic
);
picture_Release
(
pic
);
return
;
return
;
}
}
assert
(
pic
->
format
.
i_chroma
==
VLC_CODEC_VAAPI_SURFACE
);
picture_sys_t
*
surface
=
pic
->
p_sys
;
picture_sys_t
*
surface
=
pic
->
p_sys
;
...
@@ -1280,7 +1269,7 @@ static void PictureUnlock(picture_t *picture)
...
@@ -1280,7 +1269,7 @@ static void PictureUnlock(picture_t *picture)
surface
->
i_refcount
--
;
surface
->
i_refcount
--
;
//assert(surface->i_refcount == 0);
//assert(surface->i_refcount == 0);
surface
->
i_refcount
=
0
;
//
surface->i_refcount = 0;
surface
->
i_cache
=
VA_INVALID_ID
;
surface
->
i_cache
=
VA_INVALID_ID
;
}
}
...
...
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