Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
9b23a3ae
Commit
9b23a3ae
authored
Aug 01, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: only (directly) access output FIFO from output functions
parent
fe805f7b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
src/audio_output/dec.c
src/audio_output/dec.c
+2
-4
src/audio_output/input.c
src/audio_output/input.c
+2
-2
src/audio_output/output.c
src/audio_output/output.c
+7
-0
No files found.
src/audio_output/dec.c
View file @
9b23a3ae
...
...
@@ -225,6 +225,8 @@ void aout_DecChangePause( audio_output_t *p_aout, aout_input_t *p_input, bool b_
aout_lock
(
p_aout
);
assert
(
p_aout
->
p_input
==
p_input
);
aout_OutputPause
(
p_aout
,
b_paused
,
i_date
);
if
(
b_paused
)
{
p_input
->
i_pause_date
=
i_date
;
...
...
@@ -236,10 +238,7 @@ void aout_DecChangePause( audio_output_t *p_aout, aout_input_t *p_input, bool b_
mtime_t
i_duration
=
i_date
-
p_input
->
i_pause_date
;
p_input
->
i_pause_date
=
VLC_TS_INVALID
;
aout_FifoMoveDates
(
&
p_input
->
fifo
,
i_duration
);
aout_FifoMoveDates
(
&
p_aout
->
fifo
,
i_duration
);
}
aout_OutputPause
(
p_aout
,
b_paused
,
i_date
);
aout_unlock
(
p_aout
);
}
...
...
@@ -247,7 +246,6 @@ void aout_DecFlush( audio_output_t *p_aout, aout_input_t *p_input )
{
aout_lock
(
p_aout
);
aout_FifoReset
(
&
p_input
->
fifo
);
aout_FifoReset
(
&
p_aout
->
fifo
);
aout_OutputFlush
(
p_aout
,
false
);
aout_unlock
(
p_aout
);
}
...
...
src/audio_output/input.c
View file @
9b23a3ae
...
...
@@ -548,7 +548,7 @@ void aout_InputPlay( audio_output_t * p_aout, aout_input_t * p_input,
msg_Warn
(
p_aout
,
"computed PTS is out of range (%"
PRId64
"), "
"clearing out"
,
now
-
start_date
);
aout_FifoReset
(
&
p_input
->
fifo
);
aout_
FifoReset
(
&
p_aout
->
fifo
);
aout_
OutputFlush
(
p_aout
,
false
);
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
inputResamplingStop
(
p_input
);
...
...
@@ -579,7 +579,7 @@ void aout_InputPlay( audio_output_t * p_aout, aout_input_t * p_input,
msg_Warn
(
p_aout
,
"buffer way too early (%"
PRId64
"), clearing queue"
,
drift
);
aout_FifoReset
(
&
p_input
->
fifo
);
aout_
FifoReset
(
&
p_aout
->
fifo
);
aout_
OutputFlush
(
p_aout
,
false
);
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
inputResamplingStop
(
p_input
);
...
...
src/audio_output/output.c
View file @
9b23a3ae
...
...
@@ -250,6 +250,12 @@ void aout_OutputPause( audio_output_t *aout, bool pause, mtime_t date )
if
(
aout
->
pf_pause
!=
NULL
)
aout
->
pf_pause
(
aout
,
pause
,
date
);
if
(
!
pause
)
{
mtime_t
duration
=
date
-
aout
->
p_input
->
i_pause_date
;
/* XXX: ^ onk onk! gruik! ^ */
aout_FifoMoveDates
(
&
aout
->
fifo
,
duration
);
}
}
/**
...
...
@@ -264,6 +270,7 @@ void aout_OutputFlush( audio_output_t *aout, bool wait )
if
(
aout
->
pf_flush
!=
NULL
)
aout
->
pf_flush
(
aout
,
wait
);
aout_FifoReset
(
&
aout
->
fifo
);
}
...
...
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