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
274f047a
Commit
274f047a
authored
Aug 01, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: rename aout_FifoSet() to aout_FifoReset()
The date parameter is always zero, remove it.
parent
f9c766b9
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
11 deletions
+10
-11
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+1
-1
src/audio_output/common.c
src/audio_output/common.c
+3
-4
src/audio_output/dec.c
src/audio_output/dec.c
+1
-1
src/audio_output/input.c
src/audio_output/input.c
+3
-3
src/audio_output/mixer.c
src/audio_output/mixer.c
+1
-1
src/audio_output/output.c
src/audio_output/output.c
+1
-1
No files found.
src/audio_output/aout_internal.h
View file @
274f047a
...
@@ -135,7 +135,7 @@ void aout_FifoInit( vlc_object_t *, aout_fifo_t *, uint32_t );
...
@@ -135,7 +135,7 @@ void aout_FifoInit( vlc_object_t *, aout_fifo_t *, uint32_t );
#define aout_FifoInit(o, f, r) aout_FifoInit(VLC_OBJECT(o), f, r)
#define aout_FifoInit(o, f, r) aout_FifoInit(VLC_OBJECT(o), f, r)
mtime_t
aout_FifoNextStart
(
const
aout_fifo_t
*
)
VLC_USED
;
mtime_t
aout_FifoNextStart
(
const
aout_fifo_t
*
)
VLC_USED
;
void
aout_FifoPush
(
aout_fifo_t
*
,
aout_buffer_t
*
);
void
aout_FifoPush
(
aout_fifo_t
*
,
aout_buffer_t
*
);
void
aout_Fifo
Set
(
aout_fifo_t
*
,
mtime_t
);
void
aout_Fifo
Reset
(
aout_fifo_t
*
);
void
aout_FifoMoveDates
(
aout_fifo_t
*
,
mtime_t
);
void
aout_FifoMoveDates
(
aout_fifo_t
*
,
mtime_t
);
void
aout_FifoDestroy
(
aout_fifo_t
*
p_fifo
);
void
aout_FifoDestroy
(
aout_fifo_t
*
p_fifo
);
void
aout_FormatsPrint
(
audio_output_t
*
p_aout
,
const
char
*
psz_text
,
const
audio_sample_format_t
*
p_format1
,
const
audio_sample_format_t
*
p_format2
);
void
aout_FormatsPrint
(
audio_output_t
*
p_aout
,
const
char
*
psz_text
,
const
audio_sample_format_t
*
p_format1
,
const
audio_sample_format_t
*
p_format2
);
...
...
src/audio_output/common.c
View file @
274f047a
...
@@ -363,14 +363,13 @@ void aout_FifoPush( aout_fifo_t * p_fifo, aout_buffer_t * p_buffer )
...
@@ -363,14 +363,13 @@ void aout_FifoPush( aout_fifo_t * p_fifo, aout_buffer_t * p_buffer )
}
}
/*****************************************************************************
/*****************************************************************************
* aout_FifoSet : set end_date and trash all buffers (because they aren't
* aout_FifoReset: trash all buffers
* properly dated)
*****************************************************************************/
*****************************************************************************/
void
aout_Fifo
Set
(
aout_fifo_t
*
p_fifo
,
mtime_t
date
)
void
aout_Fifo
Reset
(
aout_fifo_t
*
p_fifo
)
{
{
aout_buffer_t
*
p_buffer
;
aout_buffer_t
*
p_buffer
;
date_Set
(
&
p_fifo
->
end_date
,
date
);
date_Set
(
&
p_fifo
->
end_date
,
0
);
p_buffer
=
p_fifo
->
p_first
;
p_buffer
=
p_fifo
->
p_first
;
while
(
p_buffer
!=
NULL
)
while
(
p_buffer
!=
NULL
)
{
{
...
...
src/audio_output/dec.c
View file @
274f047a
...
@@ -241,7 +241,7 @@ void aout_DecChangePause( audio_output_t *p_aout, aout_input_t *p_input, bool b_
...
@@ -241,7 +241,7 @@ void aout_DecChangePause( audio_output_t *p_aout, aout_input_t *p_input, bool b_
void
aout_DecFlush
(
audio_output_t
*
p_aout
,
aout_input_t
*
p_input
)
void
aout_DecFlush
(
audio_output_t
*
p_aout
,
aout_input_t
*
p_input
)
{
{
aout_lock
(
p_aout
);
aout_lock
(
p_aout
);
aout_Fifo
Set
(
&
p_input
->
fifo
,
0
);
aout_Fifo
Reset
(
&
p_input
->
fifo
);
aout_unlock
(
p_aout
);
aout_unlock
(
p_aout
);
}
}
...
...
src/audio_output/input.c
View file @
274f047a
...
@@ -549,8 +549,8 @@ void aout_InputPlay( audio_output_t * p_aout, aout_input_t * p_input,
...
@@ -549,8 +549,8 @@ void aout_InputPlay( audio_output_t * p_aout, aout_input_t * p_input,
* happen :). */
* happen :). */
msg_Warn
(
p_aout
,
"computed PTS is out of range (%"
PRId64
"), "
msg_Warn
(
p_aout
,
"computed PTS is out of range (%"
PRId64
"), "
"clearing out"
,
now
-
start_date
);
"clearing out"
,
now
-
start_date
);
aout_Fifo
Set
(
&
p_input
->
fifo
,
0
);
aout_Fifo
Reset
(
&
p_input
->
fifo
);
aout_Fifo
Set
(
&
p_aout
->
fifo
,
0
);
aout_Fifo
Reset
(
&
p_aout
->
fifo
);
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
inputResamplingStop
(
p_input
);
inputResamplingStop
(
p_input
);
...
@@ -580,7 +580,7 @@ void aout_InputPlay( audio_output_t * p_aout, aout_input_t * p_input,
...
@@ -580,7 +580,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"
,
msg_Warn
(
p_aout
,
"buffer way too early (%"
PRId64
"), clearing queue"
,
drift
);
drift
);
aout_Fifo
Set
(
&
p_input
->
fifo
,
0
);
aout_Fifo
Reset
(
&
p_input
->
fifo
);
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
if
(
p_input
->
i_resampling_type
!=
AOUT_RESAMPLING_NONE
)
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
msg_Warn
(
p_aout
,
"timing screwed, stopping resampling"
);
inputResamplingStop
(
p_input
);
inputResamplingStop
(
p_input
);
...
...
src/audio_output/mixer.c
View file @
274f047a
...
@@ -173,7 +173,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
...
@@ -173,7 +173,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
if
(
delta
<
0
)
if
(
delta
<
0
)
{
{
/* Is it really the best way to do it ? */
/* Is it really the best way to do it ? */
aout_Fifo
Set
(
&
p_aout
->
fifo
,
0
);
aout_Fifo
Reset
(
&
p_aout
->
fifo
);
return
-
1
;
return
-
1
;
}
}
if
(
delta
>
0
)
if
(
delta
>
0
)
...
...
src/audio_output/output.c
View file @
274f047a
...
@@ -385,7 +385,7 @@ aout_buffer_t * aout_OutputNextBuffer( audio_output_t * p_aout,
...
@@ -385,7 +385,7 @@ aout_buffer_t * aout_OutputNextBuffer( audio_output_t * p_aout,
* to deal with this kind of starvation. */
* to deal with this kind of starvation. */
/* Set date to 0, to allow the mixer to send a new buffer ASAP */
/* Set date to 0, to allow the mixer to send a new buffer ASAP */
aout_Fifo
Set( &p_aout->fifo, 0
);
aout_Fifo
Reset( &p_aout->fifo
);
if ( !p_aout->b_starving )
if ( !p_aout->b_starving )
msg_Dbg( p_aout,
msg_Dbg( p_aout,
"audio output is starving (no input), playing silence" );
"audio output is starving (no input), playing silence" );
...
...
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