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
3e92a084
Commit
3e92a084
authored
Jul 23, 2013
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout_ManageWrapper: reset display pool after we reset render
Fixes: #3899
parent
2b1c32f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
include/vlc_vout_wrapper.h
include/vlc_vout_wrapper.h
+1
-1
src/video_output/display.c
src/video_output/display.c
+3
-1
src/video_output/vout_wrapper.c
src/video_output/vout_wrapper.c
+2
-2
No files found.
include/vlc_vout_wrapper.h
View file @
3e92a084
...
...
@@ -82,7 +82,7 @@ VLC_API bool vout_IsDisplayFiltered(vout_display_t *);
VLC_API
picture_t
*
vout_FilterDisplay
(
vout_display_t
*
,
picture_t
*
);
VLC_API
bool
vout_AreDisplayPicturesInvalid
(
vout_display_t
*
);
VLC_API
void
vout_ManageDisplay
(
vout_display_t
*
,
bool
allow_reset_pictures
);
VLC_API
bool
vout_ManageDisplay
(
vout_display_t
*
,
bool
allow_reset_pictures
);
VLC_API
void
vout_SetDisplayFullscreen
(
vout_display_t
*
,
bool
is_fullscreen
);
VLC_API
void
vout_SetDisplayFilled
(
vout_display_t
*
,
bool
is_filled
);
...
...
src/video_output/display.c
View file @
3e92a084
...
...
@@ -755,7 +755,7 @@ static void VoutDisplayCropRatio(int *left, int *top, int *right, int *bottom,
}
}
void
vout_ManageDisplay
(
vout_display_t
*
vd
,
bool
allow_reset_pictures
)
bool
vout_ManageDisplay
(
vout_display_t
*
vd
,
bool
allow_reset_pictures
)
{
vout_display_owner_sys_t
*
osys
=
vd
->
owner
.
sys
;
...
...
@@ -1055,6 +1055,8 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
}
if
(
reset_render
)
VoutDisplayResetRender
(
vd
);
return
reset_render
;
}
bool
vout_AreDisplayPicturesInvalid
(
vout_display_t
*
vd
)
...
...
src/video_output/vout_wrapper.c
View file @
3e92a084
...
...
@@ -181,8 +181,8 @@ void vout_ManageWrapper(vout_thread_t *vout)
vout_thread_sys_t
*
sys
=
vout
->
p
;
vout_display_t
*
vd
=
sys
->
display
.
vd
;
bool
reset_display_pool
=
sys
->
display
.
use_dr
&&
vout_AreDisplayPicturesInvalid
(
vd
);
vout_ManageDisplay
(
vd
,
!
sys
->
display
.
use_dr
||
reset_display_pool
);
bool
reset_display_pool
=
vout_AreDisplayPicturesInvalid
(
vd
);
reset_display_pool
|=
vout_ManageDisplay
(
vd
,
!
sys
->
display
.
use_dr
||
reset_display_pool
);
if
(
reset_display_pool
)
{
sys
->
display
.
use_dr
=
!
vout_IsDisplayFiltered
(
vd
);
...
...
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