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
e9afc056
Commit
e9afc056
authored
Nov 27, 2013
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder: Simplify DecoderWaitUnblock() proto
parent
5438da27
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
12 deletions
+7
-12
src/input/decoder.c
src/input/decoder.c
+7
-12
No files found.
src/input/decoder.c
View file @
e9afc056
...
@@ -1018,7 +1018,7 @@ static bool DecoderIsFlushing( decoder_t *p_dec )
...
@@ -1018,7 +1018,7 @@ static bool DecoderIsFlushing( decoder_t *p_dec )
return
b_flushing
;
return
b_flushing
;
}
}
static
void
DecoderWaitUnblock
(
decoder_t
*
p_dec
,
bool
*
pb_reject
)
static
bool
DecoderWaitUnblock
(
decoder_t
*
p_dec
)
{
{
decoder_owner_sys_t
*
p_owner
=
p_dec
->
p_owner
;
decoder_owner_sys_t
*
p_owner
=
p_dec
->
p_owner
;
...
@@ -1046,8 +1046,7 @@ static void DecoderWaitUnblock( decoder_t *p_dec, bool *pb_reject )
...
@@ -1046,8 +1046,7 @@ static void DecoderWaitUnblock( decoder_t *p_dec, bool *pb_reject )
vlc_cond_wait
(
&
p_owner
->
wait_request
,
&
p_owner
->
lock
);
vlc_cond_wait
(
&
p_owner
->
wait_request
,
&
p_owner
->
lock
);
}
}
if
(
pb_reject
)
return
p_owner
->
b_flushing
;
*
pb_reject
=
p_owner
->
b_flushing
;
}
}
static
void
DecoderOutputChangePause
(
decoder_t
*
p_dec
,
bool
b_paused
,
mtime_t
i_date
)
static
void
DecoderOutputChangePause
(
decoder_t
*
p_dec
,
bool
b_paused
,
mtime_t
i_date
)
...
@@ -1195,9 +1194,9 @@ static void DecoderPlayAudio( decoder_t *p_dec, block_t *p_audio,
...
@@ -1195,9 +1194,9 @@ static void DecoderPlayAudio( decoder_t *p_dec, block_t *p_audio,
for
(
;;
)
for
(
;;
)
{
{
bool
b_has_more
=
false
,
b_paused
,
b_reject
;
bool
b_has_more
=
false
,
b_paused
;
DecoderWaitUnblock
(
p_dec
,
&
b_reject
);
bool
b_reject
=
DecoderWaitUnblock
(
p_dec
);
if
(
p_owner
->
b_buffering
)
if
(
p_owner
->
b_buffering
)
break
;
break
;
...
@@ -1398,9 +1397,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
...
@@ -1398,9 +1397,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
{
{
bool
b_has_more
=
false
;
bool
b_has_more
=
false
;
bool
b_reject
;
bool
b_reject
=
DecoderWaitUnblock
(
p_dec
);
DecoderWaitUnblock
(
p_dec
,
&
b_reject
);
if
(
p_owner
->
b_buffering
&&
!
p_owner
->
buffer
.
b_first
)
if
(
p_owner
->
b_buffering
&&
!
p_owner
->
buffer
.
b_first
)
{
{
...
@@ -1575,8 +1572,7 @@ static void DecoderPlaySpu( decoder_t *p_dec, subpicture_t *p_subpic )
...
@@ -1575,8 +1572,7 @@ static void DecoderPlaySpu( decoder_t *p_dec, subpicture_t *p_subpic )
for
(
;;
)
for
(
;;
)
{
{
bool
b_has_more
=
false
;
bool
b_has_more
=
false
;
bool
b_reject
;
bool
b_reject
=
DecoderWaitUnblock
(
p_dec
);
DecoderWaitUnblock
(
p_dec
,
&
b_reject
);
if
(
p_owner
->
b_buffering
)
if
(
p_owner
->
b_buffering
)
{
{
...
@@ -1650,8 +1646,7 @@ static void DecoderPlaySout( decoder_t *p_dec, block_t *p_sout_block )
...
@@ -1650,8 +1646,7 @@ static void DecoderPlaySout( decoder_t *p_dec, block_t *p_sout_block )
for
(
;;
)
for
(
;;
)
{
{
bool
b_has_more
=
false
;
bool
b_has_more
=
false
;
bool
b_reject
;
bool
b_reject
=
DecoderWaitUnblock
(
p_dec
);
DecoderWaitUnblock
(
p_dec
,
&
b_reject
);
if
(
p_owner
->
b_buffering
)
if
(
p_owner
->
b_buffering
)
{
{
...
...
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