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
bab44e26
Commit
bab44e26
authored
Oct 20, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input: do not bypass demux when setting pause state
parent
2237ed70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
17 deletions
+4
-17
src/input/input.c
src/input/input.c
+4
-17
No files found.
src/input/input.c
View file @
bab44e26
...
...
@@ -1532,19 +1532,13 @@ static void ControlRelease( int i_type, vlc_value_t val )
/* Pause input */
static
void
ControlPause
(
input_thread_t
*
p_input
,
mtime_t
i_control_date
)
{
int
i_ret
=
VLC_SUCCESS
;
int
i_state
=
PAUSE_S
;
if
(
p_input
->
p
->
b_can_pause
)
{
demux_t
*
p_demux
=
p_input
->
p
->
input
.
p_demux
;
if
(
p_demux
->
s
!=
NULL
)
i_ret
=
stream_Control
(
p_demux
->
s
,
STREAM_SET_PAUSE_STATE
,
true
);
else
i_ret
=
demux_Control
(
p_demux
,
DEMUX_SET_PAUSE_STATE
,
true
);
if
(
i_ret
)
if
(
demux_Control
(
p_demux
,
DEMUX_SET_PAUSE_STATE
,
true
)
)
{
msg_Warn
(
p_input
,
"cannot set pause state"
);
return
;
...
...
@@ -1552,10 +1546,8 @@ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date )
}
/* */
i_ret
=
es_out_SetPauseState
(
p_input
->
p
->
p_es_out
,
p_input
->
p
->
b_can_pause
,
true
,
i_control_date
);
if
(
i_ret
)
if
(
es_out_SetPauseState
(
p_input
->
p
->
p_es_out
,
p_input
->
p
->
b_can_pause
,
true
,
i_control_date
)
)
{
msg_Warn
(
p_input
,
"cannot set pause state at es_out level"
);
return
;
...
...
@@ -1570,13 +1562,8 @@ static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date )
if
(
p_input
->
p
->
b_can_pause
)
{
demux_t
*
p_demux
=
p_input
->
p
->
input
.
p_demux
;
int
ret
;
if
(
p_demux
->
s
!=
NULL
)
ret
=
stream_Control
(
p_demux
->
s
,
STREAM_SET_PAUSE_STATE
,
false
);
else
ret
=
demux_Control
(
p_demux
,
DEMUX_SET_PAUSE_STATE
,
false
);
if
(
ret
!=
VLC_SUCCESS
)
if
(
demux_Control
(
p_demux
,
DEMUX_SET_PAUSE_STATE
,
false
)
)
{
msg_Err
(
p_input
,
"cannot resume"
);
input_ChangeState
(
p_input
,
ERROR_S
);
...
...
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