This tries to make the aout filters reusable outside of the aout
(refs #8447).
void *p_private;
} aout_request_vout_t;
void *p_private;
} aout_request_vout_t;
+typedef struct aout_filters aout_filters_t;
typedef struct aout_volume aout_volume_t;
typedef struct aout_dev aout_dev_t;
typedef struct aout_volume aout_volume_t;
typedef struct aout_dev aout_dev_t;
{
vlc_mutex_t lock;
module_t *module; /**< Output plugin (or NULL if inactive) */
{
vlc_mutex_t lock;
module_t *module; /**< Output plugin (or NULL if inactive) */
+ aout_filters_t *filters;
aout_volume_t *volume;
struct
aout_volume_t *volume;
struct
audio_sample_format_t input_format;
audio_sample_format_t mixer_format;
audio_sample_format_t input_format;
audio_sample_format_t mixer_format;
- filter_t *rate_filter; /**< The filter adjusting samples count
- (either the scaletempo filter or a resampler) */
- filter_t *resampler; /**< The resampler */
- int resampling; /**< Current resampling (Hz) */
- unsigned nb_filters;
- filter_t *filters[AOUT_MAX_FILTERS]; /**< Configured user filters
- (e.g. equalization) and their conversions */
-
aout_request_vout_t request_vout;
bool recycle_vout;
aout_request_vout_t request_vout;
bool recycle_vout;
*****************************************************************************/
/* From filters.c : */
*****************************************************************************/
/* From filters.c : */
-int aout_FiltersNew(audio_output_t *, const audio_sample_format_t *,
- const audio_sample_format_t *, const aout_request_vout_t *);
-void aout_FiltersDelete(audio_output_t *);
-bool aout_FiltersAdjustResampling(audio_output_t *, int);
-block_t *aout_FiltersPlay(audio_output_t *, block_t *, int rate);
+aout_filters_t *aout_FiltersNew(audio_output_t *,
+ const audio_sample_format_t *,
+ const audio_sample_format_t *,
+ const aout_request_vout_t *);
+void aout_FiltersDelete(audio_output_t *, aout_filters_t *);
+bool aout_FiltersAdjustResampling(aout_filters_t *, int);
+block_t *aout_FiltersPlay(aout_filters_t *, block_t *, int rate);
/* From mixer.c : */
aout_volume_t *aout_volume_New(vlc_object_t *, const audio_replay_gain_t *);
/* From mixer.c : */
aout_volume_t *aout_volume_New(vlc_object_t *, const audio_replay_gain_t *);
aout_volume_SetFormat (owner->volume, owner->mixer_format.i_format);
/* Create the audio filtering "input" pipeline */
aout_volume_SetFormat (owner->volume, owner->mixer_format.i_format);
/* Create the audio filtering "input" pipeline */
- if (aout_FiltersNew (p_aout, p_format, &owner->mixer_format,
- p_request_vout))
+ owner->filters = aout_FiltersNew (p_aout, p_format, &owner->mixer_format,
+ p_request_vout);
+ if (owner->filters == NULL)
{
aout_OutputDelete (p_aout);
error:
{
aout_OutputDelete (p_aout);
error:
aout_OutputLock (aout);
if (owner->mixer_format.i_format)
{
aout_OutputLock (aout);
if (owner->mixer_format.i_format)
{
- aout_FiltersDelete (aout);
+ aout_FiltersDelete (aout, owner->filters);
aout_OutputDelete (aout);
}
aout_volume_Delete (owner->volume);
aout_OutputDelete (aout);
}
aout_volume_Delete (owner->volume);
const aout_request_vout_t request_vout = owner->request_vout;
if (owner->mixer_format.i_format)
const aout_request_vout_t request_vout = owner->request_vout;
if (owner->mixer_format.i_format)
- aout_FiltersDelete (aout);
+ aout_FiltersDelete (aout, owner->filters);
if (restart & AOUT_RESTART_OUTPUT)
{ /* Reinitializes the output */
if (restart & AOUT_RESTART_OUTPUT)
{ /* Reinitializes the output */
owner->sync.end = VLC_TS_INVALID;
owner->sync.resamp_type = AOUT_RESAMPLING_NONE;
owner->sync.end = VLC_TS_INVALID;
owner->sync.resamp_type = AOUT_RESAMPLING_NONE;
- if (owner->mixer_format.i_format
- && aout_FiltersNew (aout, &owner->input_format, &owner->mixer_format,
- &request_vout))
+ if (owner->mixer_format.i_format)
- aout_OutputDelete (aout);
- owner->mixer_format.i_format = 0;
+ owner->filters = aout_FiltersNew (aout, &owner->input_format,
+ &owner->mixer_format,
+ &request_vout);
+ if (owner->filters == NULL)
+ {
+ aout_OutputDelete (aout);
+ owner->mixer_format.i_format = 0;
+ }
}
}
return (owner->mixer_format.i_format) ? 0 : -1;
}
}
return (owner->mixer_format.i_format) ? 0 : -1;
aout_owner_t *owner = aout_owner (aout);
owner->sync.resamp_type = AOUT_RESAMPLING_NONE;
aout_owner_t *owner = aout_owner (aout);
owner->sync.resamp_type = AOUT_RESAMPLING_NONE;
- aout_FiltersAdjustResampling (aout, 0);
+ aout_FiltersAdjustResampling (owner->filters, 0);
}
static void aout_DecSilence (audio_output_t *aout, mtime_t length, mtime_t pts)
}
static void aout_DecSilence (audio_output_t *aout, mtime_t length, mtime_t pts)
* value, then it is time to switch back the resampling direction. */
adj *= -1;
* value, then it is time to switch back the resampling direction. */
adj *= -1;
- if (!aout_FiltersAdjustResampling (aout, adj))
+ if (!aout_FiltersAdjustResampling (owner->filters, adj))
{ /* Everything is back to normal: stop resampling. */
owner->sync.resamp_type = AOUT_RESAMPLING_NONE;
msg_Dbg (aout, "resampling stopped (drift: %"PRId64" us)", drift);
{ /* Everything is back to normal: stop resampling. */
owner->sync.resamp_type = AOUT_RESAMPLING_NONE;
msg_Dbg (aout, "resampling stopped (drift: %"PRId64" us)", drift);
if (block->i_flags & BLOCK_FLAG_DISCONTINUITY)
owner->sync.discontinuity = true;
if (block->i_flags & BLOCK_FLAG_DISCONTINUITY)
owner->sync.discontinuity = true;
- block = aout_FiltersPlay (aout, block, input_rate);
+ block = aout_FiltersPlay (owner->filters, block, input_rate);
if (block == NULL)
goto lost;
if (block == NULL)
goto lost;
+struct aout_filters
+{
+ filter_t *rate_filter; /**< The filter adjusting samples count
+ (either the scaletempo filter or a resampler) */
+ filter_t *resampler; /**< The resampler */
+ int resampling; /**< Current resampling (Hz) */
+
+ unsigned count; /**< Number of filters */
+ filter_t *tab[AOUT_MAX_FILTERS]; /**< Configured user filters
+ (e.g. equalization) and their conversions */
+};
+
/** Callback for visualization selection */
static int VisualizationCallback (vlc_object_t *obj, const char *var,
vlc_value_t oldval, vlc_value_t newval,
/** Callback for visualization selection */
static int VisualizationCallback (vlc_object_t *obj, const char *var,
vlc_value_t oldval, vlc_value_t newval,
}
static int AppendFilter(vlc_object_t *obj, const char *type, const char *name,
}
static int AppendFilter(vlc_object_t *obj, const char *type, const char *name,
- filter_t **filters, unsigned *count,
+ aout_filters_t *restrict filters,
audio_sample_format_t *restrict infmt,
const audio_sample_format_t *restrict outfmt)
{
audio_sample_format_t *restrict infmt,
const audio_sample_format_t *restrict outfmt)
{
- const unsigned max = AOUT_MAX_FILTERS;
- if (*count >= max)
+ const unsigned max = sizeof (filters->tab) / sizeof (filters->tab[0]);
+ if (filters->count >= max)
{
msg_Err (obj, "maximum of %u filters reached", max);
return -1;
{
msg_Err (obj, "maximum of %u filters reached", max);
return -1;
}
/* convert to the filter input format if necessary */
}
/* convert to the filter input format if necessary */
- if (aout_FiltersPipelineCreate (filter, filters, count, max - 1, infmt,
- &filter->fmt_in.audio))
+ if (aout_FiltersPipelineCreate (filter, filters->tab, &filters->count,
+ max - 1, infmt, &filter->fmt_in.audio))
{
msg_Err (filter, "cannot add user %s \"%s\" (skipped)", type, name);
module_unneed (filter, filter->p_module);
{
msg_Err (filter, "cannot add user %s \"%s\" (skipped)", type, name);
module_unneed (filter, filter->p_module);
- assert (*count < max);
- filters[(*count)++] = filter;
+ assert (filters->count < max);
+ filters->tab[filters->count] = filter;
+ filters->count++;
*infmt = filter->fmt_out.audio;
return 0;
}
*infmt = filter->fmt_out.audio;
return 0;
}
/**
* Sets up the audio filters.
*/
/**
* Sets up the audio filters.
*/
-int aout_FiltersNew (audio_output_t *aout,
- const audio_sample_format_t *restrict infmt,
- const audio_sample_format_t *restrict outfmt,
- const aout_request_vout_t *request_vout)
+aout_filters_t *aout_FiltersNew (audio_output_t *aout,
+ const audio_sample_format_t *restrict infmt,
+ const audio_sample_format_t *restrict outfmt,
+ const aout_request_vout_t *request_vout)
+ aout_filters_t *filters = malloc (sizeof (*filters));
+ if (unlikely(filters == NULL))
+ return NULL;
+
+ filters->rate_filter = NULL;
+ filters->resampler = NULL;
+ filters->resampling = 0;
+ filters->count = 0;
+
aout_owner_t *owner = aout_owner (aout);
/* Prepare format structure */
aout_owner_t *owner = aout_owner (aout);
/* Prepare format structure */
audio_sample_format_t output_format = *outfmt;
/* Now add user filters */
audio_sample_format_t output_format = *outfmt;
/* Now add user filters */
- owner->nb_filters = 0;
- owner->rate_filter = NULL;
- owner->resampler = NULL;
-
var_AddCallback (aout, "visual", VisualizationCallback, NULL);
var_AddCallback (aout, "equalizer", EqualizerCallback, NULL);
var_AddCallback (aout, "visual", VisualizationCallback, NULL);
var_AddCallback (aout, "equalizer", EqualizerCallback, NULL);
if (!AOUT_FMTS_IDENTICAL(infmt, outfmt))
{
aout_FormatsPrint (aout, "pass-through:", infmt, outfmt);
if (!AOUT_FMTS_IDENTICAL(infmt, outfmt))
{
aout_FormatsPrint (aout, "pass-through:", infmt, outfmt);
- owner->filters[0] = FindConverter(VLC_OBJECT(aout), infmt, outfmt);
- if (owner->filters[0] == NULL)
+ filters->tab[0] = FindConverter(VLC_OBJECT(aout), infmt, outfmt);
+ if (filters->tab[0] == NULL)
{
msg_Err (aout, "cannot setup pass-through");
goto error;
}
{
msg_Err (aout, "cannot setup pass-through");
goto error;
}
}
/* parse user filter lists */
if (var_InheritBool (aout, "audio-time-stretch"))
{
if (AppendFilter(VLC_OBJECT(aout), "audio filter", "scaletempo",
}
/* parse user filter lists */
if (var_InheritBool (aout, "audio-time-stretch"))
{
if (AppendFilter(VLC_OBJECT(aout), "audio filter", "scaletempo",
- owner->filters, &owner->nb_filters,
- &input_format, &output_format) == 0)
- owner->rate_filter = owner->filters[owner->nb_filters - 1];
+ filters, &input_format, &output_format) == 0)
+ filters->rate_filter = filters->tab[filters->count - 1];
- char *filters = var_InheritString (aout, "audio-filter");
- if (filters != NULL)
+ char *str = var_InheritString (aout, "audio-filter");
+ if (str != NULL)
- char *p = filters, *name;
while ((name = strsep (&p, " :")) != NULL)
{
while ((name = strsep (&p, " :")) != NULL)
{
- AppendFilter(VLC_OBJECT(aout), "audio filter", name,
- owner->filters, &owner->nb_filters,
+ AppendFilter(VLC_OBJECT(aout), "audio filter", name, filters,
&input_format, &output_format);
}
&input_format, &output_format);
}
}
char *visual = var_InheritString (aout, "audio-visual");
}
char *visual = var_InheritString (aout, "audio-visual");
owner->recycle_vout = visual != NULL;
if (visual != NULL && strcasecmp (visual, "none"))
{
owner->recycle_vout = visual != NULL;
if (visual != NULL && strcasecmp (visual, "none"))
{
- AppendFilter(VLC_OBJECT(aout), "visualization", visual,
- owner->filters, &owner->nb_filters,
+ AppendFilter(VLC_OBJECT(aout), "visualization", visual, filters,
&input_format, &output_format);
}
free (visual);
/* convert to the output format (minus resampling) if necessary */
output_format.i_rate = input_format.i_rate;
&input_format, &output_format);
}
free (visual);
/* convert to the output format (minus resampling) if necessary */
output_format.i_rate = input_format.i_rate;
- if (aout_FiltersPipelineCreate (aout, owner->filters, &owner->nb_filters,
- AOUT_MAX_FILTERS,
- &input_format, &output_format))
+ if (aout_FiltersPipelineCreate (aout, filters->tab, &filters->count,
+ AOUT_MAX_FILTERS, &input_format, &output_format))
{
msg_Err (aout, "cannot setup filtering pipeline");
goto error;
{
msg_Err (aout, "cannot setup filtering pipeline");
goto error;
/* insert the resampler */
output_format.i_rate = outfmt->i_rate;
assert (AOUT_FMTS_IDENTICAL(&output_format, outfmt));
/* insert the resampler */
output_format.i_rate = outfmt->i_rate;
assert (AOUT_FMTS_IDENTICAL(&output_format, outfmt));
- owner->resampler = FindResampler (VLC_OBJECT(aout), &input_format,
- &output_format);
- if (owner->resampler == NULL && input_format.i_rate != outfmt->i_rate)
+ filters->resampler = FindResampler (VLC_OBJECT(aout), &input_format,
+ &output_format);
+ if (filters->resampler == NULL && input_format.i_rate != outfmt->i_rate)
{
msg_Err (aout, "cannot setup a resampler");
goto error;
}
{
msg_Err (aout, "cannot setup a resampler");
goto error;
}
- if (owner->rate_filter == NULL)
- owner->rate_filter = owner->resampler;
- owner->resampling = 0;
+ if (filters->rate_filter == NULL)
+ filters->rate_filter = filters->resampler;
- aout_FiltersPipelineDestroy (owner->filters, owner->nb_filters);
+ aout_FiltersPipelineDestroy (filters->tab, filters->count);
var_DelCallback (aout, "equalizer", EqualizerCallback, NULL);
var_DelCallback (aout, "visual", VisualizationCallback, NULL);
var_DelCallback (aout, "equalizer", EqualizerCallback, NULL);
var_DelCallback (aout, "visual", VisualizationCallback, NULL);
+ free (filters);
+ return NULL;
}
/**
* Destroys the audio filters.
*/
}
/**
* Destroys the audio filters.
*/
-void aout_FiltersDelete (audio_output_t *aout)
+void aout_FiltersDelete (audio_output_t *aout, aout_filters_t *filters)
{
aout_owner_t *owner = aout_owner (aout);
{
aout_owner_t *owner = aout_owner (aout);
- if (owner->resampler != NULL)
- aout_FiltersPipelineDestroy (&owner->resampler, 1);
- aout_FiltersPipelineDestroy (owner->filters, owner->nb_filters);
+ if (filters->resampler != NULL)
+ aout_FiltersPipelineDestroy (&filters->resampler, 1);
+ aout_FiltersPipelineDestroy (filters->tab, filters->count);
var_DelCallback (aout, "equalizer", EqualizerCallback, NULL);
var_DelCallback (aout, "visual", VisualizationCallback, NULL);
var_DelCallback (aout, "equalizer", EqualizerCallback, NULL);
var_DelCallback (aout, "visual", VisualizationCallback, NULL);
char *visual = var_InheritString (aout, "audio-visual");
owner->recycle_vout = (visual != NULL) && *visual;
free (visual);
char *visual = var_InheritString (aout, "audio-visual");
owner->recycle_vout = (visual != NULL) && *visual;
free (visual);
-bool aout_FiltersAdjustResampling (audio_output_t *aout, int adjust)
+bool aout_FiltersAdjustResampling (aout_filters_t *filters, int adjust)
- aout_owner_t *owner = aout_owner (aout);
-
- if (owner->resampler == NULL)
+ if (filters->resampler == NULL)
return false;
if (adjust)
return false;
if (adjust)
- owner->resampling += adjust;
+ filters->resampling += adjust;
- owner->resampling = 0;
- return owner->resampling != 0;
+ filters->resampling = 0;
+ return filters->resampling != 0;
-block_t *aout_FiltersPlay (audio_output_t *aout, block_t *block, int rate)
+block_t *aout_FiltersPlay (aout_filters_t *filters, block_t *block, int rate)
- aout_owner_t *owner = aout_owner (aout);
int nominal_rate = 0;
if (rate != INPUT_RATE_DEFAULT)
{
int nominal_rate = 0;
if (rate != INPUT_RATE_DEFAULT)
{
- filter_t *rate_filter = owner->rate_filter;
+ filter_t *rate_filter = filters->rate_filter;
if (rate_filter == NULL)
goto drop; /* Without linear, non-nominal rate is impossible. */
if (rate_filter == NULL)
goto drop; /* Without linear, non-nominal rate is impossible. */
(nominal_rate * INPUT_RATE_DEFAULT) / rate;
}
(nominal_rate * INPUT_RATE_DEFAULT) / rate;
}
- block = aout_FiltersPipelinePlay (owner->filters, owner->nb_filters,
- block);
- if (owner->resampler != NULL)
+ block = aout_FiltersPipelinePlay (filters->tab, filters->count, block);
+ if (filters->resampler != NULL)
{ /* NOTE: the resampler needs to run even if resampling is 0.
* The decoder and output rates can still be different. */
{ /* NOTE: the resampler needs to run even if resampling is 0.
* The decoder and output rates can still be different. */
- owner->resampler->fmt_in.audio.i_rate += owner->resampling;
- block = aout_FiltersPipelinePlay (&owner->resampler, 1, block);
- owner->resampler->fmt_in.audio.i_rate -= owner->resampling;
+ filters->resampler->fmt_in.audio.i_rate += filters->resampling;
+ block = aout_FiltersPipelinePlay (&filters->resampler, 1, block);
+ filters->resampler->fmt_in.audio.i_rate -= filters->resampling;
}
if (nominal_rate != 0)
{ /* Restore input rate */
}
if (nominal_rate != 0)
{ /* Restore input rate */
- assert (owner->rate_filter != NULL);
- owner->rate_filter->fmt_in.audio.i_rate = nominal_rate;
+ assert (filters->rate_filter != NULL);
+ filters->rate_filter->fmt_in.audio.i_rate = nominal_rate;