Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
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
Steve Lhomme
VLC
Commits
82641ce4
Commit
82641ce4
authored
Jan 09, 2018
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
videotoolbox: fix drain when session is not feed
Since Drain() can now be called when a flush is not requested.
parent
7fe8c564
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
modules/codec/videotoolbox.m
modules/codec/videotoolbox.m
+2
-5
No files found.
modules/codec/videotoolbox.m
View file @
82641ce4
...
...
@@ -1719,11 +1719,8 @@ static void RequestFlush(decoder_t *p_dec)
{
decoder_sys_t *p_sys = p_dec->p_sys;
/* There is no Flush in VT api, ask to restart VT from next DecodeBlock if
* we already feed some input blocks (it's better to not restart here in
* order to avoid useless restart just before a close). */
vlc_mutex_lock(&p_sys->lock);
p_sys->b_vt_flush =
p_sys->b_vt_feed
;
p_sys->b_vt_flush =
true
;
vlc_mutex_unlock(&p_sys->lock);
}
...
...
@@ -1737,7 +1734,7 @@ static void Drain(decoder_t *p_dec, bool flush)
DrainDPBLocked(p_dec, flush);
vlc_mutex_unlock(&p_sys->lock);
if (p_sys->session)
if (p_sys->session
&& p_sys->b_vt_feed
)
VTDecompressionSessionWaitForAsynchronousFrames(p_sys->session);
vlc_mutex_lock(&p_sys->lock);
...
...
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