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
b6cdf137
Commit
b6cdf137
authored
Apr 10, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly detect XvMC capabilities.
parent
35b0ece9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
modules/video_output/x11/xcommon.c
modules/video_output/x11/xcommon.c
+1
-1
modules/video_output/x11/xvmc.c
modules/video_output/x11/xvmc.c
+8
-6
No files found.
modules/video_output/x11/xcommon.c
View file @
b6cdf137
...
@@ -426,7 +426,7 @@ int E_(Activate) ( vlc_object_t *p_this )
...
@@ -426,7 +426,7 @@ int E_(Activate) ( vlc_object_t *p_this )
msg_Dbg
(
p_vout
,
"Deinterlace = %d"
,
p_vout
->
p_sys
->
xvmc_deinterlace_method
);
msg_Dbg
(
p_vout
,
"Deinterlace = %d"
,
p_vout
->
p_sys
->
xvmc_deinterlace_method
);
msg_Dbg
(
p_vout
,
"Crop = %d"
,
p_vout
->
p_sys
->
xvmc_crop_style
);
msg_Dbg
(
p_vout
,
"Crop = %d"
,
p_vout
->
p_sys
->
xvmc_crop_style
);
if
(
!
checkXvMCCap
(
p_vout
)
)
if
(
checkXvMCCap
(
p_vout
)
==
VLC_EGENERIC
)
{
{
msg_Err
(
p_vout
,
"no XVMC capability found"
);
msg_Err
(
p_vout
,
"no XVMC capability found"
);
E_
(
Deactivate
)(
p_vout
);
E_
(
Deactivate
)(
p_vout
);
...
...
modules/video_output/x11/xvmc.c
View file @
b6cdf137
...
@@ -745,25 +745,27 @@ int checkXvMCCap( vout_thread_t *p_vout )
...
@@ -745,25 +745,27 @@ int checkXvMCCap( vout_thread_t *p_vout )
XFree
(
surfaceInfo
);
XFree
(
surfaceInfo
);
/*
/*
* Try to create a direct rendering context. This will fail if we are not
* Try to create a direct rendering context. This will fail if we are not
* on the displaying computer or an indirect context is not available.
* on the displaying computer or an indirect context is not available.
*/
*/
XVMCUNLOCKDISPLAY
(
p_vout
->
p_sys
->
p_display
);
XVMCUNLOCKDISPLAY
(
p_vout
->
p_sys
->
p_display
);
curCap
=
p_vout
->
p_sys
->
xvmc_cap
;
curCap
=
p_vout
->
p_sys
->
xvmc_cap
;
if
(
Success
==
XvMCCreateContext
(
p_vout
->
p_sys
->
p_display
,
i_xvport
,
if
(
Success
==
XvMCCreateContext
(
p_vout
->
p_sys
->
p_display
,
i_xvport
,
curCap
->
type_id
,
curCap
->
type_id
,
curCap
->
max_width
,
curCap
->
max_width
,
curCap
->
max_height
,
curCap
->
max_height
,
XVMC_DIRECT
,
&
c
)
)
XVMC_DIRECT
,
&
c
)
)
{
{
p_vout
->
p_sys
->
context_flags
=
XVMC_DIRECT
;
msg_Dbg
(
p_vout
,
"using direct XVMC rendering context"
);
p_vout
->
p_sys
->
context_flags
=
XVMC_DIRECT
;
}
}
else
if
(
Success
==
XvMCCreateContext
(
p_vout
->
p_sys
->
p_display
,
i_xvport
,
else
if
(
Success
==
XvMCCreateContext
(
p_vout
->
p_sys
->
p_display
,
i_xvport
,
curCap
->
type_id
,
curCap
->
type_id
,
curCap
->
max_width
,
curCap
->
max_width
,
curCap
->
max_height
,
curCap
->
max_height
,
0
,
&
c
)
)
0
,
&
c
)
)
{
{
msg_Dbg
(
p_vout
,
"using default XVMC rendering context"
);
p_vout
->
p_sys
->
context_flags
=
0
;
p_vout
->
p_sys
->
context_flags
=
0
;
}
}
else
else
...
...
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