[vlc-commits] aout: do not use aout_owner() from input
Rémi Denis-Courmont
git at videolan.org
Tue Aug 9 17:02:59 CEST 2011
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Aug 9 18:40:15 2011 +0300| [e3a1b511613adb824a8adb3a9ffe8f54aee8d292] | committer: Rémi Denis-Courmont
aout: do not use aout_owner() from input
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3a1b511613adb824a8adb3a9ffe8f54aee8d292
---
src/audio_output/aout_internal.h | 2 +-
src/audio_output/dec.c | 39 +++++++++++++++++++--
src/audio_output/input.c | 70 ++++++++++----------------------------
3 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 32f687e..17887ae 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -132,11 +132,11 @@ static inline aout_owner_t *aout_owner (audio_output_t *aout)
/* From input.c : */
int aout_InputNew(audio_output_t *, const audio_sample_format_t *,
+ const audio_sample_format_t *,
aout_input_t *, const aout_request_vout_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_InputCheckAndRestart( audio_output_t * p_aout, aout_input_t * p_input );
void aout_InputRequestRestart( audio_output_t *p_aout );
/* From filters.c : */
diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 50c3534..7452b4c 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -107,7 +107,8 @@ int aout_DecNew( audio_output_t *p_aout,
date_Set (&owner->sync.date, VLC_TS_INVALID);
owner->input = p_input;
- aout_InputNew( p_aout, p_format, p_input, p_request_vout );
+ aout_InputNew( p_aout, p_format, &owner->mixer_format, p_input,
+ p_request_vout );
aout_unlock( p_aout );
return 0;
error:
@@ -168,12 +169,44 @@ static void aout_CheckRestart (audio_output_t *aout)
owner->volume.mixer = aout_MixerNew (aout, owner->mixer_format.i_format);
- if (aout_InputNew (aout, &owner->input_format, input, &input->request_vout))
+ if (aout_InputNew (aout, &owner->input_format, &owner->mixer_format, input,
+ &input->request_vout))
assert (input->b_error);
else
assert (!input->b_error);
}
+/**
+ * Restarts the audio filter chain if needed.
+ */
+static void aout_InputCheckAndRestart (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);
+}
+
+/**
+ * This function will safely mark aout input to be restarted as soon as
+ * possible to take configuration changes into account
+ */
+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);
+}
+
/*
* Buffer management
@@ -231,7 +264,7 @@ int aout_DecPlay (audio_output_t *p_aout, block_t *p_buffer, int i_input_rate)
}
aout_CheckRestart( p_aout );
- aout_InputCheckAndRestart( p_aout, p_input );
+ aout_InputCheckAndRestart (p_aout);
/* Input */
p_buffer = aout_InputPlay (p_aout, p_input, p_buffer, i_input_rate,
diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 505e4fd..c182376 100644
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -67,19 +67,19 @@ static vout_thread_t *RequestVout( void *,
* aout_InputNew : allocate a new input and rework the filter pipeline
*****************************************************************************/
int aout_InputNew( audio_output_t * p_aout,
- const audio_sample_format_t *restrict format,
+ const audio_sample_format_t *restrict infmt,
+ const audio_sample_format_t *restrict outfmt,
aout_input_t * p_input,
const aout_request_vout_t *p_request_vout )
{
- aout_owner_t *owner = aout_owner (p_aout);
audio_sample_format_t chain_input_format;
audio_sample_format_t chain_output_format;
vlc_value_t val, text;
char *psz_filters, *psz_visual, *psz_scaletempo;
int i_visual;
- aout_FormatPrint( p_aout, "input", format );
- p_input->samplerate = format->i_rate;
+ aout_FormatPrint( p_aout, "input", infmt );
+ p_input->samplerate = infmt->i_rate;
p_input->i_nb_resamplers = p_input->i_nb_filters = 0;
@@ -95,9 +95,9 @@ int aout_InputNew( audio_output_t * p_aout,
}
/* Prepare format structure */
- chain_input_format = *format;
- chain_output_format = owner->mixer_format;
- chain_output_format.i_rate = format->i_rate;
+ chain_input_format = *infmt;
+ chain_output_format = *outfmt;
+ chain_output_format.i_rate = infmt->i_rate;
aout_FormatPrepare( &chain_output_format );
/* Now add user filters */
@@ -163,7 +163,7 @@ int aout_InputNew( audio_output_t * p_aout,
&val, &text );
}
- var_AddCallback( p_aout, "equalizer", EqualizerCallback, NULL );
+ var_AddCallback( p_aout, "equalizer", EqualizerCallback, p_input );
}
}
@@ -204,7 +204,7 @@ int aout_InputNew( audio_output_t * p_aout,
&val, &text );
}
- var_AddCallback( p_aout, "audio-replay-gain-mode", ReplayGainCallback, NULL );
+ var_AddCallback( p_aout, "audio-replay-gain-mode", ReplayGainCallback, p_input );
}
}
if( var_Type( p_aout, "audio-replay-gain-preamp" ) == 0 )
@@ -384,20 +384,19 @@ int aout_InputNew( audio_output_t * p_aout,
}
/* Create resamplers. */
- if (AOUT_FMT_LINEAR(&owner->mixer_format))
+ if (AOUT_FMT_LINEAR(outfmt))
{
chain_output_format.i_rate = (__MAX(p_input->samplerate,
- owner->mixer_format.i_rate)
+ outfmt->i_rate)
* (100 + AOUT_MAX_RESAMPLING)) / 100;
- if ( chain_output_format.i_rate == owner->mixer_format.i_rate )
+ if ( chain_output_format.i_rate == outfmt->i_rate )
{
/* Just in case... */
chain_output_format.i_rate++;
}
if (aout_FiltersCreatePipeline (p_aout, p_input->pp_resamplers,
&p_input->i_nb_resamplers,
- &chain_output_format,
- &owner->mixer_format) < 0)
+ &chain_output_format, outfmt) < 0)
{
inputFailure( p_aout, p_input, "couldn't set a resampler pipeline");
return -1;
@@ -451,37 +450,6 @@ int aout_InputDelete( audio_output_t * p_aout, aout_input_t * p_input )
}
/*****************************************************************************
- * aout_InputCheckAndRestart : restart an input
- *****************************************************************************
- * This function must be entered with the input and mixer lock.
- *****************************************************************************/
-void aout_InputCheckAndRestart( audio_output_t * p_aout, aout_input_t * p_input )
-{
- aout_owner_t *owner = aout_owner(p_aout);
- aout_assert_locked( p_aout );
-
- if( !p_input->b_restart )
- return;
-
- aout_InputDelete( p_aout, p_input );
- aout_InputNew( p_aout, &owner->input_format, p_input, &p_input->request_vout );
-
- p_input->b_restart = false;
-}
-
-/**
- * This function will safely mark aout input to be restarted as soon as
- * possible to take configuration changes into account
- */
-void aout_InputRequestRestart( audio_output_t *p_aout )
-{
- aout_lock( p_aout );
- if( aout_owner(p_aout)->input != NULL )
- aout_owner(p_aout)->input->b_restart = true;
- aout_unlock( p_aout );
-}
-
-/*****************************************************************************
* aout_InputPlay : play a buffer
*****************************************************************************
* This function must be entered with the input lock.
@@ -849,19 +817,17 @@ static int EqualizerCallback (vlc_object_t *obj, char const *cmd,
return VLC_SUCCESS;
}
-static int ReplayGainCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int ReplayGainCallback (vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t val, void *data)
{
- VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- VLC_UNUSED(newval); VLC_UNUSED(p_data);
audio_output_t *aout = (audio_output_t *)p_this;
- aout_owner_t *owner = aout_owner (aout);
+ aout_input_t *input = data;
aout_lock (aout);
- if (owner->input != NULL)
- ReplayGainSelect (aout, owner->input);
+ ReplayGainSelect (aout, input);
aout_unlock (aout);
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(val);
return VLC_SUCCESS;
}
More information about the vlc-commits
mailing list