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
649bb721
Commit
649bb721
authored
Aug 09, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: use atomic ops for (deferred) restart
parent
2cdfae96
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
50 deletions
+34
-50
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+4
-5
src/audio_output/dec.c
src/audio_output/dec.c
+29
-30
src/audio_output/intf.c
src/audio_output/intf.c
+1
-15
No files found.
src/audio_output/aout_internal.h
View file @
649bb721
...
...
@@ -70,9 +70,6 @@ struct aout_input_t
/* Mixer information */
audio_replay_gain_t
replay_gain
;
/* If b_restart == 1, the input pipeline will be re-created. */
bool
b_restart
;
/* If b_error == 1, there is no input pipeline. */
bool
b_error
;
...
...
@@ -112,7 +109,7 @@ typedef struct
filter_t
*
filters
[
AOUT_MAX_FILTERS
];
int
nb_filters
;
bool
need_
restart
;
vlc_atomic_t
restart
;
}
aout_owner_t
;
typedef
struct
...
...
@@ -137,7 +134,6 @@ int aout_InputNew(audio_output_t *, const audio_sample_format_t *,
int
aout_InputDelete
(
audio_output_t
*
p_aout
,
aout_input_t
*
p_input
);
block_t
*
aout_InputPlay
(
audio_output_t
*
p_aout
,
aout_input_t
*
p_input
,
block_t
*
p_buffer
,
int
i_input_rate
,
date_t
*
);
void
aout_InputRequestRestart
(
audio_output_t
*
p_aout
);
/* From filters.c : */
int
aout_FiltersCreatePipeline
(
vlc_object_t
*
,
filter_t
**
,
int
*
,
...
...
@@ -195,6 +191,9 @@ void aout_DecChangePause(audio_output_t *, bool b_paused, mtime_t i_date);
void
aout_DecFlush
(
audio_output_t
*
);
bool
aout_DecIsEmpty
(
audio_output_t
*
);
void
aout_InputRequestRestart
(
audio_output_t
*
);
void
aout_RequestRestart
(
audio_output_t
*
);
/* Audio output locking */
#if !defined (NDEBUG) \
...
...
src/audio_output/dec.c
View file @
649bb721
...
...
@@ -31,9 +31,9 @@
#include <assert.h>
#include <vlc_common.h>
#include <vlc_aout.h>
#include <vlc_input.h>
#include <vlc_atomic.h>
#include "aout_internal.h"
#include "libvlc.h"
...
...
@@ -97,6 +97,7 @@ int aout_DecNew( audio_output_t *p_aout,
/* Recreate the output using the new format. */
owner
->
input_format
=
*
p_format
;
vlc_atomic_set
(
&
owner
->
restart
,
0
);
if
(
aout_OutputNew
(
p_aout
,
p_format
)
<
0
)
goto
error
;
...
...
@@ -144,6 +145,8 @@ void aout_DecDelete( audio_output_t * p_aout )
free
(
input
);
}
#define AOUT_RESTART_OUTPUT 1
#define AOUT_RESTART_INPUT 2
static
void
aout_CheckRestart
(
audio_output_t
*
aout
)
{
aout_owner_t
*
owner
=
aout_owner
(
aout
);
...
...
@@ -151,12 +154,16 @@ static void aout_CheckRestart (audio_output_t *aout)
aout_assert_locked
(
aout
);
if
(
likely
(
!
owner
->
need_restart
))
int
restart
=
vlc_atomic_swap
(
&
owner
->
restart
,
0
);
if
(
likely
(
restart
==
0
))
return
;
owner
->
need_restart
=
false
;
assert
(
restart
&
AOUT_RESTART_INPUT
);
aout_InputDelete
(
aout
,
input
);
/* Reinitializes the output */
aout_InputDelete
(
aout
,
owner
->
input
);
if
(
restart
&
AOUT_RESTART_OUTPUT
)
{
aout_MixerDelete
(
owner
->
volume
.
mixer
);
owner
->
volume
.
mixer
=
NULL
;
aout_OutputDelete
(
aout
);
...
...
@@ -166,8 +173,9 @@ static void aout_CheckRestart (audio_output_t *aout)
input
->
b_error
=
true
;
return
;
/* we are officially screwed */
}
owner
->
volume
.
mixer
=
aout_MixerNew
(
aout
,
owner
->
mixer_format
.
i_format
);
owner
->
volume
.
mixer
=
aout_MixerNew
(
aout
,
owner
->
mixer_format
.
i_format
);
}
if
(
aout_InputNew
(
aout
,
&
owner
->
input_format
,
&
owner
->
mixer_format
,
input
,
&
input
->
request_vout
))
...
...
@@ -177,22 +185,15 @@ static void aout_CheckRestart (audio_output_t *aout)
}
/**
* Restarts the audio filter chain if needed.
* Marks the audio output for restart, to update any parameter of the output
* plug-in (e.g. output device or channel mapping).
*/
static
void
aout_InputCheckAnd
Restart
(
audio_output_t
*
aout
)
void
aout_Request
Restart
(
audio_output_t
*
aout
)
{
aout_owner_t
*
owner
=
aout_owner
(
aout
);
aout_input_t
*
input
=
owner
->
input
;
aout_assert_locked
(
aout
);
if
(
!
input
->
b_restart
)
return
;
input
->
b_restart
=
false
;
aout_InputDelete
(
aout
,
input
);
aout_InputNew
(
aout
,
&
owner
->
input_format
,
&
owner
->
mixer_format
,
input
,
&
input
->
request_vout
);
/* DO NOT remove AOUT_RESTART_INPUT. You need to change the atomic ops. */
vlc_atomic_set
(
&
owner
->
restart
,
AOUT_RESTART_OUTPUT
|
AOUT_RESTART_INPUT
);
}
/**
...
...
@@ -201,10 +202,9 @@ static void aout_InputCheckAndRestart (audio_output_t *aout)
*/
void
aout_InputRequestRestart
(
audio_output_t
*
aout
)
{
aout_lock
(
aout
);
if
(
aout_owner
(
aout
)
->
input
!=
NULL
)
aout_owner
(
aout
)
->
input
->
b_restart
=
true
;
aout_unlock
(
aout
);
aout_owner_t
*
owner
=
aout_owner
(
aout
);
vlc_atomic_compare_swap
(
&
owner
->
restart
,
0
,
AOUT_RESTART_INPUT
);
}
...
...
@@ -264,7 +264,6 @@ int aout_DecPlay (audio_output_t *p_aout, block_t *p_buffer, int i_input_rate)
}
aout_CheckRestart
(
p_aout
);
aout_InputCheckAndRestart
(
p_aout
);
/* Input */
p_buffer
=
aout_InputPlay
(
p_aout
,
p_input
,
p_buffer
,
i_input_rate
,
...
...
src/audio_output/intf.c
View file @
649bb721
...
...
@@ -233,20 +233,6 @@ int aout_SetMute (vlc_object_t *obj, audio_volume_t *volp, bool mute)
* Pipelines management
*/
/**
* Marks the audio output for restart, to update any parameter of the output
* plug-in (e.g. output device or channel mapping).
*/
static
void
aout_Restart
(
audio_output_t
*
aout
)
{
aout_owner_t
*
owner
=
aout_owner
(
aout
);
aout_lock
(
aout
);
if
(
owner
->
input
!=
NULL
)
owner
->
need_restart
=
true
;
aout_unlock
(
aout
);
}
/*****************************************************************************
* aout_ChannelsRestart : change the audio device or channels and restart
*****************************************************************************/
...
...
@@ -263,7 +249,7 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
* rebuilding the channel choices. */
var_Destroy
(
p_aout
,
"audio-channels"
);
}
aout_Re
start
(
p_aout
);
aout_Re
questRestart
(
p_aout
);
return
0
;
}
...
...
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