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
1c963efd
Commit
1c963efd
authored
Oct 23, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Another small decoder thread simplification
Conflicts: src/input/decoder.c
parent
9d4a329f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
15 deletions
+6
-15
src/input/decoder.c
src/input/decoder.c
+6
-15
No files found.
src/input/decoder.c
View file @
1c963efd
...
...
@@ -310,13 +310,8 @@ void input_DecoderDelete( decoder_t *p_dec )
}
vlc_mutex_unlock
(
&
p_owner
->
lock
);
/* Make sure the thread leaves the function */
block_FifoWake
(
p_owner
->
p_fifo
);
vlc_thread_join
(
p_dec
);
/* Don't module_unneed() here because of the dll loader that wants
* close() in the same thread than decode() */
module_unneed
(
p_dec
,
p_dec
->
p_module
);
/* */
if
(
p_dec
->
p_owner
->
cc
.
b_supported
)
...
...
@@ -782,13 +777,12 @@ static void *DecoderThread( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_owner_sys_t
*
p_owner
=
p_dec
->
p_owner
;
int
canc
=
vlc_savecancel
();
/* The decoder's main loop */
while
(
vlc_object_alive
(
p_dec
)
)
for
(;;
)
{
block_t
*
p_block
=
block_FifoGet
(
p_owner
->
p_fifo
);
/* Make sure there is no cancellation point other than this one^^.
* If you need one, be sure to push cleanup of p_block. */
DecoderSignalBuffering
(
p_dec
,
p_block
==
NULL
);
if
(
p_block
)
...
...
@@ -805,11 +799,6 @@ static void *DecoderThread( vlc_object_t *p_this )
}
DecoderSignalBuffering
(
p_dec
,
true
);
/* We do it here because of the dll loader that wants close() in the
* same thread than decode() */
module_unneed
(
p_dec
,
p_dec
->
p_module
);
vlc_restorecancel
(
canc
);
return
NULL
;
}
...
...
@@ -1794,6 +1783,7 @@ static int DecoderProcess( decoder_t *p_dec, block_t *p_block )
return
VLC_SUCCESS
;
}
int
canc
=
vlc_savecancel
();
#ifdef ENABLE_SOUT
if
(
p_dec
->
i_object_type
==
VLC_OBJECT_PACKETIZER
)
{
...
...
@@ -1845,6 +1835,7 @@ static int DecoderProcess( decoder_t *p_dec, block_t *p_block )
DecoderSignalFlushed
(
p_dec
);
}
vlc_restorecancel
(
canc
);
return
p_dec
->
b_error
?
VLC_EGENERIC
:
VLC_SUCCESS
;
}
...
...
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