[vlc-commits] aout: pass vlc_clock_t to aout filters
Thomas Guillem
git at videolan.org
Mon Mar 11 10:19:10 CET 2019
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Mar 6 18:20:24 2019 +0100| [1e601b6654110c1dbe10bd77a7e0f8354538783f] | committer: Thomas Guillem
aout: pass vlc_clock_t to aout filters
The clock, that is not mandatory, will be used to create a new slave clock for
the filter vizualisation plugins.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e601b6654110c1dbe10bd77a7e0f8354538783f
---
src/audio_output/aout_internal.h | 13 +++++++
src/audio_output/filters.c | 74 +++++++++++++++++++++++++++++-----------
2 files changed, 67 insertions(+), 20 deletions(-)
diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 69825aba35..7cf7a83e68 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -26,6 +26,7 @@
# include <stdatomic.h>
# include <vlc_viewpoint.h>
+# include "../clock/clock.h"
/* Max input rate factor (1/4 -> 4) */
# define AOUT_MAX_INPUT_RATE (4)
@@ -158,6 +159,18 @@ static inline void aout_SetWavePhysicalChannels(audio_sample_format_t *fmt)
}
/* From filters.c */
+
+/* Extended version of aout_FiltersNew
+ *
+ * The clock, that is not mandatory, will be used to create a new slave clock
+ * for the filter vizualisation plugins.
+ */
+aout_filters_t *aout_FiltersNewWithClock(vlc_object_t *, const vlc_clock_t *,
+ const audio_sample_format_t *,
+ const audio_sample_format_t *,
+ const aout_filters_cfg_t *cfg) VLC_USED;
+void aout_FiltersResetClock(aout_filters_t *filters);
+void aout_FiltersSetClockDelay(aout_filters_t *filters, vlc_tick_t delay);
bool aout_FiltersCanResample (aout_filters_t *filters);
#endif /* !LIBVLC_AOUT_INTERNAL_H */
diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index c25e11f274..6a37c8e8ab 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -40,8 +40,8 @@
#include "aout_internal.h"
#include "../video_output/vout_internal.h" /* for vout_Request */
-static filter_t *CreateFilter(vlc_object_t *obj, const char *type,
- const char *name,
+static filter_t *CreateFilter(vlc_object_t *obj, vlc_clock_t *clock,
+ const char *type, const char *name,
const audio_sample_format_t *infmt,
const audio_sample_format_t *outfmt,
config_chain_t *cfg, bool const_fmt)
@@ -50,6 +50,7 @@ static filter_t *CreateFilter(vlc_object_t *obj, const char *type,
if (unlikely(filter == NULL))
return NULL;
+ filter->owner.sys = clock;
filter->p_cfg = cfg;
filter->fmt_in.audio = *infmt;
filter->fmt_in.i_codec = infmt->i_format;
@@ -90,7 +91,7 @@ static filter_t *FindConverter (vlc_object_t *obj,
const audio_sample_format_t *infmt,
const audio_sample_format_t *outfmt)
{
- return CreateFilter(obj, "audio converter", NULL, infmt, outfmt,
+ return CreateFilter(obj, NULL, "audio converter", NULL, infmt, outfmt,
NULL, true);
}
@@ -99,7 +100,7 @@ static filter_t *FindResampler (vlc_object_t *obj,
const audio_sample_format_t *outfmt)
{
char *modlist = var_InheritString(obj, "audio-resampler");
- filter_t *filter = CreateFilter(obj, "audio resampler", modlist,
+ filter_t *filter = CreateFilter(obj, NULL, "audio resampler", modlist,
infmt, outfmt, NULL, true);
free(modlist);
return filter;
@@ -205,7 +206,7 @@ static int aout_FiltersPipelineCreate(vlc_object_t *obj, filter_t **filters,
config_chain_t *cfg = NULL;
if (headphones)
config_ChainParseOptions(&cfg, "{headphones=true}");
- filter_t *f = CreateFilter(obj, filter_type, NULL,
+ filter_t *f = CreateFilter(obj, NULL, filter_type, NULL,
&input, &output, cfg, true);
if (cfg)
config_ChainDestroy(cfg);
@@ -347,6 +348,7 @@ struct aout_filters
(either the scaletempo filter or a resampler) */
filter_t *resampler; /**< The resampler */
int resampling; /**< Current resampling (Hz) */
+ vlc_clock_t *clock;
unsigned count; /**< Number of filters */
filter_t *tab[AOUT_MAX_FILTERS]; /**< Configured user filters
@@ -388,7 +390,7 @@ vout_thread_t *aout_filter_GetVout(filter_t *filter, const video_format_t *fmt)
video_format_t adj_fmt = *fmt;
vout_configuration_t cfg = {
- .vout = vout, .fmt = &adj_fmt, .dpb_size = 1,
+ .vout = vout, .clock = filter->owner.sys, .fmt = &adj_fmt, .dpb_size = 1,
};
video_format_AdjustColorSpace(&adj_fmt);
@@ -413,7 +415,7 @@ static int AppendFilter(vlc_object_t *obj, const char *type, const char *name,
return -1;
}
- filter_t *filter = CreateFilter(obj, type, name,
+ filter_t *filter = CreateFilter(obj, filters->clock, type, name,
infmt, outfmt, cfg, false);
if (filter == NULL)
{
@@ -484,19 +486,10 @@ static int AppendRemapFilter(vlc_object_t *obj, aout_filters_t *restrict filters
return ret;
}
-#undef aout_FiltersNew
-/**
- * Sets a chain of audio filters up.
- * \param obj parent object for the filters
- * \param infmt chain input format [IN]
- * \param outfmt chain output format [IN]
- * \param cfg a valid aout_filters_cfg_t struct or NULL.
- * \return a filters chain or NULL on failure
- */
-aout_filters_t *aout_FiltersNew(vlc_object_t *obj,
- const audio_sample_format_t *restrict infmt,
- const audio_sample_format_t *restrict outfmt,
- const aout_filters_cfg_t *cfg)
+aout_filters_t *aout_FiltersNewWithClock(vlc_object_t *obj, const vlc_clock_t *clock,
+ const audio_sample_format_t *restrict infmt,
+ const audio_sample_format_t *restrict outfmt,
+ const aout_filters_cfg_t *cfg)
{
aout_filters_t *filters = malloc (sizeof (*filters));
if (unlikely(filters == NULL))
@@ -506,6 +499,14 @@ aout_filters_t *aout_FiltersNew(vlc_object_t *obj,
filters->resampler = NULL;
filters->resampling = 0;
filters->count = 0;
+ if (clock)
+ {
+ filters->clock = vlc_clock_CreateSlave(clock);
+ if (!filters->clock)
+ goto error;
+ }
+ else
+ filters->clock = NULL;
/* Prepare format structure */
aout_FormatPrint (obj, "input", infmt);
@@ -646,10 +647,41 @@ aout_filters_t *aout_FiltersNew(vlc_object_t *obj,
error:
aout_FiltersPipelineDestroy (filters->tab, filters->count);
var_DelCallback(obj, "visual", VisualizationCallback, NULL);
+ if (filters->clock)
+ vlc_clock_Delete(filters->clock);
free (filters);
return NULL;
}
+void aout_FiltersResetClock(aout_filters_t *filters)
+{
+ assert(filters->clock);
+ vlc_clock_Reset(filters->clock);
+}
+
+void aout_FiltersSetClockDelay(aout_filters_t *filters, vlc_tick_t delay)
+{
+ assert(filters->clock);
+ vlc_clock_SetDelay(filters->clock, delay);
+}
+
+#undef aout_FiltersNew
+/**
+ * Sets a chain of audio filters up.
+ * \param obj parent object for the filters
+ * \param infmt chain input format [IN]
+ * \param outfmt chain output format [IN]
+ * \param cfg a valid aout_filters_cfg_t struct or NULL.
+ * \return a filters chain or NULL on failure
+ */
+aout_filters_t *aout_FiltersNew(vlc_object_t *obj,
+ const audio_sample_format_t *restrict infmt,
+ const audio_sample_format_t *restrict outfmt,
+ const aout_filters_cfg_t *cfg)
+{
+ return aout_FiltersNewWithClock(obj, NULL, infmt, outfmt, cfg);
+}
+
#undef aout_FiltersDelete
/**
* Destroys a chain of audio filters.
@@ -662,6 +694,8 @@ void aout_FiltersDelete (vlc_object_t *obj, aout_filters_t *filters)
aout_FiltersPipelineDestroy (&filters->resampler, 1);
aout_FiltersPipelineDestroy (filters->tab, filters->count);
var_DelCallback(obj, "visual", VisualizationCallback, NULL);
+ if (filters->clock)
+ vlc_clock_Delete(filters->clock);
free (filters);
}
More information about the vlc-commits
mailing list