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
97c0744f
Commit
97c0744f
authored
Apr 09, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: do not compute the same difference three times
parent
bce9264e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
17 deletions
+14
-17
src/audio_output/output.c
src/audio_output/output.c
+14
-17
No files found.
src/audio_output/output.c
View file @
97c0744f
...
...
@@ -341,30 +341,27 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
p_aout
->
output
.
fifo
.
pp_last
=
&
p_aout
->
output
.
fifo
.
p_first
;
}
if
(
!
b_can_sleek
&&
(
(
p_buffer
->
i_pts
-
start_date
>
AOUT_PTS_TOLERANCE
)
||
(
start_date
-
p_buffer
->
i_pts
>
AOUT_PTS_TOLERANCE
)
)
)
if
(
!
b_can_sleek
)
{
/* Try to compensate the drift by doing some resampling. */
int
i
;
mtime_t
difference
=
start_date
-
p_buffer
->
i_pts
;
msg_Warn
(
p_aout
,
"output date isn't PTS date, requesting "
"resampling (%"
PRId64
")"
,
difference
);
aout_FifoMoveDates
(
p_aout
,
&
p_aout
->
output
.
fifo
,
difference
);
aout_unlock_output_fifo
(
p_aout
);
aout_lock_input_fifos
(
p_aout
);
for
(
i
=
0
;
i
<
p_aout
->
i_nb_inputs
;
i
++
)
if
(
difference
>
AOUT_PTS_TOLERANCE
||
difference
<
-
AOUT_PTS_TOLERANCE
)
{
aout_fifo_t
*
p_fifo
=
&
p_aout
->
pp_inputs
[
i
]
->
mixer
.
fifo
;
/* Try to compensate the drift by doing some resampling. */
msg_Warn
(
p_aout
,
"output date isn't PTS date, requesting "
"resampling (%"
PRId64
")"
,
difference
);
aout_FifoMoveDates
(
p_aout
,
&
p_aout
->
output
.
fifo
,
difference
);
aout_unlock_output_fifo
(
p_aout
);
aout_lock_input_fifos
(
p_aout
);
aout_fifo_t
*
p_fifo
=
&
p_aout
->
pp_inputs
[
0
]
->
mixer
.
fifo
;
aout_FifoMoveDates
(
p_aout
,
p_fifo
,
difference
);
aout_unlock_input_fifos
(
p_aout
);
return
p_buffer
;
}
aout_unlock_input_fifos
(
p_aout
);
}
else
aout_unlock_output_fifo
(
p_aout
);
aout_unlock_output_fifo
(
p_aout
);
return
p_buffer
;
}
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