Skip to content

V
vlc-2-2
Commit bce9264e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Remove write-only aout_input_t.input_alloc

parent f7d12502
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 22 deletions
src/audio_output/aout_internal.h
View file @ bce9264e
...@@ -50,7 +50,6 @@ struct aout_input_t ...@@ -50,7 +50,6 @@ struct aout_input_t
vlc_mutex_t lock; vlc_mutex_t lock;
audio_sample_format_t input; audio_sample_format_t input;
aout_alloc_t input_alloc;
/* pre-filters */ /* pre-filters */
filter_t * pp_filters[AOUT_MAX_FILTERS]; filter_t * pp_filters[AOUT_MAX_FILTERS];
......
src/audio_output/input.c
View file @ bce9264e
...@@ -395,10 +395,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ ...@@ -395,10 +395,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
} }
} }
/* Prepare hints for the buffer allocator. */
p_input->input_alloc.b_alloc = true;
p_input->input_alloc.i_bytes_per_sec = -1;
/* Create resamplers. */ /* Create resamplers. */
if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer_format ) ) if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer_format ) )
{ {
...@@ -419,11 +415,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ ...@@ -419,11 +415,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
return -1; return -1;
} }
aout_FiltersHintBuffers( p_aout, p_input->pp_resamplers,
p_input->i_nb_resamplers,
&p_input->input_alloc );
p_input->input_alloc.b_alloc = true;
/* Setup the initial rate of the resampler */ /* Setup the initial rate of the resampler */
p_input->pp_resamplers[0]->fmt_in.audio.i_rate = p_input->input.i_rate; p_input->pp_resamplers[0]->fmt_in.audio.i_rate = p_input->input.i_rate;
} }
...@@ -434,18 +425,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ ...@@ -434,18 +425,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
p_input->p_playback_rate_filter = p_input->pp_resamplers[0]; p_input->p_playback_rate_filter = p_input->pp_resamplers[0];
} }
aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
p_input->i_nb_filters,
&p_input->input_alloc );
p_input->input_alloc.b_alloc = true;
/* i_bytes_per_sec is still == -1 if no filters */
p_input->input_alloc.i_bytes_per_sec = __MAX(
p_input->input_alloc.i_bytes_per_sec,
(int)(p_input->input.i_bytes_per_frame
* p_input->input.i_rate
/ p_input->input.i_frame_length) );
ReplayGainSelect( p_aout, p_input ); ReplayGainSelect( p_aout, p_input );
/* Success */ /* Success */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment