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
90a41800
Commit
90a41800
authored
Mar 21, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: add wait parameter to aout_DecFlush()
parent
dce4c397
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+1
-1
src/audio_output/dec.c
src/audio_output/dec.c
+2
-2
src/input/decoder.c
src/input/decoder.c
+3
-3
No files found.
src/audio_output/aout_internal.h
View file @
90a41800
...
@@ -139,7 +139,7 @@ void aout_DecDelete(audio_output_t *);
...
@@ -139,7 +139,7 @@ void aout_DecDelete(audio_output_t *);
int
aout_DecPlay
(
audio_output_t
*
,
block_t
*
,
int
i_input_rate
);
int
aout_DecPlay
(
audio_output_t
*
,
block_t
*
,
int
i_input_rate
);
int
aout_DecGetResetLost
(
audio_output_t
*
);
int
aout_DecGetResetLost
(
audio_output_t
*
);
void
aout_DecChangePause
(
audio_output_t
*
,
bool
b_paused
,
mtime_t
i_date
);
void
aout_DecChangePause
(
audio_output_t
*
,
bool
b_paused
,
mtime_t
i_date
);
void
aout_DecFlush
(
audio_output_t
*
);
void
aout_DecFlush
(
audio_output_t
*
,
bool
wait
);
bool
aout_DecIsEmpty
(
audio_output_t
*
);
bool
aout_DecIsEmpty
(
audio_output_t
*
);
void
aout_RequestRestart
(
audio_output_t
*
,
unsigned
);
void
aout_RequestRestart
(
audio_output_t
*
,
unsigned
);
...
...
src/audio_output/dec.c
View file @
90a41800
...
@@ -411,14 +411,14 @@ void aout_DecChangePause (audio_output_t *aout, bool paused, mtime_t date)
...
@@ -411,14 +411,14 @@ void aout_DecChangePause (audio_output_t *aout, bool paused, mtime_t date)
aout_OutputUnlock
(
aout
);
aout_OutputUnlock
(
aout
);
}
}
void
aout_DecFlush
(
audio_output_t
*
aout
)
void
aout_DecFlush
(
audio_output_t
*
aout
,
bool
wait
)
{
{
aout_owner_t
*
owner
=
aout_owner
(
aout
);
aout_owner_t
*
owner
=
aout_owner
(
aout
);
aout_OutputLock
(
aout
);
aout_OutputLock
(
aout
);
owner
->
sync
.
end
=
VLC_TS_INVALID
;
owner
->
sync
.
end
=
VLC_TS_INVALID
;
if
(
owner
->
mixer_format
.
i_format
)
if
(
owner
->
mixer_format
.
i_format
)
aout_OutputFlush
(
aout
,
false
);
aout_OutputFlush
(
aout
,
wait
);
aout_OutputUnlock
(
aout
);
aout_OutputUnlock
(
aout
);
}
}
...
...
src/input/decoder.c
View file @
90a41800
...
@@ -1152,7 +1152,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
...
@@ -1152,7 +1152,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
{
{
msg_Dbg
(
p_dec
,
"End of audio preroll"
);
msg_Dbg
(
p_dec
,
"End of audio preroll"
);
if
(
p_owner
->
p_aout
)
if
(
p_owner
->
p_aout
)
aout_DecFlush
(
p_owner
->
p_aout
);
aout_DecFlush
(
p_owner
->
p_aout
,
false
);
/* */
/* */
p_owner
->
i_preroll_end
=
VLC_TS_INVALID
;
p_owner
->
i_preroll_end
=
VLC_TS_INVALID
;
}
}
...
@@ -1218,7 +1218,7 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block, bool b_flus
...
@@ -1218,7 +1218,7 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block, bool b_flus
}
}
if
(
b_flush
&&
p_owner
->
p_aout
)
if
(
b_flush
&&
p_owner
->
p_aout
)
aout_DecFlush
(
p_owner
->
p_aout
);
aout_DecFlush
(
p_owner
->
p_aout
,
false
);
}
}
static
void
DecoderPlaySpu
(
decoder_t
*
p_dec
,
subpicture_t
*
p_subpic
)
static
void
DecoderPlaySpu
(
decoder_t
*
p_dec
,
subpicture_t
*
p_subpic
)
...
@@ -1642,7 +1642,7 @@ static void DeleteDecoder( decoder_t * p_dec )
...
@@ -1642,7 +1642,7 @@ static void DeleteDecoder( decoder_t * p_dec )
if
(
p_owner
->
p_aout
)
if
(
p_owner
->
p_aout
)
{
{
/* TODO: REVISIT gap-less audio */
/* TODO: REVISIT gap-less audio */
aout_DecFlush
(
p_owner
->
p_aout
);
aout_DecFlush
(
p_owner
->
p_aout
,
false
);
aout_DecDelete
(
p_owner
->
p_aout
);
aout_DecDelete
(
p_owner
->
p_aout
);
input_resource_PutAout
(
p_owner
->
p_resource
,
p_owner
->
p_aout
);
input_resource_PutAout
(
p_owner
->
p_resource
,
p_owner
->
p_aout
);
if
(
p_owner
->
p_input
!=
NULL
)
if
(
p_owner
->
p_input
!=
NULL
)
...
...
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