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
0b4f69e8
Commit
0b4f69e8
authored
Jun 27, 2011
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
codec/avcodec/vaapi_x11: remove debugging
parent
7661b66b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
20 deletions
+2
-20
modules/codec/avcodec/vaapi.c
modules/codec/avcodec/vaapi.c
+0
-18
modules/codec/avcodec/vaapi_x11.c
modules/codec/avcodec/vaapi_x11.c
+2
-2
No files found.
modules/codec/avcodec/vaapi.c
View file @
0b4f69e8
...
...
@@ -407,20 +407,6 @@ error:
return
VLC_EGENERIC
;
}
static
void
DumpSurfaceState
(
vlc_va_t
*
p_external
)
{
vlc_va_vaapi_t
*
p_va
=
vlc_va_vaapi_Get
(
p_external
);
msg_Dbg
(
p_external
->
obj
,
"Dumping Surface Array Content"
);
for
(
int
i
=
0
;
i
<
p_va
->
i_surface_count
;
i
++
)
{
vlc_va_surface_t
*
p_surface
=
&
p_va
->
p_surface
[
i
];
msg_Dbg
(
p_external
->
obj
,
" %2d: id = %d, order = %3d, refcount = %d, state = %d"
,
i
,
p_surface
->
i_id
,
p_surface
->
i_order
,
p_surface
->
i_refcount
,
(
int
)
p_surface
->
i_state
);
}
}
static
vlc_va_surface_t
*
FindSurface
(
vlc_va_t
*
p_external
,
const
VASurfaceID
i_surface_id
)
{
vlc_va_vaapi_t
*
p_va
=
vlc_va_vaapi_Get
(
p_external
);
...
...
@@ -431,9 +417,6 @@ static vlc_va_surface_t *FindSurface( vlc_va_t *p_external, const VASurfaceID i_
vlc_va_surface_t
*
p_tmp
=
&
p_va
->
p_surface
[
i
];
if
(
p_tmp
->
i_id
==
i_surface_id
)
{
//if( p_tmp->i_state == DISPLAY || p_tmp->i_state == DECODE )
// DumpSurfaceState( p_external );
assert
(
p_tmp
->
i_state
==
DECODE
);
assert
(
p_tmp
->
i_refcount
==
1
);
...
...
@@ -451,7 +434,6 @@ static int DisplayPicture( vlc_va_t *p_external, picture_t *p_picture, AVFrame *
p_va
->
conn
->
lock
();
msg_Info
(
p_external
->
obj
,
"No. Surfaces %d"
,
p_va
->
i_surface_count
);
VASurfaceID
i_surface_id
=
(
VASurfaceID
)(
uintptr_t
)
p_ff
->
data
[
3
];
#if VA_CHECK_VERSION(0,31,0)
...
...
modules/codec/avcodec/vaapi_x11.c
View file @
0b4f69e8
...
...
@@ -1147,7 +1147,7 @@ static void DisplayVASurface(vout_display_t *vd, VASurfaceID surface, picture_t
if
(
status
!=
VA_STATUS_SUCCESS
)
msg_Err
(
vd
,
"failed displaying picture: %d (surface id=%d): %p"
,
status
,
surface
,
picture
);
msg_Dbg
(
vd
,
"diplayed picture (refcount %d)"
,
picture
->
i_refcount
);
sys
->
conn
->
unlock
();
}
...
...
@@ -1271,7 +1271,7 @@ static void PictureUnlock(picture_t *picture)
if
(
surface
->
i_refcount
>
0
)
surface
->
i_refcount
--
;
assert
(
surface
->
i_refcount
==
0
);
//
assert(surface->i_refcount == 0);
surface
->
i_refcount
=
0
;
surface
->
i_cache
=
VA_INVALID_ID
;
surface
->
i_state
=
FREE
;
...
...
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