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
7e5b0127
Commit
7e5b0127
authored
Nov 13, 2007
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backports [23022]
parent
4203f6a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
22 deletions
+7
-22
NEWS
NEWS
+1
-0
modules/audio_output/alsa.c
modules/audio_output/alsa.c
+6
-22
No files found.
NEWS
View file @
7e5b0127
...
@@ -6,6 +6,7 @@ Changes between 0.8.6c and 0.8.6d (if we ever release it):
...
@@ -6,6 +6,7 @@ Changes between 0.8.6c and 0.8.6d (if we ever release it):
Various bugfixes:
Various bugfixes:
* Fix invalid free in bookmarks loading code.
* Fix invalid free in bookmarks loading code.
* Mozilla plugin: supports a reasonable amount of MIME types on Windows
* Mozilla plugin: supports a reasonable amount of MIME types on Windows
* Linux: Fix SPDIF passthrough with ALSA
Mac OS X Interface & Port:
Mac OS X Interface & Port:
* Apple Remote support on Mac OS X 10.5 Leopard with enhanced functionality
* Apple Remote support on Mac OS X 10.5 Leopard with enhanced functionality
...
...
modules/audio_output/alsa.c
View file @
7e5b0127
...
@@ -815,28 +815,12 @@ static void ALSAFill( aout_instance_t * p_aout )
...
@@ -815,28 +815,12 @@ static void ALSAFill( aout_instance_t * p_aout )
{
{
/* Here the device should be either in the RUNNING state.
/* Here the device should be either in the RUNNING state.
* p_status is valid. */
* p_status is valid. */
snd_pcm_sframes_t
delay
=
snd_pcm_status_get_delay
(
p_status
);
#if 0
int
i_bytes
=
snd_pcm_frames_to_bytes
(
p_sys
->
p_snd_pcm
,
delay
);
/* This apparently does not work correctly in Alsa 1.0.11 */
next_date
=
mdate
()
+
(
(
mtime_t
)
i_bytes
*
1000000
snd_pcm_status_get_tstamp( p_status, &ts_next );
/
p_aout
->
output
.
output
.
i_bytes_per_frame
next_date = (mtime_t)ts_next.tv_sec * 1000000 + ts_next.tv_usec;
/
p_aout
->
output
.
output
.
i_rate
if( next_date )
*
p_aout
->
output
.
output
.
i_frame_length
);
{
next_date += (mtime_t)snd_pcm_status_get_delay(p_status)
* 1000000 / p_aout->output.output.i_rate;
}
else
#endif
{
/* With screwed ALSA drivers the timestamp is always zero;
* use another method then */
snd_pcm_sframes_t
delay
=
0
;
snd_pcm_delay
(
p_sys
->
p_snd_pcm
,
&
delay
);
next_date
=
mdate
()
+
(
mtime_t
)(
delay
)
*
1000000
/
p_aout
->
output
.
output
.
i_rate
*
p_aout
->
output
.
output
.
i_frame_length
;
}
}
}
p_buffer
=
aout_OutputNextBuffer
(
p_aout
,
next_date
,
p_buffer
=
aout_OutputNextBuffer
(
p_aout
,
next_date
,
...
...
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